summaryrefslogtreecommitdiff
path: root/qpid/java/common
Commit message (Collapse)AuthorAgeFilesLines
* 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
* QPID-2040: add a copy method to FileUtils that throws checked exceptions ↵Robert Gemmell2009-08-171-18/+31
| | | | | | instead of wrapping as them runtime exceptions git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@805016 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2002 : Change CON-1001 to make client ID optional so that the various ↵Martin Ritchie2009-08-031-0/+7
| | | | | | | | | | | | | stages of Open can be correctly logged. Client ID is not initially provided so we would be unable to log the protocol negotiation without removing this Modified ProtocolVersion Template to include a toString value to make it easier to log. There are two templates to update one in gentools/templ.java and one in common/templates Exposed verification methods to allow systests to reuse the code git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@800363 13f79535-47bb-0310-9956-ffa450edef68
* fixed session memory leak exposed by SessionCreateTestRafael H. Schloming2009-07-251-2/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@797705 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1992 : Addition of new Broker Logging FrameworkMartin Ritchie2009-07-222-78/+184
| | | | | | | | | | | | | | | | | | | | | | | | | | | Provided static CurrentActor for accessing ThreadLocal. Included Test to validate setting of ThreadLocals. Added Test for AMQPActor Added getRootMessageLogger() to IApplicationRegistry Adjusted *ProtocolSessions to start counting at 0. Allowed Setting of Vhost on the MockProtocolSession Created a fixed Principle in MockProtocolSession Changes to MockProtocolSession, prevent NPEs when the AMQPActor creates its log string. Converted CurrentActor to use a Stack allowing a variety of actors to take their turn on a thread. Improved package structure Added testing for Actors Moved FileMonitorTools functionality to FileUtils and provided a Test Converted Log4jMessageLoggerTest to a proper UnitTest Moved Test cases to test package Updated other broker tests to set the authenticated user before setting the virtualhost, Whilst the logging could output null as the username it would be better if the tests correctly set the authorizedID. Update to include tests for disabled logging Fully tested LogSubjects Updated MockAMQQueue to be able to take a Virtualhost as per a normal Queue. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@796650 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1797: update bundle version format and output filenames, modify ant ↵Robert Gemmell2009-07-112-2/+3
| | | | | | | | | bundle task only to run for required modules git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@793184 13f79535-47bb-0310-9956-ffa450edef68
* added script for generating maven poms and moved disposable build output ↵Rafael H. Schloming2009-07-081-0/+2
| | | | | | underneath build/scratch git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@792094 13f79535-47bb-0310-9956-ffa450edef68
* fixed hang in SSL client, ssl profile still fails due to port conflicts, but ↵Rafael H. Schloming2009-07-012-14/+24
| | | | | | it should no longer hang git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@790161 13f79535-47bb-0310-9956-ffa450edef68
* cleaned up extraneous whitespaceRafael H. Schloming2009-06-302-83/+83
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@789887 13f79535-47bb-0310-9956-ffa450edef68
* made test ports configurable; this required adding variable expansion to ↵Rafael H. Schloming2009-06-181-0/+144
| | | | | | PropertiesFileInitialContextFactory git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@786269 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1893: echo back a heartbeat when we receive oneRafael H. Schloming2009-06-081-0/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@782633 13f79535-47bb-0310-9956-ffa450edef68
* This is related to QPID-1875Rajith Muditha Attapattu2009-05-281-1/+1
| | | | | | | | The BindingURLParser is updated to grab the clientID and subscription to form the queue name. I also added a test case to cover this. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@779651 13f79535-47bb-0310-9956-ffa450edef68
* This is related to QPID-1854Rajith Muditha Attapattu2009-05-141-1/+8
| | | | | | | | | The sender.close is now surrounded with a try catch to handle the exception thrown by the IoSender.close(). The ideal situation would have been to pass false to the IoSender.close(boolean reportException) method which will then not throw the exception up the stack. But that method is not exposed in the Sender interface. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@774817 13f79535-47bb-0310-9956-ffa450edef68
* This is related to QPID-1853. Since the socket is being closed inside the ↵Rajith Muditha Attapattu2009-05-141-1/+0
| | | | | | finnaly block we can remove the socket.close after the while loop inside the run method. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@774812 13f79535-47bb-0310-9956-ffa450edef68
* This is a fix for QPID-1857Rajith Muditha Attapattu2009-05-131-0/+2
| | | | | | | We now create a new session id, instead of reusing the same when it tries to attach the session after failover. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@774452 13f79535-47bb-0310-9956-ffa450edef68
* This is a fix for QPID-1854Rajith Muditha Attapattu2009-05-131-0/+1
| | | | | | | | I have added a sender.close() inside the closed() method in the Connection.java This ensures the sender is closed and the IoSender thread is shutdown gracefully. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@774305 13f79535-47bb-0310-9956-ffa450edef68
* This is a fix for QPID-1853. We now close the socket in the finnally block.Rajith Muditha Attapattu2009-05-131-0/+8
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@774297 13f79535-47bb-0310-9956-ffa450edef68
* This is related to QPID-1839Rajith Muditha Attapattu2009-05-041-2/+12
| | | | | | | | | I added a timeout (that could be configured via qpid.ssl_timeout if needed) to notify the application, 1) if the broker fails to respond in a timely manner 2) if there was an error and the broker has already closed the connection. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@771470 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1803 : Fixed potential NPE in FileUtils.deleteMartin Ritchie2009-04-101-2/+10
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@764076 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1798: Update AMQQueueMBean to use new constant value of DeliveryMode, ↵Robert Gemmell2009-04-101-0/+4
| | | | | | replacing previously incorrect literal value used in conditional statement and thus preventing the reversal of delivery mode status. Also update other broker classes making similar comparisons using a literal value to use a constant git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@764026 13f79535-47bb-0310-9956-ffa450edef68
* This is a fix for QPID-1773Rajith Muditha Attapattu2009-03-241-1/+14
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@758017 13f79535-47bb-0310-9956-ffa450edef68
* This is to correct a mistake pointed out in the dev listRajith Muditha Attapattu2009-03-241-1/+1
| | | | | | | | The method connect(host, port, vhost, username, password, false,"PLAIN"); is using the hardcoded value false for the ssl paramter. This commit modified the code to use ssl as the parameter instead. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@757640 13f79535-47bb-0310-9956-ffa450edef68
* Fix for QPID-1761 and QPID-1762: made BBEncoder.grow() flip the buffer ↵Rafael H. Schloming2009-03-202-0/+58
| | | | | | before copying; added a BBEncoder test; made unrecognized mime types default to BytesMessage; added logging of exception root cause to AMQSession; fixed miscelaneous test failures git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@756328 13f79535-47bb-0310-9956-ffa450edef68
* These classes are not used in any meaningful way.Rajith Muditha Attapattu2009-03-191-200/+0
| | | | | | | I am removing them to avoid any confusion they may cause. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@756231 13f79535-47bb-0310-9956-ffa450edef68
* Removed false positive return from FU.delete(). Delete mirrors functionality ↵Martin Ritchie2009-03-092-8/+16
| | | | | | provided by java.io. Attempting to delete an non-existent file returns false. The caller must handle this correctly. If client provides a null value then the call will throw a NPE which is a valid java response. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@751720 13f79535-47bb-0310-9956-ffa450edef68
* FileUtils would report a failure to delete a non-existent fileMartin Ritchie2009-03-092-2/+12
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@751636 13f79535-47bb-0310-9956-ffa450edef68
* FileUtils : Was not correctly handling the case where a File object became ↵Martin Ritchie2009-03-061-7/+8
| | | | | | null, it would previously have thrown a NPE which was erroneously caught this and declared the delete to have failed. If there is nothing to delete (signified by the Null File object) then the delete should pass. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@750946 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1708: go into CLOSED instead of DETACHED state when there is an ↵Rafael H. Schloming2009-03-032-3/+60
| | | | | | execution exception git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@749740 13f79535-47bb-0310-9956-ffa450edef68
* Added check for when file reference becomes null, occurs if the file is ↵Martin Ritchie2009-03-021-3/+8
| | | | | | externally deleted. Also noted success return value was never propogated correctly, Updated : Test needed. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@749330 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1701: fixed potential deadlock on connection closeRafael H. Schloming2009-02-272-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@748594 13f79535-47bb-0310-9956-ffa450edef68
* don't block unreliable commands during resumeRafael H. Schloming2009-02-261-1/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@748119 13f79535-47bb-0310-9956-ffa450edef68
* Made the various receive variants check that the server queue is empty ↵Rafael H. Schloming2009-02-256-10/+43
| | | | | | before returning null. Also modified AMQQueueBrowser to use receiveNoWait() when browsing queues using 0-10. These changes uncovered numerous second order bugs, mostly in failover. These are also fixed. This fixes QPID-1642 and QPID-1643. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@747963 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1665: add a timer to ensure message acking is never delayed more than ↵Rafael H. Schloming2009-02-194-1/+27
| | | | | | 1000 ms by default, this is configurable by qpid.session.max_ack_delay git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@745892 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1658: added a byte limit for the number of commands in the session ↵Rafael H. Schloming2009-02-112-3/+25
| | | | | | replay buffer, and made the buffer length configurable git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@743455 13f79535-47bb-0310-9956-ffa450edef68
* Merge branch 'QPID-1583'Aidan Skinner2009-02-111-2/+1
| | | | | | | Conflicts: qpid/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@743304 13f79535-47bb-0310-9956-ffa450edef68
* Change package, remove dependency on Java DNS serverAidan Skinner2009-02-101-5/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@743029 13f79535-47bb-0310-9956-ffa450edef68
* Borrow NetMatcher from JAMES. Should probably be moved to commons-net at ↵Aidan Skinner2009-02-101-0/+264
| | | | | | some point. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@743015 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1652 : Created MessagePublishInfoImpl and Unit Test, removed the ↵Martin Ritchie2009-02-094-89/+187
| | | | | | several annoynmous classes that did all the same work. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@742496 13f79535-47bb-0310-9956-ffa450edef68
* Missed the modifications to FailoverRoundRobinServers.java during the commit ↵Rajith Muditha Attapattu2009-02-091-2/+0
| | | | | | | | | for QPID-1649 Missed the modifications to ServerDelegate during the cleanup done in rev 742269 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@742278 13f79535-47bb-0310-9956-ffa450edef68
* Removing unused classes from the great refactoring period.Rajith Muditha Attapattu2009-02-098-858/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@742269 13f79535-47bb-0310-9956-ffa450edef68