summaryrefslogtreecommitdiff
path: root/java
Commit message (Collapse)AuthorAgeFilesLines
* QPID-714 : (Patch from Aidan Skinner) Issue with competing, ↵Robert Godfrey2007-12-201-0/+151
| | | | | | | | transactional/client-ack consumers Ack each individual message on commit, not use multiple acks git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@606016 13f79535-47bb-0310-9956-ffa450edef68
* QPID-714 : (Patch from Aidan Skinner) Issue with competing, ↵Robert Godfrey2007-12-202-31/+5
| | | | | | | | transactional/client-ack consumers Ack each individual message on commit, not use multiple acks git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@606015 13f79535-47bb-0310-9956-ffa450edef68
* Changed test configs to use colons instead of commas.Rupert Smith2007-12-191-184/+16
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@605542 13f79535-47bb-0310-9956-ffa450edef68
* Multi threaded io commented out until all issues with it are resolved.Rupert Smith2007-12-182-2/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@605217 13f79535-47bb-0310-9956-ffa450edef68
* DUPS_OK mode set to be same as AUTO_ACK, fixed broken dups ok test.Rupert Smith2007-12-172-11/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@604928 13f79535-47bb-0310-9956-ffa450edef68
* QPID-707 : Added new test to check message count on broker as messages are ↵Martin Ritchie2007-12-144-31/+175
| | | | | | | | consumed to ensure that an ack is sent at 5000 mgs. Added acks on message consumer closure. Augmented VMTestCase to have helper methods for accessing broker statistics. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@604151 13f79535-47bb-0310-9956-ffa450edef68
* Added JDNI config for two broker, failover setup for failover tests. Also ↵Rupert Smith2007-12-072-10/+12
| | | | | | passed into FT tests config. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@602134 13f79535-47bb-0310-9956-ffa450edef68
* Update to disable ProtectIO by default.Martin Ritchie2007-12-074-7/+9
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@602082 13f79535-47bb-0310-9956-ffa450edef68
* Removed JMSXUserID as it appears the new mina is conflicting.Martin Ritchie2007-12-074-24/+24
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@602066 13f79535-47bb-0310-9956-ffa450edef68
* Merged revisions 594992-595694,595697-596350,596352-596362,596364-598327 via ↵Rupert Smith2007-11-309-148/+348
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svnmerge from https://svn.apache.org/repos/asf/incubator/qpid/branches/M2 ........ r594992 | ritchiem | 2007-11-14 18:00:28 +0000 (Wed, 14 Nov 2007) | 1 line QPID-685 : Update to address dependency issues and update the NOTICE file. ........ r595687 | rajith | 2007-11-16 14:54:01 +0000 (Fri, 16 Nov 2007) | 1 line moved the keys file to the parent folder ........ r595688 | rajith | 2007-11-16 15:00:22 +0000 (Fri, 16 Nov 2007) | 1 line removed the KEYS file, as now it is in the parent folder ........ r595740 | ritchiem | 2007-11-16 17:06:04 +0000 (Fri, 16 Nov 2007) | 1 line Fixed runtime dependency in the management console. ........ r596342 | rajith | 2007-11-19 15:56:29 +0000 (Mon, 19 Nov 2007) | 1 line added eclipse license details to the NOTICE file ........ r596650 | ritchiem | 2007-11-20 13:14:32 +0000 (Tue, 20 Nov 2007) | 1 line Added the full text of the additional licenses. ........ r596655 | ritchiem | 2007-11-20 13:22:53 +0000 (Tue, 20 Nov 2007) | 2 lines Added the full text of the additional licenses. Moved ICU licence text from NOTICE to LICENSE ........ r596657 | gsim | 2007-11-20 13:32:25 +0000 (Tue, 20 Nov 2007) | 3 lines Added boost license ........ r596665 | ritchiem | 2007-11-20 13:49:34 +0000 (Tue, 20 Nov 2007) | 1 line Added source links for EPL and MPL libraries ........ r598292 | rupertlssmith | 2007-11-26 14:45:15 +0000 (Mon, 26 Nov 2007) | 1 line Added incubator disclaimer. ........ r598311 | rupertlssmith | 2007-11-26 15:40:54 +0000 (Mon, 26 Nov 2007) | 1 line Added AMQP licence information. ........ r598327 | rajith | 2007-11-26 16:04:50 +0000 (Mon, 26 Nov 2007) | 1 line added disclaimers and AMP license to all languages ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@599814 13f79535-47bb-0310-9956-ffa450edef68
* Added new simple Request/Repsonse code as my last commit here seems to have ↵Martin Ritchie2007-11-302-0/+476
| | | | | | missed the actual code. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@599805 13f79535-47bb-0310-9956-ffa450edef68
* Mina Fix: Vm Pipe Starts Connection session before acceptor session. This ↵Martin Ritchie2007-11-293-8/+155
| | | | | | results in protocol frames arriving before the protocol decoder has been configured on the InVM Broker. Verification of this could be done by adding a client side filter that delays the first message by a few seconds. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@599572 13f79535-47bb-0310-9956-ffa450edef68
* QPID-564 QPID-92 Tidied up a few points and fixed infinite loop in Read IO ↵Martin Ritchie2007-11-291-142/+134
| | | | | | Thread git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@599533 13f79535-47bb-0310-9956-ffa450edef68
* QPID-92 QPID-564 Forgot to upgrade mina to 1.0.1Martin Ritchie2007-11-291-15/+15
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@599531 13f79535-47bb-0310-9956-ffa450edef68
* Update to broker to address fanout python failure.Martin Ritchie2007-11-292-4/+10
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@599375 13f79535-47bb-0310-9956-ffa450edef68
* Updated pom to correct version.Rupert Smith2007-11-281-88/+88
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@599066 13f79535-47bb-0310-9956-ffa450edef68
* Merged revisions 598371-598586 via svnmerge from Rupert Smith2007-11-2825-28/+1048
| | | | | | | | | | | | | | | | | | | | | https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1 ........ r598371 | ritchiem | 2007-11-26 18:17:12 +0000 (Mon, 26 Nov 2007) | 1 line Qpid-559 : OSGi Patch Provided by Aidan Skinner ........ r598572 | ritchiem | 2007-11-27 09:44:28 +0000 (Tue, 27 Nov 2007) | 1 line Add Target to ignores list. ........ r598586 | rupertlssmith | 2007-11-27 10:51:29 +0000 (Tue, 27 Nov 2007) | 1 line Now outputs test results in xml format to the surefire reports directory. ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@599036 13f79535-47bb-0310-9956-ffa450edef68
* CommitRollbackTest - this one just was never right.. now we have something ↵Martin Ritchie2007-11-281-25/+12
| | | | | | better. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@598835 13f79535-47bb-0310-9956-ffa450edef68
* QPID-679 : Patch provided by Aidan Skinner and additional from odd problems ↵Martin Ritchie2007-11-2811-125/+501
| | | | | | | | | | | | | | | | | | | | during test runs. AMQChannel - Catch and log AMQException occuring when requeue()-ing. Previously exceptions wouldn't be caught at all. The requeue() is called during closure so there is nothing we can do protocol wise on error other than log the issue and continue with any other shutdown that is needed. AMQMinaProtocolSession & AMQPFastProtocolHandler . Additions to catch and log AMQExceptions. Changes to AMQMinaProtocolSession were done to ignore all input on a closing session other than the close-ok. Previously only Protocol frames were ignored this resulted in Content*Body-s still being processed. Additional checks were made for the MessageStoreClosedException to log and continue. As said else were we need to seperate protocol exceptoions(AMQException) from internal code exception handling. Further All AMQExceptions occuring in the frameReceived method are now caught and logged. Allowing them to propogate higher will only result in thread death. AMQPFastProtocolHandler Caught AMQExceptions occuring whilst closing the session. Again allowing these to continue will result in thread death. There is not a lot that can be done other than log the problem as the session is already closed by this point. Prevented the stacktrace associated with a session exception being printed in the exceptionCaught method when the problem was an IO Exception. This doesn't add anything useful and only adds to the log file sizes. ApplicationRegistry - Added removeAll option which ensures that all ARs are correctly purged so that we can attempt to clean up between Unit Tests. MemoryMessageStore - This was causing us real problems during the failover testing. Similar checks should probably be made to any other Message Store Impl. The issue was that when shutting down the broker the MS.close() method is called this sets all the storage to null. However, there may still be message processing going on as the close() does not attempt to stop connection processing. Hence we now check to see if the Store is close throwing a MSClosedException if required. This prevents NPEs that have been seen during Unit failover testing. In fact the close() is called as a request to shutdown the ApplicationRegistry, but this only occurs from tests and broker shutdown, no attempt to unbind or prevent further connections during this period is yet done. CLIENT CHANGES AMQConnection - Added method to check if failover is in progress. AMQClient - Upgraded acknowledge() exception to JMSException for errors due to failover. Also , added call to update consumers as a result of failover. BasicMessageConsumer - Changes to acquireReceiving to take in to consideration blocking for failover to occur. wrt receiveNoWait.. which previously blocked for failover to complete... not exactly noWait. acknowledge will now TransportConnection - Update to ensure all inVM brokers are correctly killed. FailoverTest - QPID-679 - Finder of all the above problems. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@598834 13f79535-47bb-0310-9956-ffa450edef68
* QPID-621 : Patch Supplied by Aidan Skinner. Msg Ack after msg consumer is ↵Martin Ritchie2007-11-273-2/+46
| | | | | | closed. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@598721 13f79535-47bb-0310-9956-ffa450edef68
* Renamed POMs to M2.1.1 Removed erroneous equals() in ↵Martin Ritchie2007-11-2720-136/+37
| | | | | | SpecificMethodFrameListenerTest git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@598619 13f79535-47bb-0310-9956-ffa450edef68
* Merged revisions 598106-598232,598234-598286,598288-598323,598325-598361 via ↵Martin Ritchie2007-11-265-76/+219
| | | | | | | | | | | | | | | | | | | | | | | | | | | svnmerge from https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1 ........ r598337 | ritchiem | 2007-11-26 16:33:06 +0000 (Mon, 26 Nov 2007) | 1 line Last commit accidentally caught my failover change that wasn't complete. ........ r598352 | rupertlssmith | 2007-11-26 17:17:48 +0000 (Mon, 26 Nov 2007) | 1 line May have broken build with tktest plugin mojo, commented out until fixed. ........ r598357 | rupertlssmith | 2007-11-26 17:33:14 +0000 (Mon, 26 Nov 2007) | 1 line Fixed broken plugin. ........ r598360 | ritchiem | 2007-11-26 17:49:05 +0000 (Mon, 26 Nov 2007) | 1 line QPID-690 : Missing Test and code update. ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@598363 13f79535-47bb-0310-9956-ffa450edef68
* Merged revisions 597919-598104,598106-598323 via svnmerge from Martin Ritchie2007-11-2636-498/+1901
| | | | | | | | | | | | | | | | | https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1 ........ r598233 | rupertlssmith | 2007-11-26 11:38:27 +0000 (Mon, 26 Nov 2007) | 1 line Updated test framework to seperate JMS and AMQP specific test cases. Added configurable test decorators so that in vm connection can be injected at run time. ........ r598287 | rupertlssmith | 2007-11-26 14:28:46 +0000 (Mon, 26 Nov 2007) | 1 line Added tk test runner invocation to run framework tests on every build. ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@598328 13f79535-47bb-0310-9956-ffa450edef68
* QPID-92, QPID-564 : Upgraded Mina to 1.0.1 still not good enough but all ↵Martin Ritchie2007-11-2617-79/+3550
| | | | | | future versions currently have a bug with the CumulativeProtocolDecoder. It compact()s the buffer which breaks slices. Added MultiThread Support which is some of the feature set of QPID-564 git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@598285 13f79535-47bb-0310-9956-ffa450edef68
* Updated perftests to use JMS/JNDI lookup. Added some options to support ↵Rupert Smith2007-11-098-84/+159
| | | | | | non-Qpid middleware. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@593481 13f79535-47bb-0310-9956-ffa450edef68
* QPID-160 Addition of JMSXUserID to all messages through the java broker.Martin Ritchie2007-11-075-115/+161
| | | | | | | | As this will cause the headers to be re-encoded it can be disabled in the config.xml. Default is enabled as the sample config.xml should have all features enabled so that testing can observe the interactions. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@592729 13f79535-47bb-0310-9956-ffa450edef68
* Merged revisions ↵Rupert Smith2007-11-061-284/+395
| | | | | | | | | | | | | | | | | | | | | | | | | | | 587061-587924,587926-590773,590775-591035,591037-591059,591061-591090,591092-592353 via svnmerge from https://svn.apache.org/repos/asf/incubator/qpid/branches/M2 ........ r587061 | rupertlssmith | 2007-10-22 12:29:41 +0100 (Mon, 22 Oct 2007) | 1 line Updated benchmark tests for max throughput and a variety of latency tests modeling common use cases. ........ r588581 | rupertlssmith | 2007-10-26 10:32:11 +0100 (Fri, 26 Oct 2007) | 1 line Resized latency tests. ........ r590133 | rupertlssmith | 2007-10-30 16:02:24 +0000 (Tue, 30 Oct 2007) | 1 line Resized some benchmark tests to scale up to the saturation point. ........ r592353 | rupertlssmith | 2007-11-06 10:05:25 +0000 (Tue, 06 Nov 2007) | 1 line Changed perf test parameters. ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@592396 13f79535-47bb-0310-9956-ffa450edef68
* QPID-662 Transactional state not correctly reported after fail over. We now ↵Martin Ritchie2007-11-061-0/+12
| | | | | | | | record if we have sent any messages from here we can check if we have failed over and so have lost messages from the transaction making it invalid. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@592388 13f79535-47bb-0310-9956-ffa450edef68
* QPID-662 Transactional state not correctly reported after fail over. We now ↵Martin Ritchie2007-11-061-1/+1
| | | | | | | | record if we have sent any messages from here we can check if we have failed over and so have lost messages from the transaction making it invalid.- Forgot to remove a println. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@592385 13f79535-47bb-0310-9956-ffa450edef68
* QPID-662 Transactional state not correctly reported after fail over. We now ↵Martin Ritchie2007-11-067-172/+538
| | | | | | | | record if we have sent any messages from here we can check if we have failed over and so have lost messages from the transaction making it invalid. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@592374 13f79535-47bb-0310-9956-ffa450edef68
* QPID-663 Messages fail to be received after fail over. This is due to the ↵Martin Ritchie2007-11-061-10/+8
| | | | | | old protocol session being reinstated after fail over. The new protocol session needs to be set in the StateManager as this maintains its own reference which is not being updated hence messages are being lost. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@592373 13f79535-47bb-0310-9956-ffa450edef68
* Additional Test for ConnectionURLTest, ensuring retries are correctly parsed.Martin Ritchie2007-11-051-6/+43
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@591960 13f79535-47bb-0310-9956-ffa450edef68
* Resolved junit-toolkit SNAPSHOT dependencies onto version 0.6.1 which is in ↵Rupert Smith2007-10-243-24/+13
| | | | | | the central repository. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@587922 13f79535-47bb-0310-9956-ffa450edef68
* QPID-647 : Update to ConcurrentSelectorDeliveryManager to restart async ↵Martin Ritchie2007-10-191-7/+7
| | | | | | | | process if a msg is queued that has the potential to be delivered. Delayed the restart until the Filtering subscribers have the message enqueued to their PDQs. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@586489 13f79535-47bb-0310-9956-ffa450edef68
* QPID-654 : added a shutdownNow() call if the _taskPool hasn't terminiated by ↵Martin Ritchie2007-10-191-1/+11
| | | | | | the time we have finished closing. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@586374 13f79535-47bb-0310-9956-ffa450edef68
* QPID-653 : Updated timeoutsRobert Godfrey2007-10-196-28/+28
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@586344 13f79535-47bb-0310-9956-ffa450edef68
* QPID-637 : Patch provided by Aidan Skinner to ensure correct behaviour of ↵Martin Ritchie2007-10-182-127/+110
| | | | | | session closure. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@585912 13f79535-47bb-0310-9956-ffa450edef68
* QPID-647 : Async Process start/stop is not regulated tightly enough. Added ↵Martin Ritchie2007-10-181-17/+20
| | | | | | additional synchronisation to ensure that a new subscriber can start the async if required. As currently the start request can be missed. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@585906 13f79535-47bb-0310-9956-ffa450edef68
* QPID-645 : TxnBuffer should rethrow exceptions encountered on commitRobert Godfrey2007-10-172-9/+31
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@585642 13f79535-47bb-0310-9956-ffa450edef68
* QPID-647 : Update to ConcurrentSelectorDeliveryManager to restart async ↵Martin Ritchie2007-10-171-2/+21
| | | | | | process if a msg is queued that has the potential to be delivered. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@585575 13f79535-47bb-0310-9956-ffa450edef68
* Update to AMQMessage to reset the deliveredToConsumer flag(false) when the ↵Martin Ritchie2007-10-171-2/+6
| | | | | | message is released. This flag is now used by more than the immediate delivery. It is also used to understand if the message has been delivered so that we can tell the message should not be purged. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@585570 13f79535-47bb-0310-9956-ffa450edef68
* QPID-643 : CSDM causes duplicate message delivery. Don't deliver messages ↵Martin Ritchie2007-10-171-1/+34
| | | | | | that have been taken. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@585565 13f79535-47bb-0310-9956-ffa450edef68
* Implemented fair scheduling of producers in tests to prevent starvation and ↵Rupert Smith2007-10-121-20/+23
| | | | | | test timeout. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@584124 13f79535-47bb-0310-9956-ffa450edef68
* Corrected error in topic test sizes.Rupert Smith2007-10-121-32/+32
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@584113 13f79535-47bb-0310-9956-ffa450edef68
* Changed topic reliability tests to do 2:16 fanout, gives highest rate.Rupert Smith2007-10-121-20/+20
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@584108 13f79535-47bb-0310-9956-ffa450edef68
* QPID-637 Patch submitted by Aidan Skinner to address receive not waiting for ↵Martin Ritchie2007-10-111-10/+31
| | | | | | full timeout. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@583882 13f79535-47bb-0310-9956-ffa450edef68
* QPID-636 : Check to ensure we only enqueue msgs that can be delivered to the ↵Martin Ritchie2007-10-111-2/+5
| | | | | | consumer. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@583808 13f79535-47bb-0310-9956-ffa450edef68
* QPID-632 ImmediateMessageTest may not have sufficient time to see the ↵Martin Ritchie2007-10-111-3/+3
| | | | | | exception. Performing the close before checking for exceptions should give it this time. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@583776 13f79535-47bb-0310-9956-ffa450edef68
* QPID-635 Added a unit test and implemented the equals() method on ↵Martin Ritchie2007-10-113-0/+102
| | | | | | BlockingMethodFrameListener and SpecificMethodFrameListener. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@583775 13f79535-47bb-0310-9956-ffa450edef68
* QPID-632 : The lack of AMQNoConsumersException on the connection may be due ↵Martin Ritchie2007-10-101-8/+8
| | | | | | to the exception list in ExceptionMonitor not being thread safe. Synchronized method calls to ensure atomic access. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@583548 13f79535-47bb-0310-9956-ffa450edef68