summaryrefslogtreecommitdiff
path: root/java
Commit message (Collapse)AuthorAgeFilesLines
* Merged revisions 667561 via svnmerge from Martin Ritchie2008-06-1311-108/+486
| | | | | | | | | | | | | | | https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.x ........ r667561 | ritchiem | 2008-06-13 15:56:45 +0100 (Fri, 13 Jun 2008) | 3 lines QPID-1136 : Provided a fix for the leak in UnacknowledgedMessage when acking. Added a new InternalBrokerBaseCase for performing testing on the broker without using the client libraries. This allows for testing closer to AMQP. Further investigation is required to identify why the .Net was causing the refcounting problems that required the previous change to Unacknowledged message introducing this . ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.x@667574 13f79535-47bb-0310-9956-ffa450edef68
* Merged revisions 663999-664020 via svnmerge from Martin Ritchie2008-06-065-3/+454
| | | | | | | | | | | | | | | | | | | | | https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.x ........ r663999 | ritchiem | 2008-06-06 17:03:42 +0100 (Fri, 06 Jun 2008) | 1 line QPID-1058 : Added new CramMD5HexSaslClient.cs and registered it in the Sasl Factory and the client CallbackHandler ........ r664001 | ritchiem | 2008-06-06 17:03:48 +0100 (Fri, 06 Jun 2008) | 1 line QPID-1058 : Addition of a CRAM-MD5-HEX as discussed on the JIRA. An additional test is provided to ensure that the handle method correctly wraps a given Database password in hex. ........ r664020 | ritchiem | 2008-06-06 17:32:49 +0100 (Fri, 06 Jun 2008) | 2 lines QPID-1058 : Removal of Console WriteLine as highlighted in code review by Robert Godfrey. ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.x@664028 13f79535-47bb-0310-9956-ffa450edef68
* Merged revisions 663125 via svnmerge from Martin Ritchie2008-06-046-2/+578
| | | | | | | | | | | | | | | | | | https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.x ........ r663125 | ritchiem | 2008-06-04 15:32:49 +0100 (Wed, 04 Jun 2008) | 6 lines QPID-1119 : M2x commit : Addition of a System property to AMQProtocolHandler.java to allow the syncWait default to be changed. To perform this a new SlowMessageStore has been added to the systest package. This allows all MessageStore methods to have a pre and/or post delay applied. This delay can be configured dynamically if you have a handle to the Store or via the XML configuration. The SlowMessageStore can also be used to wrap any existing MessageStore (Testing only carried out with the default MemoryMessageStore) To make testing easier on M2x VMTestCase has been modified to allow the test to simply configure logging levels and systemProperties. These are then reverted after the test has completed. These changes will naturally need more work to before they are merged to trunk which uses totally different methods for ClientProperties and for running tests. systests/pom.xml didn't have amqj.logging.level as a systemProperty hence setting it did nothing for the tests. ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.x@663142 13f79535-47bb-0310-9956-ffa450edef68
* Merged revisions 662818 via svnmerge from Martin Ritchie2008-06-031-4/+153
| | | | | | | | | | | | | https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.x ........ r662818 | ritchiem | 2008-06-03 16:07:07 +0100 (Tue, 03 Jun 2008) | 1 line QPID-1117 : Added tests for all other message types. Refactored the common parts out of the objectTest. ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.x@662820 13f79535-47bb-0310-9956-ffa450edef68
* Merged revisions 662770 via svnmerge from Martin Ritchie2008-06-032-23/+102
| | | | | | | | | | | | | | https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.x ........ r662770 | ritchiem | 2008-06-03 13:32:47 +0100 (Tue, 03 Jun 2008) | 3 lines QPID-1092 : Changed toString to be String.valueOf(getObject()) Added MessageToStringTest, tests performing toString on Message before calling getObject(). ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.x@662773 13f79535-47bb-0310-9956-ffa450edef68
* Merged revisions 661739-661746 via svnmerge from Martin Ritchie2008-06-024-14/+92
| | | | | | | | | | | | | | | | | https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.x ........ r661739 | ritchiem | 2008-05-30 15:42:38 +0100 (Fri, 30 May 2008) | 1 line QPID-1103 :Changed VMTestCase to allow the creation of InVM brokers based on a configuration file. Updated ApplicationRegistry as it was not correctly utilising the set configuration and always using AR 1. ........ r661746 | ritchiem | 2008-05-30 15:54:35 +0100 (Fri, 30 May 2008) | 1 line QPID-1101 : Update to DestNameExchange to perform deep copy. ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.x@662467 13f79535-47bb-0310-9956-ffa450edef68
* Merged revisions 648740 via svnmerge from Martin Ritchie2008-05-201-1/+6
| | | | | | | | | | | | | https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.x ........ r648740 | ritchiem | 2008-04-16 17:29:07 +0100 (Wed, 16 Apr 2008) | 1 line QPID-886 : In order to allow the test to be written that highlights the failure we need to be able to provide a Config object not a file. So made the method public that reads the file and added constructor to use the Config object. ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.x@658278 13f79535-47bb-0310-9956-ffa450edef68
* Merged revisions 658166 via svnmerge from Martin Ritchie2008-05-202-22/+42
| | | | | | | | | | | | | | | | | | | | https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.x ................ r658166 | ritchiem | 2008-05-20 09:37:33 +0100 (Tue, 20 May 2008) | 9 lines Merged revisions 657859 via svnmerge from https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid ........ r657859 | ritchiem | 2008-05-19 17:54:06 +0100 (Mon, 19 May 2008) | 1 line QPID-1066 : Removed isInfo wrapping. Added test that is missing from trunk from M2.x QueueDepthSelectorTest. ........ ................ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.x@658175 13f79535-47bb-0310-9956-ffa450edef68
* Merged revisions 657111 via svnmerge from Aidan Skinner2008-05-162-23/+22
| | | | | | | | | | | | | | | | | | | | https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.x ................ r657111 | aidan | 2008-05-16 16:53:21 +0100 (Fri, 16 May 2008) | 9 lines Merged revisions 657097 via svnmerge from https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid ........ r657097 | rgodfrey | 2008-05-16 16:08:55 +0100 (Fri, 16 May 2008) | 1 line QPID-1060 : Release ref to transient meta data; cache message size ........ ................ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.x@657116 13f79535-47bb-0310-9956-ffa450edef68
* Merged revisions 653416 via svnmerge from Aidan Skinner2008-05-163-7/+20
| | | | | | | | | | | | | https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.x ........ r653416 | aidan | 2008-05-05 11:24:50 +0100 (Mon, 05 May 2008) | 1 line QPID-1019 prevent messages being dequeued unecessarily, from rgodfrey ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.x@657101 13f79535-47bb-0310-9956-ffa450edef68
* QPID-839 fix test to avoid potential race condition and general incorrectnessAidan Skinner2008-05-121-18/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.x@655470 13f79535-47bb-0310-9956-ffa450edef68
* Merged revisions 652388-653415,653417-654109 via svnmerge from Aidan Skinner2008-05-092-99/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.x ........ r652388 | ritchiem | 2008-04-30 15:40:18 +0100 (Wed, 30 Apr 2008) | 2 lines QPID-889 : Removed _reapingStoreContext from CSDM replaced with local StoreContext()s so they are not reused by different threads. ........ r652389 | ritchiem | 2008-04-30 15:40:45 +0100 (Wed, 30 Apr 2008) | 1 line QPID-887 : Renamed QueueHouseKeeping threads so they can be identified in thread dump. Named Queue-housekeeping-<virtualhost name> ........ r652399 | ritchiem | 2008-04-30 16:32:42 +0100 (Wed, 30 Apr 2008) | 1 line QPID-888,QPID-886 : Fixed all management uses of _lock.lock / _lock.unlock so that they correctly call unlock from a finally block in the CSDM. There are two issues that cover that. QPID-888 - Fix the management ones and QPID-886 to fix the use in removeExpired. ........ r652567 | aidan | 2008-05-01 17:32:20 +0100 (Thu, 01 May 2008) | 1 line QPID-994 Dont wait for attain state as connection is closed by we get CloseOk ........ r652568 | aidan | 2008-05-01 17:35:09 +0100 (Thu, 01 May 2008) | 1 line QPID-1001 dont set the expiration time if TTL is 0 ........ r653447 | aidan | 2008-05-05 13:26:29 +0100 (Mon, 05 May 2008) | 1 line Check if consumer is closed and dont reclose it ........ r653451 | aidan | 2008-05-05 13:29:15 +0100 (Mon, 05 May 2008) | 1 line QPID-1022 Use synchronous writes to fix race conditions ........ r653452 | aidan | 2008-05-05 13:30:45 +0100 (Mon, 05 May 2008) | 1 line QPID-1023 increase some timeouts ........ r653760 | aidan | 2008-05-06 13:40:34 +0100 (Tue, 06 May 2008) | 3 lines QPID-1029: Generate temporary queue names using GUIDs to ensure uniqueness. ........ r654097 | aidan | 2008-05-07 14:25:38 +0100 (Wed, 07 May 2008) | 2 lines QPID-952, QPID-951, QPID-1032 Fix failover, ensure that it is properly detected, that frames are replayed approrpiately and that failover does not timeout. ........ r654104 | aidan | 2008-05-07 14:46:51 +0100 (Wed, 07 May 2008) | 1 line QPID-952 should have been part of previous commit ........ r654109 | aidan | 2008-05-07 14:56:09 +0100 (Wed, 07 May 2008) | 2 lines QPID-1036 increase timeouts to more reasonable levels, ensure that durable queues are deleted when no longer needed ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.x@654818 13f79535-47bb-0310-9956-ffa450edef68
* Moved all references to M2.1 to M2.1.x-SNAPSHOTMartin Ritchie2008-05-0921-45/+45
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.x@654785 13f79535-47bb-0310-9956-ffa450edef68
* QPID-916 Correct release notesAidan Skinner2008-04-131-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1-release@647616 13f79535-47bb-0310-9956-ffa450edef68
* use svnexe for uploading, generate source jarsAidan Skinner2008-04-0817-2/+222
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1-release@646114 13f79535-47bb-0310-9956-ffa450edef68
* Update release notesAidan Skinner2008-04-071-84/+7
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1-release@645731 13f79535-47bb-0310-9956-ffa450edef68
* Add toplevel NOTICE and LICENSE files, add Felix to java/resources/NOTICE, ↵Aidan Skinner2008-04-072-2/+9
| | | | | | make sure all spec files are included in java source distribution git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1-release@645593 13f79535-47bb-0310-9956-ffa450edef68
* Set version to M2.1 for all, it's release timeAidan Skinner2008-04-0119-40/+40
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1-release@643613 13f79535-47bb-0310-9956-ffa450edef68
* Update version in pomsAidan Skinner2008-03-3119-41/+41
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1-release@643162 13f79535-47bb-0310-9956-ffa450edef68
* Add licenscesAidan Skinner2008-03-3128-6/+551
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@643153 13f79535-47bb-0310-9956-ffa450edef68
* QPID-890 : Removed old references to VHostPrincipalDatabase and an errant ↵Martin Ritchie2008-03-311-18/+3
| | | | | | | | old.PrincipalDatabaseAccessManager change. This file should now work. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@643032 13f79535-47bb-0310-9956-ffa450edef68
* QPID-875 : Dropped logging level to debug.Martin Ritchie2008-03-241-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@640434 13f79535-47bb-0310-9956-ffa450edef68
* QPID-874 use getQueueDepth properlyAidan Skinner2008-03-241-1/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@640426 13f79535-47bb-0310-9956-ffa450edef68
* QPID-872 : Adjusted TimeToLive test receive calls to use a wait of 1s(1000) ↵Martin Ritchie2008-03-241-3/+3
| | | | | | as 100ms was unreasonably short. This was causing test failures on a slower machine where no failure had really occurred. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@640422 13f79535-47bb-0310-9956-ffa450edef68
* QPID-873 : Authentication Exception should be hard error; also NPE in ↵Robert Godfrey2008-03-242-3/+7
| | | | | | PropertiesPrincipalDatabase when user not known git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@640417 13f79535-47bb-0310-9956-ffa450edef68
* QPID-868 : The acl.config.xml was using Base64MD5 PF which cannot be used ↵Martin Ritchie2008-03-211-2/+2
| | | | | | inVM as the SASL manager complains about the registration of the client and broker moudules. They appear to overwrite each other. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@639684 13f79535-47bb-0310-9956-ffa450edef68
* QPID-868 : Removed the acl.config.xml from systests/etc and updated the ↵Martin Ritchie2008-03-213-231/+2
| | | | | | systests pom file to locate the one in broker/etc. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@639629 13f79535-47bb-0310-9956-ffa450edef68
* QPID-867 Always close connectionsAidan Skinner2008-03-211-12/+66
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@639619 13f79535-47bb-0310-9956-ffa450edef68
* QPID-866 : Based on Patch from ASkinner. Only the FailoverException makes ↵Martin Ritchie2008-03-212-8/+40
| | | | | | sence to process this way so remove list and synchronized so we either do an add or throw the set FailoverException. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@639598 13f79535-47bb-0310-9956-ffa450edef68
* QPID-854 : Renamed logger class to be correct, Reverting change from 637176Martin Ritchie2008-03-201-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@639269 13f79535-47bb-0310-9956-ffa450edef68
* QPID-854 Resynchronise the _acceptor so that we don't hangAidan Skinner2008-03-202-8/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@639251 13f79535-47bb-0310-9956-ffa450edef68
* QPID-847 : Fixed this test for the selectorsMartin Ritchie2008-03-191-5/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@638951 13f79535-47bb-0310-9956-ffa450edef68
* QPID-862 : Add IOException to valid reason to start failover and removed the ↵Martin Ritchie2008-03-191-2/+2
| | | | | | propogation of the error to client, as they don't need to know of the error unless failover fails. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@638950 13f79535-47bb-0310-9956-ffa450edef68
* QPID 854 Add a connect delay to FailOverBaseCase so we don't end up in a ↵Aidan Skinner2008-03-191-1/+1
| | | | | | race condition where mina closes the broker. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@638926 13f79535-47bb-0310-9956-ffa450edef68
* QPID-841 : SimpleACLTest didn't close a client connectionMartin Ritchie2008-03-191-0/+7
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@638816 13f79535-47bb-0310-9956-ffa450edef68
* QPID-854 : Removed cleanQueue requirement for now as a lot of tests are not ↵Martin Ritchie2008-03-191-1/+2
| | | | | | cleaning up correctly. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@638805 13f79535-47bb-0310-9956-ffa450edef68
* QPID-854Aidan Skinner2008-03-192-6/+21
| | | | | | | | AcknowledgeTest clean up messages that are left on the queue VMTestCase remove bogus DummyTestCase which causes problems with a lot of tests now that we check for queue cleanliness git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@638799 13f79535-47bb-0310-9956-ffa450edef68
* QPID-854 : Tests were failing as the new connection hadn't been started. ↵Martin Ritchie2008-03-192-21/+45
| | | | | | Also replaced purgeQueue with checkQueuesClean as the tests should ensure they have tidied up.. if they haven't then something has gone wrong. So purging will just hide that issue. Used a second connection in the QBAAT to validate the messages to be sure they are still there. This also fixes the issues with Transacted and ClientAck where the messages would of course go back on the queue as no ack or commit were performed. Using a new connection is also cleaner as it ensures the queue browsing has no side effects for other users of the system. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@638760 13f79535-47bb-0310-9956-ffa450edef68
* QPID-854 : Renabled the test as the cause was the lack of closing of the ↵Martin Ritchie2008-03-182-11/+13
| | | | | | purgeQueue connection in VMTestCase git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@638412 13f79535-47bb-0310-9956-ffa450edef68
* QPID-847 : Prevented the InvalidArgumentException from closing the connection.Martin Ritchie2008-03-185-1/+33
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@638346 13f79535-47bb-0310-9956-ffa450edef68
* QPID-854 : Disabled one of the failover QueueBrowser tests as I believe it ↵Martin Ritchie2008-03-181-11/+15
| | | | | | to be a problem with mina and inVM broker. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@638322 13f79535-47bb-0310-9956-ffa450edef68
* QPID-841,QPID-854 : Reinstated SimpleACLTest and removed QueueBrowserTest ↵Martin Ritchie2008-03-171-2/+1
| | | | | | from the junit-toolkit run for now as the class has been renamed git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@637992 13f79535-47bb-0310-9956-ffa450edef68
* QPID-858 : Added cancel to the housekeeping thread when the vhost is closed.Martin Ritchie2008-03-171-0/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@637991 13f79535-47bb-0310-9956-ffa450edef68
* QPID-857 : Reset the State Manager when receiveing a CLOSED state.Martin Ritchie2008-03-171-4/+10
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@637989 13f79535-47bb-0310-9956-ffa450edef68
* QPID-849 : Client Deadlock, there are various points where we take the ↵Martin Ritchie2008-03-172-83/+88
| | | | | | failover mutex to check the _closed values which if it is false then that is all we do. As the _closed check doesn't require the mutex then move all the checks out side of the mutex lock. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@637986 13f79535-47bb-0310-9956-ffa450edef68
* QPID-854 : Fixed QueueBrowser tests that use ClientAck and Transacted, which ↵Martin Ritchie2008-03-171-0/+35
| | | | | | appear to leave msgs behind per test. Even though each test should be on a new VM broker. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@637979 13f79535-47bb-0310-9956-ffa450edef68
* QPID-847 : InvalidSelectorException. This was caused by the Broker now being ↵Martin Ritchie2008-03-172-16/+186
| | | | | | more AMQP spec compliant than previously. Reverted the change in AMQMinaProtocolSession.java that is causing the issue but we need to correctly fix this issue in the client as the client is not AMQP spec compliant, even with the STRICT_AMQP flag. Updated SelectorTest.java with an additional test so we don't have the functionality reversion later. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@637977 13f79535-47bb-0310-9956-ffa450edef68
* QPID-850 : Close client connection if it is appropriate. This was hanging ↵Martin Ritchie2008-03-171-0/+10
| | | | | | the tests because VMTestCase has a dummy test that causes a new connection to be init'd but never closed git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@637896 13f79535-47bb-0310-9956-ffa450edef68
* QPID-856 : Moved unbind out of the synchronized block as it doesn't need to ↵Martin Ritchie2008-03-171-2/+7
| | | | | | be done there. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@637828 13f79535-47bb-0310-9956-ffa450edef68
* QPID-854 : This test required a change as a result of the QueueBrowser Tests. Martin Ritchie2008-03-141-16/+17
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@637176 13f79535-47bb-0310-9956-ffa450edef68