summaryrefslogtreecommitdiff
path: root/qpid/java/common
Commit message (Collapse)AuthorAgeFilesLines
* QPID-6481: Move java source tree to top levelAlex Rudyy2015-04-15453-74877/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1673693 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6456: [Java Broker] Correct method id used by connectionclose.ok for ↵Keith Wall2015-03-171-1/+1
| | | | | | AMQP 0-8. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1667364 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6429 : Fix issue when async close is called twice on a session, tidy up ↵Robert Godfrey2015-03-171-5/+8
| | | | | | debug and logging git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1667346 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6451: [Java Client] Remove logging of ConnectionExcepion from exception ↵Keith Wall2015-03-141-2/+0
| | | | | | handler git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1666740 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2836 : [Java Broker] Use slf4j facade for logging in the Java BrokerRobert Godfrey2015-03-122-5/+7
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1666234 13f79535-47bb-0310-9956-ffa450edef68
* merge from trunkKeith Wall2015-03-038-13/+106
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1663717 13f79535-47bb-0310-9956-ffa450edef68
* Connection close is now performed by i/o threadKeith Wall2015-02-191-0/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1660909 13f79535-47bb-0310-9956-ffa450edef68
* refactoringRobert Godfrey2015-02-116-1269/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1658981 13f79535-47bb-0310-9956-ffa450edef68
* some more fixesRobert Godfrey2015-02-111-0/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1658974 13f79535-47bb-0310-9956-ffa450edef68
* Force the queue runner to notice that the consumer is not now suspendedRobert Godfrey2015-02-101-1/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1658842 13f79535-47bb-0310-9956-ffa450edef68
* Refactoring: make the queue no longer be responsible for pushing messages ↵Keith Wall2015-02-102-9/+22
| | | | | | onto the wire git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1658773 13f79535-47bb-0310-9956-ffa450edef68
* merge from trunkKeith Wall2015-02-1013-118/+304
|\ | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1658748 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6371: [Java Broker/Java Common] Prevent log4j warning during Broker startupKeith Wall2015-02-071-63/+13
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1658098 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6350: [Java Common] Change IoSender to half close once writing is done.Keith Wall2015-02-044-6/+27
| | | | | | | | | | | | | | | | | | Change IoSender half close once it knows it has finished writing data down the pipe. This is done to prevent the peer from seeing sporadic socket exception 'connection resets' if it happens that the other side closes the socket first. If half close is not supported (windows platform or SSLSocket), this change has no effect. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1657313 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6350: [Java Client] Partial revert of r1655877.Keith Wall2015-02-042-9/+6
| | | | | | | | | | | | My solution was not solving the problem in all situations git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1657312 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6350: [Java Client] Preserve original connection exceptionKeith Wall2015-01-292-6/+9
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1655877 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6336: Add extra logging to help understand occasional SSLTest failure ↵Keith Wall2015-01-281-0/+5
| | | | | | | | | | | | showing on slow CI box git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1655485 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6345 : Allow enabled cipher suites to be configuredRobert Godfrey2015-01-283-17/+92
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1655457 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6342 : Fail fast when commands sent in wrong orderRobert Godfrey2015-01-271-32/+32
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1655186 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6340 : Allow defaults for system properties to be overridden from a ↵Robert Godfrey2015-01-272-0/+109
| | | | | | | | | | | | properties file git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1655142 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6339 : Use variable interpolation for help url and initial virtual host ↵Robert Godfrey2015-01-271-10/+16
| | | | | | | | | | | | config git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1655138 13f79535-47bb-0310-9956-ffa450edef68
* | Remove accepting thread and use non blocking io acceptRobert Godfrey2015-02-012-182/+152
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1656365 13f79535-47bb-0310-9956-ffa450edef68
* | Reduce copying in 0-9 pathRobert Godfrey2015-02-0111-73/+211
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1656312 13f79535-47bb-0310-9956-ffa450edef68
* | Separate Byte and ProtocolEvent sender/receivers, add server specific 0-10 ↵Robert Godfrey2015-01-3135-189/+254
| | | | | | | | | | | | encoder git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1656248 13f79535-47bb-0310-9956-ffa450edef68
* | close sockets when connection is closedRobert Godfrey2015-01-291-4/+33
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1655881 13f79535-47bb-0310-9956-ffa450edef68
* | Correctly deregister and also optimise case where work can be rescheduled on ↵Robert Godfrey2015-01-292-120/+107
| | | | | | | | | | | | same thread git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1655825 13f79535-47bb-0310-9956-ffa450edef68
* | Use a threadpool for the schedulerRobert Godfrey2015-01-291-6/+44
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1655641 13f79535-47bb-0310-9956-ffa450edef68
* | Fix selector leakRobert Godfrey2015-01-291-9/+0
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1655597 13f79535-47bb-0310-9956-ffa450edef68
* | Ensure selectors are closed, and all work which can be done on a read is doneRobert Godfrey2015-01-292-65/+63
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1655596 13f79535-47bb-0310-9956-ffa450edef68
* | Close the selectorRobert Godfrey2015-01-281-0/+9
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1655486 13f79535-47bb-0310-9956-ffa450edef68
* | Close the selector threadRobert Godfrey2015-01-282-4/+14
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1655482 13f79535-47bb-0310-9956-ffa450edef68
* | WIP: First phase of moving towards threadpool for IO threads. Introduced ↵Keith Wall2015-01-284-59/+332
| | | | | | | | | | | | SelectorThread and scheduler that currently runs the IO activity in the same thread. SSLTests failing git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1655392 13f79535-47bb-0310-9956-ffa450edef68
| |
| \
*-. \ Merge from trunkKeith Wall2015-01-276-60/+140
|\ \ \ | | |/ | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1655057 13f79535-47bb-0310-9956-ffa450edef68
| | * QPID-6304: [Java Broker] Allow truststore and keystore (JKS) files to be ↵Andrew MacBean2015-01-144-38/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stored as a data:// URL inside the config * Added truststore/keystore unit tests too to cover both new and (most of) the existing functionality, retiring the equivilent slower REST system tests. * Added single REST test exercising the creation of a keystore/teststore from data:// URL. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1651615 13f79535-47bb-0310-9956-ffa450edef68
| | * QPID-6293: [Java Broker] Log Java Broker's pid on startupKeith Wall2014-12-302-22/+53
| | | | | | | | | | | | | | | | | | | | | * Log the process identifer on startup as an operational log message * Wired up the Broker attribute Broker#processPid git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1648545 13f79535-47bb-0310-9956-ffa450edef68
| * | Merge from trunkAidan Skinner2009-10-112-1/+1
| | | | | | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@824198 13f79535-47bb-0310-9956-ffa450edef68
| * | Fix bind error messageAidan Skinner2009-09-181-2/+2
| | | | | | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@816614 13f79535-47bb-0310-9956-ffa450edef68
| * | MINANetworkDriverTest: Make sure we sleep for at least the alloted time.Aidan Skinner2009-09-181-16/+20
| | | | | | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@816613 13f79535-47bb-0310-9956-ffa450edef68
| * | QPID-2024 QPID-2105: Remove now unnecessary classes like Event, PoolingFilter, Aidan Skinner2009-09-176-930/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | ReadWriteThreadModel. Move the couple of necessary methods to Job. Fix imports. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@816232 13f79535-47bb-0310-9956-ffa450edef68
| * | QPID-2015: Remove AMQIoTransportProtocolSession. Release the executor ↵Aidan Skinner2009-09-161-3/+0
| | | | | | | | | | | | | | | | | | service in the same class as it's acquired git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@815729 13f79535-47bb-0310-9956-ffa450edef68
| * | QPID-2105: Make NetworkDriver.open use a SSLContextFactory, not an SSLEngine.Aidan Skinner2009-09-167-46/+253
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow an existing SocketConnector to be passed into a MINANetworkDriver, for use with the ExistingSocket bit of TransportConnection. Move the ExistingSocket stuff to one place, use MINANetworkDriver in TransportConnection and make AMQProtocolHandler implement ProtocolEngine. Remove MINA specific gubbins from AMQProtocolHandler and AMQProtocolSession. Move fireAsynchEvent to Job Add getLocalAddress to AMQProtocolEngine Move TestNetworkDriver to common Use correct class for logger in AMQProtocolEngine Check the exception is thrown properly in SimpleACLTest, make it a little less prone to obscure race conditions. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@815704 13f79535-47bb-0310-9956-ffa450edef68
| * | Merge from trunk Aidan Skinner2009-09-091-2/+4
| | | | | | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@812936 13f79535-47bb-0310-9956-ffa450edef68
| * | QPID-2025: Log errors instead of printStackTracing()Aidan Skinner2009-09-041-1/+7
| | | | | | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@811326 13f79535-47bb-0310-9956-ffa450edef68
| * | QPID-2025: Add a AMQProtocolEngine from the de-MINAfied ↵Aidan Skinner2009-09-0115-106/+431
| | | | | | | | | | | | | | | | | | AMQMinaProtocolSession. Remove various now-unused classes and update references. Add tests for AMQDecoder. Net -1500 lines, +25% performance on transient messaging. Nice. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@810110 13f79535-47bb-0310-9956-ffa450edef68
| * | QPID-2024: Change send to stash the future and have flush join on that so ↵Aidan Skinner2009-08-192-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that it only returns when all data has been written. Add getLocalAddress. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@805809 13f79535-47bb-0310-9956-ffa450edef68
| * | QPID-2024: Add ProtocolEngine and NetworkDriver interfaces and a ↵Aidan Skinner2009-08-188-0/+1123
| | | | | | | | | | | | | | | | | | NetworkDriver implementation that uses MINA. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@805477 13f79535-47bb-0310-9956-ffa450edef68
* | | Remove dead setIdleTimeout methodKeith Wall2014-12-128-50/+0
| | | | | | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1644950 13f79535-47bb-0310-9956-ffa450edef68
* | | Reduce logging, use bytebuffers on the read path in a more optimal fashsion.Keith Wall2014-12-123-50/+46
| | | | | | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1644928 13f79535-47bb-0310-9956-ffa450edef68
* | | Notify engine when transport is blockedRobert Godfrey2014-12-123-11/+11
| | | | | | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1644870 13f79535-47bb-0310-9956-ffa450edef68
* | | Extend credit managers to be aware of transport backpressueKeith Wall2014-12-111-0/+4
| | | | | | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1644704 13f79535-47bb-0310-9956-ffa450edef68
View Lorry Controller Status