Commit Graph

4272 Commits

Author SHA1 Message Date
Bosanac Dejan 4c8ab44698 https://issues.apache.org/jira/browse/AMQ-3632 - staticBridge
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1213210 13f79535-47bb-0310-9956-ffa450edef68
2011-12-12 12:25:19 +00:00
Gary Tully 8d0cf31f84 resolve intermittent failure, wait for both of the conduit subs to register before test initiation. additional accessors to make validation possible
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1213209 13f79535-47bb-0310-9956-ffa450edef68
2011-12-12 12:22:11 +00:00
Gary Tully d4ccc50ea7 https://issues.apache.org/jira/browse/AMQ-3253 - rework to make recreation of temp destination more specific to use case, result is no advisories like https://issues.apache.org/jira/browse/AMQ-2571. This avoids the possibility of looping in a network. Additional test. Resolve race condition on destination advisories, a remove could overwrite an inflight add command. A copy is now in place for the remove
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1213208 13f79535-47bb-0310-9956-ffa450edef68
2011-12-12 12:19:43 +00:00
Gary Tully 9873e21aec https://issues.apache.org/jira/browse/AMQ-3628 - updated patch applied with thanks
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1212337 13f79535-47bb-0310-9956-ffa450edef68
2011-12-09 11:39:05 +00:00
Gary Tully 9df9d3e891 tidy up fix (exception was being lost) for URL: http://svn.apache.org/viewvc?rev=1209841&view=rev
Only stop transport for java.lang.SecurityException - as some tests rely on Connection continung after an exception from the broker
related to changes in support of fix for https://issues.apache.org/jira/browse/AMQ-3294 and https://issues.apache.org/jira/browse/AMQ-1928

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1211844 13f79535-47bb-0310-9956-ffa450edef68
2011-12-08 11:44:36 +00:00
Gary Tully 760c62934d https://issues.apache.org/jira/browse/AMQ-3622 - NPE in LastImageSubscriptionRecoveryPolicy. patch variant applied and nice test./bin/activemq console xbean:conf/limit.xml Thanks
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1211568 13f79535-47bb-0310-9956-ffa450edef68
2011-12-07 17:49:53 +00:00
Gary Tully 8bab1c1fb2 https://issues.apache.org/jira/browse/AMQ-3623 - Add DefaultTestAppender utility abstract class. patch applied with thanks
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1211533 13f79535-47bb-0310-9956-ffa450edef68
2011-12-07 16:56:50 +00:00
Torsten Mielke 2f72b71829 Added javadoc for BrokerService.start(boolean force) to discourage its use.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1210917 13f79535-47bb-0310-9956-ffa450edef68
2011-12-06 13:52:24 +00:00
Robert Davies 5bd4b19fab commit patch for https://issues.apache.org/jira/browse/AMQ-3618
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1210506 13f79535-47bb-0310-9956-ffa450edef68
2011-12-05 15:49:36 +00:00
Robert Davies 712303e6ec only do delayStop () for SecurityExceptions
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1210503 13f79535-47bb-0310-9956-ffa450edef68
2011-12-05 15:44:26 +00:00
Robert Davies da7f9962c6 Only stop transport for java.lang.SecurityException - as some tests rely on Connection continung after an exception from the broker
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1209841 13f79535-47bb-0310-9956-ffa450edef68
2011-12-03 07:15:12 +00:00
Robert Davies 3a71f8e33d Fix for https://issues.apache.org/jira/browse/AMQ-3294 and https://issues.apache.org/jira/browse/AMQ-1928
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1209700 13f79535-47bb-0310-9956-ffa450edef68
2011-12-02 21:34:14 +00:00
Gary Tully f260b17488 fix typo in last remove, oops sorry
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1209538 13f79535-47bb-0310-9956-ffa450edef68
2011-12-02 15:41:39 +00:00
Gary Tully 3a26442d92 extend the close wait for this test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1209195 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 19:15:16 +00:00
Gary Tully a2fc5bc492 https://issues.apache.org/jira/browse/AMQ-3614 - Unable to generate unique id when range of ports are blocked - org.apache.activemq.util.IdGenerator. Patch applied with thanks, left the log at warn as unique ids are important and two simultaneous clients could use the same id with this fallback
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1209162 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 17:25:46 +00:00
James Strachan f1bbaec66b made the xmlpull parser an optional dependency in osgi-land. For some reason mavne bundle plugin doesn't figure this out; transitive dependences on optional dependences don't seem to get marked as optional
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1209117 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 15:20:32 +00:00
Gary Tully 6590d4b3d0 remove duplicate code removing advisories, handled cleanly in advisory broker already, additional load on destination map. Only on remove dest opts through, so impact is mostly small. better all the same. may lead to reduction in acces modes for the destination map
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1209058 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 12:48:51 +00:00
Gary Tully 3b7507f6b7 https://issues.apache.org/jira/browse/AMQ-2524 and https://issues.apache.org/jira/browse/AMQ-3092 - two competing fixes for the same underlying issue. Use a combination of the changes, disposed without the duplicate check for existance in the destinations. Removes one additional query on the destinations map
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1209046 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 11:54:47 +00:00
Gary Tully dad86e6891 ensure the reason is visible in a failure to accept connection due to oom
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1209045 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 11:54:13 +00:00
Gary Tully 3c3feb49a6 https://issues.apache.org/jira/browse/AMQ-3613 - rename rendezvous discovery to zeroconf
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1208660 13f79535-47bb-0310-9956-ffa450edef68
2011-11-30 18:31:22 +00:00
Gary Tully 599abc58bb https://issues.apache.org/jira/browse/AMQ-2730 - test to validate there is no implicit limit on reconnects due to the task runner exceeding its iterations, if the task is not complete it re queues it, so at least on trunk, the taskrunner issue is resolved
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1208377 13f79535-47bb-0310-9956-ffa450edef68
2011-11-30 10:58:21 +00:00
Gary Tully 44488a5bc3 https://issues.apache.org/jira/browse/AMQ-3607 - added test case and use of connectionFactory.setOptimizeAcknowledgeTimeOut, the test is breaking becauee of message discarding when the acks are not immediate, made some small mods to make the test work and fixed up the setter for connectionFactory.setOptimizeAcknowledgeTimeOut
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1208048 13f79535-47bb-0310-9956-ffa450edef68
2011-11-29 19:52:37 +00:00
Gary Tully c9414c4a6d https://issues.apache.org/jira/browse/AMQ-3611 - Revert the Oracle jdbc adapter to a variant of the default jdbc adapter in place of the one supporting blobs. added oracleBlobJDBCAdapter for backward compatibility and latest oracle adapter extends the default adapter so it no longer manipulates blobs directly, works fine with the latest ojdbc6 driver
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1207963 13f79535-47bb-0310-9956-ffa450edef68
2011-11-29 16:49:02 +00:00
Gary Tully 21541daf84 reduce duration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1207715 13f79535-47bb-0310-9956-ffa450edef68
2011-11-29 00:11:02 +00:00
Gary Tully c70952723c reduce the duration of this tests
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1207713 13f79535-47bb-0310-9956-ffa450edef68
2011-11-29 00:07:23 +00:00
Gary Tully 8e0cc676d8 reduce the duration of this test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1207699 13f79535-47bb-0310-9956-ffa450edef68
2011-11-28 23:31:58 +00:00
Gary Tully 395bf82f80 https://issues.apache.org/jira/browse/AMQ-2868 - fix issue with blocked transaction completion in highly concurrent systems. It was possible to miss an after completion callback
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1207693 13f79535-47bb-0310-9956-ffa450edef68
2011-11-28 23:20:07 +00:00
Gary Tully 6813691a3d https://issues.apache.org/jira/browse/AMQ-3609 - Turn inactivity monitor thread off by default, new default 0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1207239 13f79535-47bb-0310-9956-ffa450edef68
2011-11-28 14:44:56 +00:00
Gary Tully 00fb101e2a https://issues.apache.org/jira/browse/AMQ-3454 - all the little performance test, non imperative
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1207231 13f79535-47bb-0310-9956-ffa450edef68
2011-11-28 14:37:15 +00:00
Gary Tully 4d17a70809 https://issues.apache.org/jira/browse/AMQ-3454 - remove copy of destinationMap in region getDestinationMap api, return a direct reference to the unerlying concurrent hash map, makes it more efficient to determine presence of a destination
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1207224 13f79535-47bb-0310-9956-ffa450edef68
2011-11-28 14:30:46 +00:00
Gary Tully 49718ed8a6 https://issues.apache.org/jira/browse/AMQ-3576 - disable auditNetworkProducers by default, composite dests and virtual topics that create duplicates independent of producers are trapped in error, for simple networking this should be enabled
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1205930 13f79535-47bb-0310-9956-ffa450edef68
2011-11-24 17:02:35 +00:00
Bosanac Dejan 332c35ca18 https://issues.apache.org/jira/browse/AMQ-3384 - destinationFilter config out of dynamically included destinations
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1205508 13f79535-47bb-0310-9956-ffa450edef68
2011-11-23 17:44:52 +00:00
Gary Tully 33edc9902e https://issues.apache.org/jira/browse/AMQ-3603 - STOMP 1.1 introduced the heartBeat header implemented by the inactivity monitor, would be nice to have this option for stomp 1.0. Implement support for ?transport.defaultHeartBeat=5000,0 with test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1205011 13f79535-47bb-0310-9956-ffa450edef68
2011-11-22 14:20:04 +00:00
Gary Tully 721d623ff6 https://issues.apache.org/jira/browse/AMQ-3600 - test should not be run with individual ack, persist redelivery count mode
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1203773 13f79535-47bb-0310-9956-ffa450edef68
2011-11-18 18:03:25 +00:00
Timothy A. Bish ddb15afe05 Fix for NPE in test.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1203662 13f79535-47bb-0310-9956-ffa450edef68
2011-11-18 14:23:33 +00:00
Gary Tully 8311938134 https://issues.apache.org/jira/browse/AMQ-3600 - Failover reconnect bypasses DestinationPathSeparatorBroker generating invalid destinations. fix with test. the messagePull currently does not reference the destination but to future proof and for consistency it should be escaped
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1203213 13f79535-47bb-0310-9956-ffa450edef68
2011-11-17 15:10:32 +00:00
Gary Tully 49e704461c https://issues.apache.org/jira/browse/AMQ-3599 - JaasDualAuthenticationPlugin, java.net.BindException: Address already in use on shutdown with pending connectons. resolve with test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1203176 13f79535-47bb-0310-9956-ffa450edef68
2011-11-17 12:49:32 +00:00
Gary Tully 3557361e86 https://issues.apache.org/jira/browse/AMQ-3596 - FilePendingMessageCursor memory list does not respect priority for non persistent messages. Fix with test. Reuse pendinglist from vm cursor for the file pending message cursor in memory list
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1202153 13f79535-47bb-0310-9956-ffa450edef68
2011-11-15 12:21:20 +00:00
Bosanac Dejan 1462fd234c https://issues.apache.org/jira/browse/AMQ-3168 - use boolean editor for most used broker service boolean properties
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1201666 13f79535-47bb-0310-9956-ffa450edef68
2011-11-14 11:15:02 +00:00
Bosanac Dejan c0c92595fd https://issues.apache.org/jira/browse/AMQ-3168 - use boolean editor for createConnector property, to avoid problems with schema validation
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1201662 13f79535-47bb-0310-9956-ffa450edef68
2011-11-14 10:50:47 +00:00
Timothy A. Bish 5b99f118a2 Adds an additional test case to verify that when doing request reply with two connections that ReplyTo values are prefixed with /remote-temp-topic and /remote-temp-queue to indicate that the connection receiving them is not the one that created them.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1197717 13f79535-47bb-0310-9956-ffa450edef68
2011-11-04 19:10:20 +00:00
Gary Tully 0018f4a3ad https://issues.apache.org/jira/browse/AMQ-3576 - implementation for network connectors, the store needs to be queried b/c messages from multiple producers are multiplexed by a network connector bridge. Additional boolean auditNetworkProducers on TransportConnector can disable the check if duplicates can be dealt with by the application layer. Additional test included.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1197203 13f79535-47bb-0310-9956-ffa450edef68
2011-11-03 16:23:29 +00:00
Gary Tully 2711ad1f3f https://issues.apache.org/jira/browse/AMQ-3576 - fix regression in network connector tests, the sequence id check is not valud for bridges that concentrate messages from multiple consumers. duplicate suppression for network connectors needs to be based on message ids
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1197072 13f79535-47bb-0310-9956-ffa450edef68
2011-11-03 11:53:31 +00:00
Gary Tully 5cf33b52c1 https://issues.apache.org/jira/browse/AMQ-3576 - only update audit sequence on valid message, apply test to isolated class where broker side timeout is absent
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1196804 13f79535-47bb-0310-9956-ffa450edef68
2011-11-02 21:17:41 +00:00
Bosanac Dejan aa8bc42fd4 https://issues.apache.org/jira/browse/AMQ-3576 - tidying up the test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1196710 13f79535-47bb-0310-9956-ffa450edef68
2011-11-02 17:23:39 +00:00
Bosanac Dejan 70057cb9ce https://issues.apache.org/jira/browse/AMQ-3576 - producer exchange sync last seq id
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1196709 13f79535-47bb-0310-9956-ffa450edef68
2011-11-02 17:23:15 +00:00
Gary Tully 6ffbed9947 test to valudate soWriteTimeout on the client
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1196570 13f79535-47bb-0310-9956-ffa450edef68
2011-11-02 13:31:02 +00:00
Timothy A. Bish 4ab5e910cb Fix timing dependent assertion.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1195988 13f79535-47bb-0310-9956-ffa450edef68
2011-11-01 13:26:26 +00:00
Timothy A. Bish 419fde4457 Fix for: https://issues.apache.org/jira/browse/AMQ-3537
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1195708 13f79535-47bb-0310-9956-ffa450edef68
2011-10-31 22:34:16 +00:00
Timothy A. Bish 0b6bf7ec1b Fix for: https://issues.apache.org/jira/browse/AMQ-1853
Tests included.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1195615 13f79535-47bb-0310-9956-ffa450edef68
2011-10-31 18:54:19 +00:00
Timothy A. Bish 0a66b79332 additional fixes for: https://issues.apache.org/jira/browse/AMQ-3547
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1195278 13f79535-47bb-0310-9956-ffa450edef68
2011-10-30 23:27:52 +00:00
Timothy A. Bish 15f641634b fix for: https://issues.apache.org/jira/browse/AMQ-3547
Add an assertion to test that interrupted state is preserved.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1195046 13f79535-47bb-0310-9956-ffa450edef68
2011-10-29 21:44:27 +00:00
Timothy A. Bish 83fde0b2a0 fix for: https://issues.apache.org/jira/browse/AMQ-3547
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1195045 13f79535-47bb-0310-9956-ffa450edef68
2011-10-29 21:42:49 +00:00
Timothy A. Bish f0ed5d0c72 Fix a couple of tests that sleep for longer than necessary, use the Wait object when possible.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1190615 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 21:57:37 +00:00
Gary Tully 9ee2967220 https://issues.apache.org/jira/browse/AMQ-3519 - fix intermittent failure of org.apache.activemq.broker.RedeliveryRestartTest. inddividual ack marking delivery must be sent sync
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1190265 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 12:11:18 +00:00
Timothy A. Bish 8340decaf3 Apply patch for https://issues.apache.org/jira/browse/AMQ-3541
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1189980 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 19:58:42 +00:00
Hiram R. Chirino 0d01b16e25 Fixes AMQ-3570: Improve ActiveMQ's XSD to allow elements to appear in any order
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1189740 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 13:19:49 +00:00
Gary Tully cf33916c6e this test takes too long in hudson, reduce the amount of messages processed, quantity does not add much to the test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1189734 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 13:03:02 +00:00
Gary Tully 6778a49eec https://issues.apache.org/jira/browse/AMQ-3568 - Consumer auto acking of duplicate message dispatch can lead to Unmatched acknowledge: and redelivery. Using individual ack in this case. Added a warn, as this sort of duplicate shoud be trapped by the store producerAudit, maxFailoverProducersToTrack may need an increase
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1189700 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 10:21:20 +00:00
Timothy A. Bish e6909d8970 Apply patch for: https://issues.apache.org/jira/browse/AMQ-3567
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1189370 13f79535-47bb-0310-9956-ffa450edef68
2011-10-26 18:36:52 +00:00
Timothy A. Bish 28e9cd7eee fix for https://issues.apache.org/jira/browse/AMQ-2526
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1188925 13f79535-47bb-0310-9956-ffa450edef68
2011-10-25 21:23:30 +00:00
Gary Tully 07eef8e293 https://issues.apache.org/jira/browse/AMQ-3563 - Update javadoc links to point to JDK 1.6 and JEE 1.5. Patch applied with thanks.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1188788 13f79535-47bb-0310-9956-ffa450edef68
2011-10-25 16:57:39 +00:00
Gary Tully 9ba8d2681f https://issues.apache.org/jira/browse/AMQ-3564 - new masterslave: discovery scheme for network connectors to master slave pairs, more intuitive configuration. Layers over static:failover:(a,b)?maxReconnectAttempts=0. Impl and test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1188641 13f79535-47bb-0310-9956-ffa450edef68
2011-10-25 13:03:18 +00:00
Timothy A. Bish 0b1b6fa3ca Give this one just a bit more time to see if its just slow machines that cause it to fail.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1188146 13f79535-47bb-0310-9956-ffa450edef68
2011-10-24 14:07:29 +00:00
Timothy A. Bish 534a44fbd6 https://issues.apache.org/jira/browse/AMQ-3559
Fix for failing unit test.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1188145 13f79535-47bb-0310-9956-ffa450edef68
2011-10-24 13:37:31 +00:00
Timothy A. Bish 06611d9c19 Fix assertion error messages so that indicate an actual error.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1187577 13f79535-47bb-0310-9956-ffa450edef68
2011-10-21 22:18:28 +00:00
Timothy A. Bish c273cab44a fix for: https://issues.apache.org/jira/browse/AMQ-3559
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1187538 13f79535-47bb-0310-9956-ffa450edef68
2011-10-21 21:02:56 +00:00
Gary Tully 5b796cd8d6 https://issues.apache.org/jira/browse/AMQ-3558 - Allow the base network consumer priority to be configured on a networkConnector. Addition of consumerPriorityBase atribute to networkConnector configuration, additional test. This allows the base to be configured such that one network connector can have priority over another
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1187461 13f79535-47bb-0310-9956-ffa450edef68
2011-10-21 16:46:43 +00:00
Gary Tully 85edfb3425 https://issues.apache.org/jira/browse/AMQ-3533 - mKahaDB, allow the directory of a filtered destination to be specified, such that destination journals can be split across disks. Fixed with test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1187280 13f79535-47bb-0310-9956-ffa450edef68
2011-10-21 10:15:26 +00:00
Gary Tully 8ce077800f https://issues.apache.org/jira/browse/AMQ-3551 - exclude networkConnectors from sendFailIfNoSpace on producer flow control, with test for topic and queue networks
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1186952 13f79535-47bb-0310-9956-ffa450edef68
2011-10-20 17:35:04 +00:00
Timothy A. Bish fa40250863 Fix for: https://issues.apache.org/jira/browse/AMQ-2240
URI options that are unmatched should result in an error 
to prevent subtle errors in configuration.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1186842 13f79535-47bb-0310-9956-ffa450edef68
2011-10-20 15:04:21 +00:00
Timothy A. Bish 4553ff18ef Remove fixed port usage and disable JMX since this test doesn't use it.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1186833 13f79535-47bb-0310-9956-ffa450edef68
2011-10-20 14:27:07 +00:00
Gary Tully 6d077dc7b4 https://issues.apache.org/jira/browse/AMQ-3331 - apply variant of patch with thanks.
Added boolean attribute, alwaysSyncSend to the network connector. This allows the
behaviour for persistent messages to be applied to non-persistent messages.
It does not make sense to have an alwaysAsync mode as this could lead to lost
persistent messages.
Also, I agree with the assment of the use of the responseRequired flag, it should
be based on the persistence attribute of the message, which it is now.
This is vital such that messages sent in transactions are not sent async.
Thanks for the great test case, made life easier.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1186813 13f79535-47bb-0310-9956-ffa450edef68
2011-10-20 13:56:17 +00:00
Gary Tully f4e0725420 https://issues.apache.org/jira/browse/AMQ-3542 - prevent failover reconnect till start is initiated, prevents connection establishment w/o a listener which ensures a bridge is already ready to handle a response and start a local bridge, useDedicatedTaskRunner=true can lead to this case
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1186654 13f79535-47bb-0310-9956-ffa450edef68
2011-10-20 07:59:05 +00:00
Gary Tully 1250163f39 https://issues.apache.org/jira/browse/AMQ-3481 - check for tryLock success before unlock
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1186539 13f79535-47bb-0310-9956-ffa450edef68
2011-10-19 22:26:07 +00:00
Timothy A. Bish 1fd39c991e Remove dependence on fixed port.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1186494 13f79535-47bb-0310-9956-ffa450edef68
2011-10-19 21:11:34 +00:00
Gary Tully 54ff0ce448 https://issues.apache.org/jira/browse/AMQ-3542 - remove duplicate bridge stop, could on occasion beat another thread to the stop and cause a deadlock, resulting in intermittent failure to restart a bridge
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1186258 13f79535-47bb-0310-9956-ffa450edef68
2011-10-19 15:09:59 +00:00
Bosanac Dejan 3c3b5bbd74 https://issues.apache.org/jira/browse/AMQ-3550 - local option for vritual topics
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1186095 13f79535-47bb-0310-9956-ffa450edef68
2011-10-19 11:13:19 +00:00
Timothy A. Bish 6c82480a10 test for: https://issues.apache.org/jira/browse/AMQ-2200
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1185792 13f79535-47bb-0310-9956-ffa450edef68
2011-10-18 18:47:44 +00:00
Gary Tully 174c40579a https://issues.apache.org/jira/browse/AMQ-3542 - further simplification of network bridge start, remove latch wait states, add duplex test variant
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1185765 13f79535-47bb-0310-9956-ffa450edef68
2011-10-18 17:31:27 +00:00
Timothy A. Bish 970a97ac5f Push enough data through the socket so that the socket close gets detected.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1185210 13f79535-47bb-0310-9956-ffa450edef68
2011-10-17 14:33:41 +00:00
Timothy A. Bish 6c4bcb3197 https://issues.apache.org/jira/browse/AMQ-3500
Don't remove the options, just get them each time.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1185129 13f79535-47bb-0310-9956-ffa450edef68
2011-10-17 12:44:55 +00:00
Bosanac Dejan 75e6f1981d TwoBrokerVirtualDestDinamicallyIncludedDestTest - test virtual topics over network of brokers setup
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1185097 13f79535-47bb-0310-9956-ffa450edef68
2011-10-17 10:35:29 +00:00
Timothy A. Bish b7f280817d https://issues.apache.org/jira/browse/AMQ-3500
fix a cut and paste oops

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1184866 13f79535-47bb-0310-9956-ffa450edef68
2011-10-16 16:54:18 +00:00
Timothy A. Bish 56272fab37 https://issues.apache.org/jira/browse/AMQ-3500
Only validate the params inside the domain of the producer or consumer.  

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1184834 13f79535-47bb-0310-9956-ffa450edef68
2011-10-16 14:28:42 +00:00
Timothy A. Bish 9ff350033f fix for: https://issues.apache.org/jira/browse/AMQ-3543
Unit test added.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1183495 13f79535-47bb-0310-9956-ffa450edef68
2011-10-14 20:52:35 +00:00
Timothy A. Bish baac9e7e9a fix for: https://issues.apache.org/jira/browse/AMQ-1132
Remove the dependency on the ActiveIO test.jar.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1183359 13f79535-47bb-0310-9956-ffa450edef68
2011-10-14 13:40:49 +00:00
Timothy A. Bish 6579d9eada apply patch for: https://issues.apache.org/jira/browse/AMQ-3536
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1183342 13f79535-47bb-0310-9956-ffa450edef68
2011-10-14 13:07:01 +00:00
Timothy A. Bish 88f60580e3 apply fix for: https://issues.apache.org/jira/browse/AMQ-3500
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1183143 13f79535-47bb-0310-9956-ffa450edef68
2011-10-13 22:28:47 +00:00
Gary Tully 4acd13243a https://issues.apache.org/jira/browse/AMQ-3542 - Using failover: with static discovery in a network connector to choose from a master/slave tuple leads to hangs and invalid states. issue with demand forward bridge reacting to failover transport interupt/resume leading to race conditions. race condition with tracking bridges and restarts. change default maxReconnectAttempts=0 to mean none, -1 for infinte. Default behavour is still infinite. To reference a master slave pair, use: static:(failover:(a,b)?maxReconnectAttempts=0)?useExponentialBackOff=false. see org.apache.activemq.network.FailoverStaticNetworkTest
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1183062 13f79535-47bb-0310-9956-ffa450edef68
2011-10-13 20:07:48 +00:00
Timothy A. Bish f33f32e892 fix for: https://issues.apache.org/jira/browse/AMQ-3481
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1182890 13f79535-47bb-0310-9956-ffa450edef68
2011-10-13 14:54:15 +00:00
Timothy A. Bish 3b381e7c15 https://issues.apache.org/jira/browse/AMQ-3481
Further refine this fix to address some test failures. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1182049 13f79535-47bb-0310-9956-ffa450edef68
2011-10-11 19:39:45 +00:00
Gary Tully ab9bce6147 give consumer a little more time for slower hardware
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1181711 13f79535-47bb-0310-9956-ffa450edef68
2011-10-11 11:09:39 +00:00
Gary Tully 6468eba5e6 update openwire verison for 5.6 release, addition of security token in connection control
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1181219 13f79535-47bb-0310-9956-ffa450edef68
2011-10-10 20:27:21 +00:00
Gary Tully 9c9b85659c https://issues.apache.org/jira/browse/AMQ-3532 - expiry of offline durable subscription on activation can lead do duplicate expiry processing and negative pending cursor size, resolve duplicate cursor remove and contention with dispatch, additional test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1181112 13f79535-47bb-0310-9956-ffa450edef68
2011-10-10 18:21:46 +00:00
Timothy A. Bish 3a806e98dc Test for: https://issues.apache.org/jira/browse/AMQ-3324
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1181022 13f79535-47bb-0310-9956-ffa450edef68
2011-10-10 15:31:09 +00:00
Gary Tully 2398a3a377 https://issues.apache.org/jira/browse/AMQ-3519 - fix regression in org.apache.activemq.bugs.AMQ2983Test, transacted ack needs to use async remove to ensure a concurrent dispatch does not preceed an ack
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1180884 13f79535-47bb-0310-9956-ffa450edef68
2011-10-10 11:47:09 +00:00
Timothy A. Bish 8cf318788d fix for: https://issues.apache.org/jira/browse/AMQ-3481
Issues arises when the StompTransport is sending an Ack back for Auto Ack 
mode in the same thread as the message was dispatched in.  If an incoming 
command beats the auto ack to onCommand in the activity monitor it will block
as the original thread is now waiting on the incoming command for the transport
lock.  Need to send back the Auto Acks in their own thread using a Task Runner
in the Stomp Transport so that the dispatch thread can complete and release
its lock on the transport.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1180070 13f79535-47bb-0310-9956-ffa450edef68
2011-10-07 15:22:31 +00:00
Timothy A. Bish 216f74e003 Give a little extra time for the Stomp frames to take effect.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1180059 13f79535-47bb-0310-9956-ffa450edef68
2011-10-07 14:43:53 +00:00
Gary Tully ab12a60a3a https://issues.apache.org/jira/browse/AMQ-3526 - JDBC persistence adapter, destination mbeans not visible on restart till producers or consumers reattach. query to find inactive destinations was checking the wrong table name, resolved with new test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1179999 13f79535-47bb-0310-9956-ffa450edef68
2011-10-07 10:57:41 +00:00
Gary Tully 58e9c66201 https://issues.apache.org/jira/browse/AMQ-3523 - fix issue with related test, org.apache.activemq.transport.discovery.DiscoveryNetworkReconnectTest
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1179612 13f79535-47bb-0310-9956-ffa450edef68
2011-10-06 13:09:49 +00:00
Timothy A. Bish 6faa9c3546 fix for: https://issues.apache.org/jira/browse/AMQ-3524
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1179470 13f79535-47bb-0310-9956-ffa450edef68
2011-10-05 23:17:22 +00:00
Gary Tully f793fbd7e6 https://issues.apache.org/jira/browse/AMQ-3523 - NetworkConnector MBean unregistration can fail with a transport disconnect - leaving dangling mbean, fix and test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1179355 13f79535-47bb-0310-9956-ffa450edef68
2011-10-05 18:10:08 +00:00
Jonathan Anstey 2f4d11f9b0 AMQ-3457 - check the connection id to make sure we don't delete someone else's temp dest
Reviewed by gtully



git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1179328 13f79535-47bb-0310-9956-ffa450edef68
2011-10-05 17:15:19 +00:00
Timothy A. Bish e6254c2f8a fix for: https://issues.apache.org/jira/browse/AMQ-3465
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1178398 13f79535-47bb-0310-9956-ffa450edef68
2011-10-03 12:43:51 +00:00
Timothy A. Bish 0890672e08 Add missing license header
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1177799 13f79535-47bb-0310-9956-ffa450edef68
2011-09-30 19:38:46 +00:00
Timothy A. Bish 633428c6e3 fix for: https://issues.apache.org/jira/browse/AMQ-3014
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1177797 13f79535-47bb-0310-9956-ffa450edef68
2011-09-30 19:35:28 +00:00
Gary Tully 601f54f0df https://issues.apache.org/jira/browse/AMQ-3519 - allign tests with last minute attribute name change
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1177621 13f79535-47bb-0310-9956-ffa450edef68
2011-09-30 12:21:53 +00:00
Gary Tully 2030097e01 https://issues.apache.org/jira/browse/AMQ-3519 - Allow JMSRedelivered flag to survive a restart. Add transactedIndividualAck flag to connection factory and rewriteOnRedelivery to KahaDBPersistenceAdapter. These combine to persist the redelivery status on a rollback
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1177619 13f79535-47bb-0310-9956-ffa450edef68
2011-09-30 11:59:44 +00:00
Timothy A. Bish 7d8ce02dee fix for: https://issues.apache.org/jira/browse/AMQ-3517
Adds tests for the backup option and cleans up some other the other tests.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1177437 13f79535-47bb-0310-9956-ffa450edef68
2011-09-29 21:42:29 +00:00
Timothy A. Bish 1878e951c6 Use a Wait condition instead of sleeps to detect completion.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1177411 13f79535-47bb-0310-9956-ffa450edef68
2011-09-29 19:45:21 +00:00
Timothy A. Bish ad76330eed https://issues.apache.org/jira/browse/AMQ-3516
Add fix along with a unit test to ensure it stays fixed.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1177345 13f79535-47bb-0310-9956-ffa450edef68
2011-09-29 16:02:49 +00:00
Timothy A. Bish 6d31ed72f0 Make the test work without relying on a sleep statement to get the results needed.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1177338 13f79535-47bb-0310-9956-ffa450edef68
2011-09-29 15:38:15 +00:00
Timothy A. Bish b6b69113b1 apply fixes for https://issues.apache.org/jira/browse/AMQ-3513
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1177088 13f79535-47bb-0310-9956-ffa450edef68
2011-09-28 22:07:21 +00:00
Timothy A. Bish 02f63c9782 fix for: https://issues.apache.org/jira/browse/AMQ-3515
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1177022 13f79535-47bb-0310-9956-ffa450edef68
2011-09-28 19:10:40 +00:00
Timothy A. Bish 3dbc9c9548 apply code cleanup patch from https://issues.apache.org/jira/browse/AMQ-3322
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1176580 13f79535-47bb-0310-9956-ffa450edef68
2011-09-27 19:59:07 +00:00
Timothy A. Bish d717a495c7 fix for: https://issues.apache.org/jira/browse/AMQ-3465
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1176393 13f79535-47bb-0310-9956-ffa450edef68
2011-09-27 14:13:16 +00:00
Timothy A. Bish 2a0b4893c6 apply patch for: https://issues.apache.org/jira/browse/AMQ-3509
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1175855 13f79535-47bb-0310-9956-ffa450edef68
2011-09-26 13:14:45 +00:00
Timothy A. Bish 8976a6b973 fix for: https://issues.apache.org/jira/browse/AMQ-3511
Log Stomp frames sent and received by the StompTransport under
org.apache.activemq.transport.stomp.StompIO when the trace option
is enabled.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1175047 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 22:04:20 +00:00
Timothy A. Bish fef66a6e98 fix for https://issues.apache.org/jira/browse/AMQ-3242
Make the max value actually be Short.MAX_VALUE

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1174954 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 18:58:55 +00:00
Timothy A. Bish 1453c53105 fix for: https://issues.apache.org/jira/browse/AMQ-3031
Don't use the scheduleAtFixedRate method in our scheduler as we
don't really have a need for real time task execution, just use
the fixed delay scheduler so that jobs don't stack up.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1174951 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 18:48:19 +00:00
Timothy A. Bish 2db7cbf436 Remove the dependency on the fixed 61616 port number
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1174734 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 13:13:33 +00:00
Timothy A. Bish d314b7f57d https://issues.apache.org/jira/browse/AMQ-3449
Add the setters/getters back for the ignore wireformat options.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1174097 13f79535-47bb-0310-9956-ffa450edef68
2011-09-22 12:45:07 +00:00
Gary Tully ad6b5e29db https://issues.apache.org/jira/browse/AMQ-3289 - updates to Blob/Oracle JDBCAdapter - applied patch from William McDonald with thanks
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1173605 13f79535-47bb-0310-9956-ffa450edef68
2011-09-21 12:45:48 +00:00
Gary Tully e6a9ae2f31 https://issues.apache.org/jira/browse/AMQ-3507 - Large number of expiring messages causing QueueSize to groww. have cursor delegate to the destination for expiry processing. additional test. This will also sort out the intermittent failure of this test.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1173583 13f79535-47bb-0310-9956-ffa450edef68
2011-09-21 12:09:30 +00:00
Timothy A. Bish e23afb3391 change for https://issues.apache.org/jira/browse/AMQ-3467
fix and issue created when the new changes were merged.




git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1173188 13f79535-47bb-0310-9956-ffa450edef68
2011-09-20 15:22:53 +00:00
Timothy A. Bish 5325cdb30b fixes for https://issues.apache.org/jira/browse/AMQ-3467
Clean up some code in MessageDatabase, add guards around logging to avoid big string ops when not
needed.  



git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1172640 13f79535-47bb-0310-9956-ffa450edef68
2011-09-19 14:23:02 +00:00
Gary Tully a36e618f71 https://issues.apache.org/jira/browse/AMQ-3501 - make use of the encoded string! and add some tests
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1172572 13f79535-47bb-0310-9956-ffa450edef68
2011-09-19 11:30:14 +00:00
Gary Tully 7d082c36bb https://issues.apache.org/jira/browse/AMQ-3490 - allow optional lazyInit of temp (plist) store
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1172528 13f79535-47bb-0310-9956-ffa450edef68
2011-09-19 09:03:13 +00:00
Timothy A. Bish 943db3c3cb fixes for https://issues.apache.org/jira/browse/AMQ-3467
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1171743 13f79535-47bb-0310-9956-ffa450edef68
2011-09-16 19:31:30 +00:00
Gary Tully 4a697f852a https://issues.apache.org/jira/browse/AMQ-3490 - defer setting init done flag till complete, ensure a failed init attempt is retried
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1171487 13f79535-47bb-0310-9956-ffa450edef68
2011-09-16 10:13:41 +00:00
Gary Tully 94de98a64c https://issues.apache.org/jira/browse/AMQ-2922 - give test scenario more time for hudson slow disks
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1171006 13f79535-47bb-0310-9956-ffa450edef68
2011-09-15 08:44:52 +00:00
Gary Tully 2f5ec047dd https://issues.apache.org/jira/browse/AMQ-3497 - make test case more deterministic using receipts on unsub such that a sub only gets one message
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1170901 13f79535-47bb-0310-9956-ffa450edef68
2011-09-14 23:41:42 +00:00
Gary Tully 8abb5b6df1 https://issues.apache.org/jira/browse/AMQ-3499 - increase transport failure to warn and exclude eof for stomp
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1170624 13f79535-47bb-0310-9956-ffa450edef68
2011-09-14 13:49:25 +00:00
Gary Tully ba0c1e59b2 https://issues.apache.org/jira/browse/AMQ-3497 - send subscription receipt early such that it cannot be preceeded by a message dispatch
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1170523 13f79535-47bb-0310-9956-ffa450edef68
2011-09-14 10:46:48 +00:00
Gary Tully 68a8b6d62a https://issues.apache.org/jira/browse/AMQ-3496 - make use of the org.apache.activemq.command.UnresolvedDestinationTransformer to provide a default value for an unqualified destinations string for a stomp replyTo header
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1170474 13f79535-47bb-0310-9956-ffa450edef68
2011-09-14 08:32:56 +00:00
Gary Tully 15953786d1 https://issues.apache.org/jira/browse/AMQ-2922 - rework, introduce new store 'mKahaDB' that contains multiple filtered kahadb persistence adapters, destinations match a store using destination wildcards in the same way as policy entries. Transactions that span multiple stores use a local xa variant to ensure consistency
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1170201 13f79535-47bb-0310-9956-ffa450edef68
2011-09-13 15:01:37 +00:00
Timothy A. Bish 0d08a5a20f fix for: https://issues.apache.org/jira/browse/AMQ-3488
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1169549 13f79535-47bb-0310-9956-ffa450edef68
2011-09-11 21:41:49 +00:00
Timothy A. Bish 4f14f1e5c0 fix for: https://issues.apache.org/jira/browse/AMQ-3488 along with test case
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1169514 13f79535-47bb-0310-9956-ffa450edef68
2011-09-11 19:56:20 +00:00
Timothy A. Bish 3060a64c8c fix for https://issues.apache.org/jira/browse/AMQ-3493
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1167582 13f79535-47bb-0310-9956-ffa450edef68
2011-09-10 19:48:54 +00:00
Timothy A. Bish 251dc7bb23 fix for https://issues.apache.org/jira/browse/AMQ-3486 with test case.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1166216 13f79535-47bb-0310-9956-ffa450edef68
2011-09-07 15:11:10 +00:00
Timothy A. Bish acde68e3ab add test for: https://issues.apache.org/jira/browse/AMQ-3484
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1166177 13f79535-47bb-0310-9956-ffa450edef68
2011-09-07 13:44:33 +00:00
Timothy A. Bish 9529b24046 Apply patches for https://issues.apache.org/jira/browse/AMQ-3483
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1166164 13f79535-47bb-0310-9956-ffa450edef68
2011-09-07 13:19:49 +00:00
Gary Tully 588a3c3594 make test a little more deterministic and simplify failure check
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1164056 13f79535-47bb-0310-9956-ffa450edef68
2011-09-01 12:55:18 +00:00
Bosanac Dejan 603b215841 https://issues.apache.org/jira/browse/AMQ-3481 - stomp deadlock
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1163940 13f79535-47bb-0310-9956-ffa450edef68
2011-09-01 08:28:47 +00:00
Gary Tully c6ed5ff237 https://issues.apache.org/jira/browse/AMQ-2868 - rework to remove sync on transaction completion, cursor updates are now stacked so that they ocurr in order, independent of thread execution after waiting for the journal to complete a write. This ensures that the cursors are updates in the same order as the index while still working wo the index lock. TransactedConsumerTest shows horizontal scaling now works better with transactions. Reworked metadata.lastUpdate to always work with the existing index lock rather than reaquire, this may help with spurious gc journal data file issue on windows - https://issues.apache.org/jira/browse/AMQ-3470
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1163613 13f79535-47bb-0310-9956-ffa450edef68
2011-08-31 13:07:57 +00:00
Timothy A. Bish 17995e6fac fix for: https://issues.apache.org/jira/browse/AMQ-3157
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1162275 13f79535-47bb-0310-9956-ffa450edef68
2011-08-26 22:25:32 +00:00
Timothy A. Bish 82df23e4a4 fix for https://issues.apache.org/jira/browse/AMQ-3475
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1162215 13f79535-47bb-0310-9956-ffa450edef68
2011-08-26 19:18:34 +00:00
Bosanac Dejan 713dcaae56 https://issues.apache.org/jira/browse/AMQ-3401 - pluggable unresolved destination trnasformer
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1162073 13f79535-47bb-0310-9956-ffa450edef68
2011-08-26 11:58:02 +00:00
Bosanac Dejan 4f50d25a22 https://issues.apache.org/jira/browse/AMQ-3474 - flush only if we have some non-persistent messages
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1162063 13f79535-47bb-0310-9956-ffa450edef68
2011-08-26 11:12:36 +00:00
Gary Tully d8d20f5621 allow early return if stopping, avoids some logging on shutdown
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1162059 13f79535-47bb-0310-9956-ffa450edef68
2011-08-26 10:50:29 +00:00
Timothy A. Bish c54967d4fe apply changes for https://issues.apache.org/jira/browse/AMQ-2961 updates some versions of dependencies and clean up the versions in the pom files so its easier to change in the future.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1161672 13f79535-47bb-0310-9956-ffa450edef68
2011-08-25 18:05:45 +00:00
Timothy A. Bish 8acbf4ceb5 Fix for AMQ-3468. Updated to XStream v1.4.1
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1160923 13f79535-47bb-0310-9956-ffa450edef68
2011-08-23 23:10:41 +00:00
Timothy A. Bish 3efd4b0515 fix for: https://issues.apache.org/jira/browse/AMQ-3454
Use a read / write lock on the destination mutex as many of the access points are simply reads of the underlying maps or a quite copy to another Collection.  The only time a write is done is during addDestination and removeDestination.  

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1160894 13f79535-47bb-0310-9956-ffa450edef68
2011-08-23 21:51:10 +00:00
Bosanac Dejan 4b6648eba1 https://issues.apache.org/jira/browse/AMQ-3463 - osgi and maven metadata
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1160656 13f79535-47bb-0310-9956-ffa450edef68
2011-08-23 12:25:22 +00:00
Bosanac Dejan 4682d399ba https://issues.apache.org/jira/browse/AMQ-3463 - osgi and maven metadata
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1160316 13f79535-47bb-0310-9956-ffa450edef68
2011-08-22 15:58:44 +00:00
Timothy A. Bish b9b67d0677 See if a bit more time allows the file based version of the test to receive, persist and then expire the messages on the slow build machine.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1159875 13f79535-47bb-0310-9956-ffa450edef68
2011-08-20 13:41:02 +00:00
Gary Tully 383a7acb05 https://issues.apache.org/jira/browse/AMQ-3362 - revisit, place a limit on a browse such that the entire store is not recovered at once. Makes use of getMaxBrowsePageSize and getMaxExpirePageSize like the queue case, overhead is too large otherwise as durable sub test shows
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1159662 13f79535-47bb-0310-9956-ffa450edef68
2011-08-19 15:34:31 +00:00
Gary Tully 32c06a0b1b some more autofail support to tests that can block a run
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1159581 13f79535-47bb-0310-9956-ffa450edef68
2011-08-19 10:30:41 +00:00
Bosanac Dejan 6994ecb5ac https://issues.apache.org/jira/browse/AMQ-3374,https://issues.apache.org/jira/browse/AMQ-3443 - long kahadb tx, delayed tmp file removal
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1159570 13f79535-47bb-0310-9956-ffa450edef68
2011-08-19 10:16:33 +00:00
Gary Tully 0d12055926 add autofail to yet another test that seems to stop the nightly build
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1159294 13f79535-47bb-0310-9956-ffa450edef68
2011-08-18 16:13:34 +00:00
Gary Tully 039b646b4e add autofail
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1159168 13f79535-47bb-0310-9956-ffa450edef68
2011-08-18 11:14:49 +00:00
Gary Tully c2179d15b7 use autofail
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1159153 13f79535-47bb-0310-9956-ffa450edef68
2011-08-18 10:49:17 +00:00
Gary Tully e23b8ea0a6 https://issues.apache.org/jira/browse/AMQ-3459 - fix up outofdate merge
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1159149 13f79535-47bb-0310-9956-ffa450edef68
2011-08-18 10:41:12 +00:00
Gary Tully 12aeb272bd don't let a hang stop the nightly build
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1159142 13f79535-47bb-0310-9956-ffa450edef68
2011-08-18 10:25:18 +00:00
Bosanac Dejan 79c9f2d013 https://issues.apache.org/jira/browse/AMQ-3459 - inactive durable subscriber view selector
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1159090 13f79535-47bb-0310-9956-ffa450edef68
2011-08-18 08:46:58 +00:00
Gary Tully a1b8df5605 setAutoFail so we get a stack trace on a hang in nightly
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1158822 13f79535-47bb-0310-9956-ffa450edef68
2011-08-17 16:47:22 +00:00
Gary Tully 5daeb53cc4 https://issues.apache.org/jira/browse/AMQ-3455: Broker may deadlock when creating queues under load with wildcard consumers - remove unnecessary class sync that results in lock order acquisition problem - related to https://issues.apache.org/jira/browse/AMQ-3197 sync on create. Additional test with concurrent producers/consumers on wildcards reproduces
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1158591 13f79535-47bb-0310-9956-ffa450edef68
2011-08-17 09:25:45 +00:00
Timothy A. Bish f1f6894ed7 Test case to show that https://issues.apache.org/jira/browse/AMQ-3405 is not a bug.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1158471 13f79535-47bb-0310-9956-ffa450edef68
2011-08-16 23:20:08 +00:00
Timothy A. Bish a6f1d756ef fix for: https://issues.apache.org/jira/browse/AMQ-1942
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1157433 13f79535-47bb-0310-9956-ffa450edef68
2011-08-13 22:28:42 +00:00
Timothy A. Bish 0885c60c4d fix for: https://issues.apache.org/jira/browse/AMQ-3449
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1157238 13f79535-47bb-0310-9956-ffa450edef68
2011-08-12 20:29:29 +00:00
Gary Tully 9026274532 show the store location for a DB toString
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1157118 13f79535-47bb-0310-9956-ffa450edef68
2011-08-12 14:20:51 +00:00
Timothy A. Bish 0e7d5a9523 https://issues.apache.org/jira/browse/AMQ-2411
remove some of the dependencies on port 61616 in current tests.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1156835 13f79535-47bb-0310-9956-ffa450edef68
2011-08-11 21:17:24 +00:00
Timothy A. Bish b4b39509a9 apply patch for: https://issues.apache.org/jira/browse/AMQ-2845
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1156748 13f79535-47bb-0310-9956-ffa450edef68
2011-08-11 19:14:50 +00:00
Timothy A. Bish 7a46a1c368 https://issues.apache.org/jira/browse/AMQ-2411
remove some of the dependencies on port 61616 in current tests.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1156397 13f79535-47bb-0310-9956-ffa450edef68
2011-08-10 23:00:13 +00:00
Gary Tully caca105072 https://issues.apache.org/jira/browse/AMQ-3442: Use real durable sub key as MBean name for inactive durable sub and improve metrics, fix inflight count on deactivate. resolved.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1155437 13f79535-47bb-0310-9956-ffa450edef68
2011-08-09 17:09:49 +00:00
Timothy A. Bish fd6be7f340 Give this test more time to meet its criteria
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1155385 13f79535-47bb-0310-9956-ffa450edef68
2011-08-09 14:33:28 +00:00
Timothy A. Bish 1e1b568784 Give the wait for expiration a bit more time since a really slow disk + CPU can't seem to get it done in 30secs.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1155363 13f79535-47bb-0310-9956-ffa450edef68
2011-08-09 13:39:23 +00:00
Timothy A. Bish 1898f9adbd apply patch for: https://issues.apache.org/jira/browse/AMQ-3439
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1154964 13f79535-47bb-0310-9956-ffa450edef68
2011-08-08 13:48:10 +00:00
Timothy A. Bish 3a181501b1 test for: https://issues.apache.org/jira/browse/AMQ-2801
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1154258 13f79535-47bb-0310-9956-ffa450edef68
2011-08-05 15:05:47 +00:00
Timothy A. Bish d8b5e2d6e2 Allows the class to set a field that isn't public but has a setter method. Fixes the compile warnings as well.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1154189 13f79535-47bb-0310-9956-ffa450edef68
2011-08-05 12:33:10 +00:00
Gary Tully c0513811a9 https://issues.apache.org/jira/browse/AMQ-3438: Make use of remote port in Connection MBeanNames optional, useful when ephemeral range cycles quickly. added boolean attribute org.apache.activemq.broker.jmx.ManagementContext#allowRemoteAddressInMBeanNames, accessible via xml. when false, a transport connector will only be registered by its clientId (whic defaults to connectionid)
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1154162 13f79535-47bb-0310-9956-ffa450edef68
2011-08-05 11:24:45 +00:00
Gary Tully 516558698a https://issues.apache.org/jira/browse/AMQ-3383 - fix regression in org.apache.activemq.transport.failover.FailoverTransactionTest#testFailoverSendReplyLost, : being appended to the id to match input so a get for producer id on the audit will work
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1153857 13f79535-47bb-0310-9956-ffa450edef68
2011-08-04 12:08:21 +00:00
Gary Tully 8ec1347e30 resolve intermittent failure with this test, fix up the sync
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1153849 13f79535-47bb-0310-9956-ffa450edef68
2011-08-04 11:26:03 +00:00
Timothy A. Bish 84a16161be Allows the class to set a field that isn't public but has a setter method. Fixes the compile warnings as well.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1153701 13f79535-47bb-0310-9956-ffa450edef68
2011-08-03 23:17:34 +00:00
Timothy A. Bish 42e51a3368 https://issues.apache.org/jira/browse/AMQ-2411
remove some of the dependencies on port 61616 in current tests.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1153649 13f79535-47bb-0310-9956-ffa450edef68
2011-08-03 20:31:53 +00:00
Gary Tully a6b85cc9f3 https://issues.apache.org/jira/browse/AMQ-3353 - fix regression in NoDuplicateOnTopicNetworkTest, suppression only relevant to active durable subs
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1153588 13f79535-47bb-0310-9956-ffa450edef68
2011-08-03 17:26:15 +00:00
Bosanac Dejan 01ae0eaf92 https://issues.apache.org/jira/browse/AMQ-3422 - don't remove journal file with current producer tracker
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1153482 13f79535-47bb-0310-9956-ffa450edef68
2011-08-03 13:35:35 +00:00
Gary Tully fa2b058dd5 https://issues.apache.org/jira/browse/AMQ-3375: stomp consumer might not receive all msgs of a virtual topic queue with memory limits. Committing tims test case which works fine post resolution of https://issues.apache.org/jira/browse/AMQ-3434
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1153463 13f79535-47bb-0310-9956-ffa450edef68
2011-08-03 12:19:46 +00:00
Bosanac Dejan 4798cea181 https://issues.apache.org/jira/browse/AMQ-3427 - compile on jdk7
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1153425 13f79535-47bb-0310-9956-ffa450edef68
2011-08-03 10:53:12 +00:00
Gary Tully bf59b7d70f https://issues.apache.org/jira/browse/AMQ-3434: Contention in PLIist creation results in NPE on load - FilePendingMessageCursor. Resolve contention on creation, tidy up ListIndex iterator remove and plist release, additional test that stresses contention such that it can reproduce the stomp load test scenario
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1153420 13f79535-47bb-0310-9956-ffa450edef68
2011-08-03 10:18:18 +00:00
Gary Tully 24cd2b3f29 https://issues.apache.org/jira/browse/AMQ-3435: Connection is taking a long time to close warning and hung close thread. Ensure stop called during start can attempt a stop such that it does not hang
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1153419 13f79535-47bb-0310-9956-ffa450edef68
2011-08-03 10:17:17 +00:00
Bosanac Dejan 14755a19d5 https://issues.apache.org/jira/browse/AMQ-3422 - producer audit needs string rollback, plus don't fail if we cannot recover producer audit
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1153125 13f79535-47bb-0310-9956-ffa450edef68
2011-08-02 13:46:07 +00:00
Bosanac Dejan 44ef96e6d3 https://issues.apache.org/jira/browse/AMQ-3431 - guard debug logging
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1152757 13f79535-47bb-0310-9956-ffa450edef68
2011-08-01 13:14:55 +00:00
Bosanac Dejan be37064a17 https://issues.apache.org/jira/browse/AMQ-3430 - activemq web - session pool
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1152747 13f79535-47bb-0310-9956-ffa450edef68
2011-08-01 11:46:50 +00:00
Timothy A. Bish cef02210b7 fix for: https://issues.apache.org/jira/browse/AMQ-3426
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1152194 13f79535-47bb-0310-9956-ffa450edef68
2011-07-29 12:58:18 +00:00
Bosanac Dejan 8c59bc3348 https://issues.apache.org/jira/browse/AMQ-826 - useManifestOnlyJar = false for apache ds tests
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1151900 13f79535-47bb-0310-9956-ffa450edef68
2011-07-28 15:47:41 +00:00
Bosanac Dejan 1aafa4fa1c https://issues.apache.org/jira/browse/AMQ-3422 - bitarray serialization
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1151857 13f79535-47bb-0310-9956-ffa450edef68
2011-07-28 14:12:02 +00:00
Timothy A. Bish b0f9afa1b3 Update the assertion messages to reflect the actual failure condition.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1151454 13f79535-47bb-0310-9956-ffa450edef68
2011-07-27 13:15:50 +00:00
Willem Ning Jiang 4ce57a618e AMQ-2922 Fixed the issue of KahaDBTransactionStore doesn' t store prepare command rightly
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1151121 13f79535-47bb-0310-9956-ffa450edef68
2011-07-26 14:49:35 +00:00
Timothy A. Bish e4dfd570b9 fix for: https://issues.apache.org/jira/browse/AMQ-3414
use schedule instead of scheduleAtFixedRate since we don't need read or write check tasks to "catch up" if delayed for some reason only to fire once the resources allow for it and then return to the standard delay for the next execution.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1150917 13f79535-47bb-0310-9956-ffa450edef68
2011-07-25 21:25:39 +00:00
Bosanac Dejan 036f2a8d7c https://issues.apache.org/jira/browse/AMQ-2583 - stomp+nio+ssl initial implementation
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1150630 13f79535-47bb-0310-9956-ffa450edef68
2011-07-25 11:08:52 +00:00
Timothy A. Bish c78c2449cb fix for: https://issues.apache.org/jira/browse/AMQ-2583 - nio+ssl initial implementation, don't flip the buffer when its just a plain buffer without SSLEngine wrapping as it result in setting the buffer position and limit to zero since that's where its position is already. This fixes the failing Stomp NIO tests.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1149672 13f79535-47bb-0310-9956-ffa450edef68
2011-07-22 18:02:32 +00:00
Timothy A. Bish 5345d161a6 fix failing test.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1149349 13f79535-47bb-0310-9956-ffa450edef68
2011-07-21 20:36:44 +00:00
Timothy A. Bish 9b32b71754 Fix for https://issues.apache.org/jira/browse/AMQ-2971
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1148925 13f79535-47bb-0310-9956-ffa450edef68
2011-07-20 20:02:57 +00:00
Bosanac Dejan 1b97cdd3c0 https://issues.apache.org/jira/browse/AMQ-3406 - BrokerServiceAware for DiscoveryAgent
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1148646 13f79535-47bb-0310-9956-ffa450edef68
2011-07-20 08:17:51 +00:00
Bosanac Dejan 5f99d5c98a https://issues.apache.org/jira/browse/AMQ-3408 - remove durable subscribers after certain time of inactivity - 5 min default task schedule
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1148300 13f79535-47bb-0310-9956-ffa450edef68
2011-07-19 12:32:51 +00:00
Bosanac Dejan 6f70393dfb https://issues.apache.org/jira/browse/AMQ-3408 - remove durable subscribers after certain time of inactivity
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1148289 13f79535-47bb-0310-9956-ffa450edef68
2011-07-19 12:11:45 +00:00
Timothy A. Bish b895efce02 Revert part of the fix for https://issues.apache.org/jira/browse/AMQ-2922 that removed the xbean element annotation.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1148072 13f79535-47bb-0310-9956-ffa450edef68
2011-07-18 22:10:43 +00:00
Bosanac Dejan f7ef792e8c fixing javadocs
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1147936 13f79535-47bb-0310-9956-ffa450edef68
2011-07-18 15:47:43 +00:00
Bosanac Dejan 1acc98bcd5 https://issues.apache.org/jira/browse/AMQ-3135 - TcpTransport.getRemoteAddress() better formatting
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1147812 13f79535-47bb-0310-9956-ffa450edef68
2011-07-18 11:16:31 +00:00
Robert Davies 8e61f519df Fix for https://issues.apache.org/jira/browse/AMQ-2922
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1147149 13f79535-47bb-0310-9956-ffa450edef68
2011-07-15 13:45:01 +00:00
Bosanac Dejan 01bc7fa9c5 https://issues.apache.org/jira/browse/AMQ-3400 - cached ldap autorization module - xbean support
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1147104 13f79535-47bb-0310-9956-ffa450edef68
2011-07-15 11:36:27 +00:00
Bosanac Dejan 56a700110c https://issues.apache.org/jira/browse/AMQ-3400 - cached ldap autorization module
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1147073 13f79535-47bb-0310-9956-ffa450edef68
2011-07-15 10:13:08 +00:00
Bosanac Dejan 7880521a1d https://issues.apache.org/jira/browse/AMQ-3135 - replay network bridge advisories for new consumers
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1146717 13f79535-47bb-0310-9956-ffa450edef68
2011-07-14 13:55:49 +00:00
Bosanac Dejan 48fa20a7bd https://issues.apache.org/jira/browse/AMQ-2583 - nio+ssl change enabledCipherSuites only if they're set
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1146657 13f79535-47bb-0310-9956-ffa450edef68
2011-07-14 11:40:16 +00:00
Bosanac Dejan a26f03fea2 https://issues.apache.org/jira/browse/AMQ-2583 - nio+ssl enable setting ssl engine properties like enabledCipherSuites
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1146636 13f79535-47bb-0310-9956-ffa450edef68
2011-07-14 10:34:43 +00:00
Timothy A. Bish 5016ecdcff Fix for: https://issues.apache.org/jira/browse/AMQ-3023
browseMessages should return the message not the CompositeData instance that's returned by the browse method.



git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1145726 13f79535-47bb-0310-9956-ffa450edef68
2011-07-12 19:10:55 +00:00
Bosanac Dejan cdf2e79f48 https://issues.apache.org/jira/browse/AMQ-2583 - nio+ssl use thread pool for long tasks
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1145577 13f79535-47bb-0310-9956-ffa450edef68
2011-07-12 13:10:48 +00:00
Bosanac Dejan 326d959b03 https://issues.apache.org/jira/browse/AMQ-2583 - nio+ssl adding load test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1145569 13f79535-47bb-0310-9956-ffa450edef68
2011-07-12 12:39:13 +00:00
Bosanac Dejan e504086ca8 https://issues.apache.org/jira/browse/AMQ-2583 - nio+ssl initial implementation
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1145534 13f79535-47bb-0310-9956-ffa450edef68
2011-07-12 10:38:37 +00:00
Timothy A. Bish f0d9f8320f fix for: https://issues.apache.org/jira/browse/AMQ-3339
Adds the options maxPurgedDestinationsPerSweep to BrokerService.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1145312 13f79535-47bb-0310-9956-ffa450edef68
2011-07-11 19:51:43 +00:00
Timothy A. Bish 49d6fa6c05 fix for: https://issues.apache.org/jira/browse/AMQ-3227
ActiveMQInputStream will read the destination options and can be made to sync send via producer.alwaysSyncSend=true
Also remove the test cases dependency on port 61616.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1145295 13f79535-47bb-0310-9956-ffa450edef68
2011-07-11 19:02:12 +00:00
Gary Tully 095b4305ae https://issues.apache.org/jira/browse/AMQ-2911: Option to make all consumers retroactive. comment use of dest policy
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1145223 13f79535-47bb-0310-9956-ffa450edef68
2011-07-11 16:07:27 +00:00
Gary Tully fe63c29bcc https://issues.apache.org/jira/browse/AMQ-2911: Option to make all consumers retroactive. Patch applied and with thanks and an additional test. new destination policy entry 'alwaysRetroactive'.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1145217 13f79535-47bb-0310-9956-ffa450edef68
2011-07-11 16:02:52 +00:00
Gary Tully 5967d76c85 https://issues.apache.org/jira/browse/AMQ-3204: ensure xbean annotation is in doc comment so that it gets into the auto generated xsd
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1145135 13f79535-47bb-0310-9956-ffa450edef68
2011-07-11 12:09:31 +00:00
Gary Tully 7877fd5ecd https://issues.apache.org/jira/browse/AMQ-2584 - revisit, make audit optional on dlq stragegy, new attribute enableAudit default true. Set to false if resending to the dlq is required, can be usefull when redelivery from the dlq to the original dest is required and can repeat
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1145092 13f79535-47bb-0310-9956-ffa450edef68
2011-07-11 09:37:40 +00:00
Timothy A. Bish d5b604ec58 Fix and test for: https://issues.apache.org/jira/browse/AMQ-2528
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1144736 13f79535-47bb-0310-9956-ffa450edef68
2011-07-09 20:35:38 +00:00
Gary Tully 1f816d439e https://issues.apache.org/jira/browse/AMQ-3397: Improve scalability of active durable subs with JDBC message store. Cache topic message sequence ids to avoid each ack going to the store twice, boost through put for active durable subs; 100 subs, 550->2200 for 2min test with mysql
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1144340 13f79535-47bb-0310-9956-ffa450edef68
2011-07-08 14:37:10 +00:00
Gary Tully fc36cd7d7b allow main to easily pull xml config from a directory
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1144339 13f79535-47bb-0310-9956-ffa450edef68
2011-07-08 14:35:28 +00:00
Gary Tully d2bc650212 test to verify camel transaction rollback bubbling back to amq rollback and dql processing
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1143930 13f79535-47bb-0310-9956-ffa450edef68
2011-07-07 17:34:37 +00:00
Timothy A. Bish 1ec990575d apply patch for https://issues.apache.org/jira/browse/AMQ-3074
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1143535 13f79535-47bb-0310-9956-ffa450edef68
2011-07-06 19:12:26 +00:00
Gary Tully f232ceced0 https://issues.apache.org/jira/browse/AMQ-3353 - Durable subscribers on durable topics don't receive messages after network disconnect. Have suppression for durable subs be conditional on sub active such that reconnection/recreation/failover of bridge is not a problem. org.apache.activemq.usecases.NoDuplicateOnTopicNetworkTest still needs some work to deal with already exists errors from dupliate restarts.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1143482 13f79535-47bb-0310-9956-ffa450edef68
2011-07-06 16:11:03 +00:00
Timothy A. Bish 40f9146939 Test case for https://issues.apache.org/jira/browse/AMQ-3342 and applied patch with a few mods.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1143470 13f79535-47bb-0310-9956-ffa450edef68
2011-07-06 15:44:33 +00:00
Gary Tully ac1c44f324 https://issues.apache.org/jira/browse/AMQ-3393 - Number of established STOMP connections constantly increasing. resolve contention over delayed stop. Add soLinger=0 for hudson builds
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1143306 13f79535-47bb-0310-9956-ffa450edef68
2011-07-06 09:20:41 +00:00
Gary Tully 4cf6dae48b https://issues.apache.org/jira/browse/AMQ-3393 - Number of established STOMP connections constantly increasing. resolve contention over delayed stop. add count attribute to connector to see current number of connections
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1143080 13f79535-47bb-0310-9956-ffa450edef68
2011-07-05 14:37:39 +00:00
Gary Tully 3cce6b7cbb resolve failure of UdpSendReceiveWithTwoConnectionsAndLargeMessagesTest and UdpSendReceiveWithTwoConnectionsTest, regression from https://issues.apache.org/jira/browse/AMQ-3383, additional wire member shows problem with wireformat copy. relates to https://issues.apache.org/jira/browse/AMQ-3236 - separate versioning of openwire for store and wire
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1142630 13f79535-47bb-0310-9956-ffa450edef68
2011-07-04 11:36:32 +00:00
Gary Tully c8be8aa387 https://issues.apache.org/jira/browse/AMQ-2484,https://issues.apache.org/jira/browse/AMQ-2324: Forwarded message cannot be distributed to the original broker, Avoid stuck messages in a network of brokers - apply the new policy to two test cases
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1142605 13f79535-47bb-0310-9956-ffa450edef68
2011-07-04 10:24:20 +00:00
Timothy A. Bish d226f5089f fix for: https://issues.apache.org/jira/browse/AMQ-2349
fix for: https://issues.apache.org/jira/browse/AMQ-2716

When a PooledConnection is closed the Temp Destinations of the contained Connection should be removed.

Applied patch from AMQ-2349 with modifications to prevent NullPointerExceptions and some other small cleanups.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1142267 13f79535-47bb-0310-9956-ffa450edef68
2011-07-02 18:59:33 +00:00
Timothy A. Bish f24b4f7569 fix for: https://issues.apache.org/jira/browse/AMQ-3319
Concurrent read / write to the list is not protected, instead a read lock around both access points is used.

Switch to using a ConcurrentLinkQueue instead and remove the read lock around that code.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1142245 13f79535-47bb-0310-9956-ffa450edef68
2011-07-02 16:37:14 +00:00
Timothy A. Bish 7be63f21b1 Add test case for: https://issues.apache.org/jira/browse/AMQ-2528
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1142097 13f79535-47bb-0310-9956-ffa450edef68
2011-07-01 21:23:48 +00:00
Gary Tully af1b2328ee https://issues.apache.org/jira/browse/AMQ-2484,https://issues.apache.org/jira/browse/AMQ-2324: Forwarded message cannot be distributed to the original broker, Avoid stuck messages in a network of brokers - implement destination policy that allows the network filter factory to be provided. A new implementation will allow queues to replay messages with a configurable delay once there are no local consumers. Also it allows a rate limit on the network consumer such that a statically included dest does not consume all messages if there is a slow local consumer
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1142005 13f79535-47bb-0310-9956-ffa450edef68
2011-07-01 17:45:54 +00:00
Timothy A. Bish ead8df6ed2 Apply patch for: https://issues.apache.org/jira/browse/AMQ-3326
Use of sync block was causing unneeded serialization of calls to add and remove producers and consumers when the inactivity purge wasn't running.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1141741 13f79535-47bb-0310-9956-ffa450edef68
2011-06-30 22:22:04 +00:00
Timothy A. Bish fc4a6497ea Apply patch for: https://issues.apache.org/jira/browse/AMQ-3383
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1141641 13f79535-47bb-0310-9956-ffa450edef68
2011-06-30 18:00:38 +00:00
Timothy A. Bish 0bed411301 Patch for: https://issues.apache.org/jira/browse/AMQ-3214
Should have any effect either way given the construtor args but user reports that its an issue in some environments.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1141331 13f79535-47bb-0310-9956-ffa450edef68
2011-06-29 23:41:30 +00:00
Bosanac Dejan 4fcc1f7192 https://issues.apache.org/jira/browse/AMQ-3382 - statically included destination should be always forwarded
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1141124 13f79535-47bb-0310-9956-ffa450edef68
2011-06-29 14:58:04 +00:00
Bosanac Dejan a798c85535 https://issues.apache.org/jira/browse/AMQ-3379 - unique property eviction strategy - remove oldest if there's no duplicates
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1141033 13f79535-47bb-0310-9956-ffa450edef68
2011-06-29 10:11:25 +00:00
Gary Tully 7539c7e975 https://issues.apache.org/jira/browse/AMQ-3289 - fix missing dummy arg for blob in initial insert
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1140872 13f79535-47bb-0310-9956-ffa450edef68
2011-06-28 22:27:13 +00:00
Timothy A. Bish b5a19163bc fix for: https://issues.apache.org/jira/browse/AMQ-2524
When destinations are removed via JMX or by auto remove of inactive destinations an existing producer registration can be left with a reference to a resource that no longer exists but appears valid.  The destination should be marked as disposed so that a producer send can check to see if it should discard its current reference to the destination and either recreate it or update its cache to point to the currect destination resource.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1140770 13f79535-47bb-0310-9956-ffa450edef68
2011-06-28 18:15:29 +00:00
Bosanac Dejan 007bd4cc56 https://issues.apache.org/jira/browse/AMQ-3379 - unique property eviction strategy - remove oldest if there's no duplicates
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1140665 13f79535-47bb-0310-9956-ffa450edef68
2011-06-28 14:56:41 +00:00
Bosanac Dejan f7988655d3 https://issues.apache.org/jira/browse/AMQ-3379 - unique property eviction strategy
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1140531 13f79535-47bb-0310-9956-ffa450edef68
2011-06-28 11:27:58 +00:00
Bosanac Dejan e085ed4d5f https://issues.apache.org/jira/browse/AMQ-3378 - isSlowConsumer for SubscriptionView
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1140098 13f79535-47bb-0310-9956-ffa450edef68
2011-06-27 10:56:56 +00:00
Bosanac Dejan b78867e183 https://issues.apache.org/jira/browse/AMQ-3362 - check expired messages only for inactive durable subs
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1138925 13f79535-47bb-0310-9956-ffa450edef68
2011-06-23 15:24:14 +00:00
Bosanac Dejan 40ae055f37 https://issues.apache.org/jira/browse/AMQ-3374 - first stab at fixing long kahadb tx oom problem
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1138442 13f79535-47bb-0310-9956-ffa450edef68
2011-06-22 12:55:36 +00:00
Bosanac Dejan 37384a1ad1 https://issues.apache.org/jira/browse/AMQ-3135 - add remoteIp to network bridge advisory
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1136026 13f79535-47bb-0310-9956-ffa450edef68
2011-06-15 13:18:42 +00:00
Bosanac Dejan ed3f61a7b7 https://issues.apache.org/jira/browse/AMQ-3362 - periodic expiry of durable sub msgs
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1135649 13f79535-47bb-0310-9956-ffa450edef68
2011-06-14 15:31:54 +00:00
Timothy A. Bish 6d48b4b077 https://issues.apache.org/jira/browse/AMQ-3337
The ProducerViewMBean should expose the ProducerId value.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1134107 13f79535-47bb-0310-9956-ffa450edef68
2011-06-09 22:06:18 +00:00
Bosanac Dejan a4b8c8ee1a https://issues.apache.org/jira/browse/AMQ-498 - check max frame size before umarshalling commands
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1133980 13f79535-47bb-0310-9956-ffa450edef68
2011-06-09 16:39:20 +00:00
Bosanac Dejan 8a82119dd5 https://issues.apache.org/jira/browse/AMQ-498 - check max frame size before umarshalling commands
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1133956 13f79535-47bb-0310-9956-ffa450edef68
2011-06-09 16:01:16 +00:00
Bosanac Dejan e5e99d72f3 https://issues.apache.org/jira/browse/AMQ-498 - make max frame size part of wire format negotiation
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1133915 13f79535-47bb-0310-9956-ffa450edef68
2011-06-09 15:09:55 +00:00
Timothy A. Bish 6ad39a3615 https://issues.apache.org/jira/browse/AMQ-3337
Use the same case as the Topic and Queue destinationType filters.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1133579 13f79535-47bb-0310-9956-ffa450edef68
2011-06-08 21:59:01 +00:00
Timothy A. Bish d34967bdd0 https://issues.apache.org/jira/browse/AMQ-3337
Create a better ObjectName for dynamic destination producers.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1133564 13f79535-47bb-0310-9956-ffa450edef68
2011-06-08 21:37:18 +00:00
Timothy A. Bish c43282ed8e https://issues.apache.org/jira/browse/AMQ-3337
Updated unit tests

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1133399 13f79535-47bb-0310-9956-ffa450edef68
2011-06-08 13:44:30 +00:00
Timothy A. Bish 629b18cf27 https://issues.apache.org/jira/browse/AMQ-3337
Adds some enhancements to the ProducerView functionality.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1133180 13f79535-47bb-0310-9956-ffa450edef68
2011-06-07 22:21:17 +00:00
Bosanac Dejan d0b43c1a60 https://issues.apache.org/jira/browse/AMQ-498 - prevent dos attack for nio transport by specifying large frame size
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1133003 13f79535-47bb-0310-9956-ffa450edef68
2011-06-07 13:26:04 +00:00
Bosanac Dejan f6061bd4c6 https://issues.apache.org/jira/browse/AMQ-3351 - moving LocationMarshaller to kahadb module, so it can work well in osgi environment
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1132587 13f79535-47bb-0310-9956-ffa450edef68
2011-06-06 10:41:42 +00:00
Gary Tully a2f3e8a3d1 remove obsolete attribute: syncOnTransaction
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1131035 13f79535-47bb-0310-9956-ffa450edef68
2011-06-03 13:41:16 +00:00
Gary Tully 7631ca9cad https://issues.apache.org/jira/browse/AMQ-3357 - vmQueueCursor or fileQueueCursor with expired messages in the store can lead to startup hang with kahaDB. Use a write lock for recovery processing. Add kahaDB and jdbc test to validate for both cursors
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1131010 13f79535-47bb-0310-9956-ffa450edef68
2011-06-03 12:24:55 +00:00
Gary Tully c255d1ddcb https://issues.apache.org/jira/browse/AMQ-3356 - DispatchedQueueCount (messages pending dispatch) should be visible on the jmx connection view
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1130974 13f79535-47bb-0310-9956-ffa450edef68
2011-06-03 10:08:22 +00:00
Gary Tully 0817f5d5df https://issues.apache.org/jira/browse/AMQ-3352 - failover ConnectionStateTracker can lead to OOM with TextMessages. have the cache retain the original message so that it can use the correct formatted size when it is evicted so the addition and substractions match
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1130865 13f79535-47bb-0310-9956-ffa450edef68
2011-06-02 22:52:32 +00:00
Gary Tully 2b102598dc https://issues.apache.org/jira/browse/AMQ-3351 - Usage of the temp store index by the PList needs the be improved. new implementation puts the max entries in a page, reading/writing requires substantially less page access and disk access when pending messages build up
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1130607 13f79535-47bb-0310-9956-ffa450edef68
2011-06-02 15:28:30 +00:00
Bosanac Dejan 27e6dd7e8c https://issues.apache.org/jira/browse/AMQ-3347 - network connector restart/re-add
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1130469 13f79535-47bb-0310-9956-ffa450edef68
2011-06-02 10:24:28 +00:00
Bosanac Dejan 0601fb7118 https://issues.apache.org/jira/browse/AMQ-3348 - network connector restart
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1130441 13f79535-47bb-0310-9956-ffa450edef68
2011-06-02 09:05:39 +00:00
Bosanac Dejan 3326ab9176 https://issues.apache.org/jira/browse/AMQ-3347 - restart network connectors
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1130203 13f79535-47bb-0310-9956-ffa450edef68
2011-06-01 16:08:37 +00:00
Timothy A. Bish 71c0d441f9 fix for: https://issues.apache.org/jira/browse/AMQ-3337
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1129835 13f79535-47bb-0310-9956-ffa450edef68
2011-05-31 18:36:44 +00:00
Bosanac Dejan 6fefadb620 https://issues.apache.org/jira/browse/AMQ-3341 - reseting destination map
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1129741 13f79535-47bb-0310-9956-ffa450edef68
2011-05-31 15:10:50 +00:00
Bosanac Dejan 861e26c297 https://issues.apache.org/jira/browse/AMQ-3135 - ConnectionInfo.clientIp - a correct remote for duplex
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1128280 13f79535-47bb-0310-9956-ffa450edef68
2011-05-27 12:32:15 +00:00
Timothy A. Bish 0c4fe3ec9c fix for: https://issues.apache.org/jira/browse/AMQ-3337
Missed some commented out test code.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1128088 13f79535-47bb-0310-9956-ffa450edef68
2011-05-26 21:01:47 +00:00
Timothy A. Bish 7092b19dd2 fix for: https://issues.apache.org/jira/browse/AMQ-3337
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1128072 13f79535-47bb-0310-9956-ffa450edef68
2011-05-26 20:43:32 +00:00
Gary Tully cf5de8ebbe https://issues.apache.org/jira/browse/AMQ-3335 - Allow TaskRunnerFactory to be configured on the broker via xml config
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1127550 13f79535-47bb-0310-9956-ffa450edef68
2011-05-25 15:12:17 +00:00
Gary Tully 975fc55b2a https://issues.apache.org/jira/browse/AMQ-3332 - Make optimizeAckTimeout configurable to allow for different network latencies. Added attribute optimizeAcknowledgeTimeOut to ActiveMQConnectionFactory and ActiveMQConnection to make this configurble. A value of 0 disables, default stays at 300ms
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1125454 13f79535-47bb-0310-9956-ffa450edef68
2011-05-20 16:37:39 +00:00
Timothy A. Bish c1ebbc1465 Fix for: https://issues.apache.org/jira/browse/AMQ-3312
Replace usage of CopyOnWriteArraySet in the MBean methods that don't require a thread safe collection.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1125427 13f79535-47bb-0310-9956-ffa450edef68
2011-05-20 15:16:51 +00:00
Bosanac Dejan fd6c731690 https://issues.apache.org/jira/browse/AMQ-3135 - ConnectionInfo.clientIp - supporting duplex network case
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1124299 13f79535-47bb-0310-9956-ffa450edef68
2011-05-18 15:19:50 +00:00
Gary Tully 128a8f7a8e https://issues.apache.org/jira/browse/AMQ-3325 - PList temp store, chunk stream does not exist when broker under stress. Sync issue around temp store list creation for subs pending message cursor
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1104075 13f79535-47bb-0310-9956-ffa450edef68
2011-05-17 09:16:22 +00:00
Bosanac Dejan b5579ac1ca https://issues.apache.org/jira/browse/AMQ-3135 - add remote address to connection info advisory
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1103673 13f79535-47bb-0310-9956-ffa450edef68
2011-05-16 10:17:14 +00:00
Gary Tully 52d5189698 https://issues.apache.org/jira/browse/AMQ-3315 - Allow socket option soLinger to be enabled on TcpTransport. allow disable, soLinger == -1, disable, > -1 enable otherwise not set so system default
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1102232 13f79535-47bb-0310-9956-ffa450edef68
2011-05-12 10:22:20 +00:00
Gary Tully e8d45cb2d0 https://issues.apache.org/jira/browse/AMQ-3316 - Memory leak in ConnectionStateTracker with MessagePull objects. resolve typo
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1102023 13f79535-47bb-0310-9956-ffa450edef68
2011-05-11 19:01:04 +00:00
Gary Tully a1c19c5e49 https://issues.apache.org/jira/browse/AMQ-3316 - Memory leak in ConnectionStateTracker with MessagePull objects. Patch applied with thanks, good catch\!
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1102018 13f79535-47bb-0310-9956-ffa450edef68
2011-05-11 18:51:54 +00:00
Gary Tully 717bca1a40 https://issues.apache.org/jira/browse/AMQ-3272 - Handle RejectedExecutionException. In this case avoid the root cause, by allowing the semaphore to limit the enqueue tasks. Issue was in the cancel case locks were being release and the semaphore dropped while the executore queue still had the task pending, it needs to execute before the the samaphore can be released as it gates the task queue
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1102014 13f79535-47bb-0310-9956-ffa450edef68
2011-05-11 18:43:43 +00:00
Gary Tully 0aa5c2a889 https://issues.apache.org/jira/browse/AMQ-3315 - Allow socket option soLinger to be enabled on TcpTransport. url transport args ?soLinger=0 and ?transport.soLinger (for the broker accepted connectons) are now supported. a value > -1 enabled and sets the timeout to that value
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1101866 13f79535-47bb-0310-9956-ffa450edef68
2011-05-11 13:17:53 +00:00
Timothy A. Bish 3aaa1e73be fix for: https://issues.apache.org/jira/browse/AMQ-3306
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1101613 13f79535-47bb-0310-9956-ffa450edef68
2011-05-10 19:29:56 +00:00
Gary Tully 7e13a81851 https://issues.apache.org/jira/browse/AMQ-3314 - FilePendingMessageCursor isFull reports full in error when temp store is full, even if not needing the temp store. have cursor report full only if memory exhausted or temp usage exhausted and temp usage is needed
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1101544 13f79535-47bb-0310-9956-ffa450edef68
2011-05-10 17:15:02 +00:00
Gary Tully 842686a908 https://issues.apache.org/jira/browse/AMQ-2063 - JDBC persistence adapter improvements. make cleanup conditional on cleanupInterval > 0. Variants of the other improvements are already present on trunk
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1101109 13f79535-47bb-0310-9956-ffa450edef68
2011-05-09 16:55:51 +00:00
Gary Tully 0619a8757e https://issues.apache.org/jira/browse/AMQ-3310 - IOException PListStore "Could not locate data file" from FilePendingMessageCursor. Issue with reference counting and async location initialsation resulting in inuse data file removal and data file leaking. Pulled cleanup into task that periodically queries lists for references
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1101085 13f79535-47bb-0310-9956-ffa450edef68
2011-05-09 16:11:50 +00:00
Gary Tully d5813be360 https://issues.apache.org/jira/browse/AMQ-3305 - fix regression, only ask store for size while we are active, such that we don't get errors on stop
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1100959 13f79535-47bb-0310-9956-ffa450edef68
2011-05-09 11:08:14 +00:00
Gary Tully 1d242a2786 https://issues.apache.org/jira/browse/AMQ-3305 - add RecoveredTransaction JMX MBean to allow administrative heuristic completion of pending xa transactions. handy in the event of the transaction manager having trouble
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1100288 13f79535-47bb-0310-9956-ffa450edef68
2011-05-06 17:13:56 +00:00
Gary Tully 101e7110bc https://issues.apache.org/jira/browse/AMQ-3305 - Implement "exactly once" delivery with kahaDB and XA in the event of a failure post prepare.
Fixed up transaction broker recovery processing and kahadb store such that pending recovered
messages and acks wait for and respect the eventual xa transction outcome. Essentially
implementing exactly once delivery semantics on failure. Updated the camel jms to jdbc
test route to validate correct failure recovery processing with geronimo, test pulls in
xa wrappers from jencks and openejb such that NamedXAResources are registered with geronimo.
Additional unit tests added.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1100208 13f79535-47bb-0310-9956-ffa450edef68
2011-05-06 13:27:49 +00:00
Gary Tully ddca4cf590 null check in brokerSerice for jmx uri map and remove duplicated tests
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1100207 13f79535-47bb-0310-9956-ffa450edef68
2011-05-06 13:26:16 +00:00
Gary Tully 4fb190e444 verfication of discovered. params for static discovery
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1097793 13f79535-47bb-0310-9956-ffa450edef68
2011-04-29 12:40:27 +00:00
Gary Tully 12838c2811 https://issues.apache.org/jira/browse/AMQ-3300 - Add support for soWriteTimeout and soTimeout to ssl transport
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1097191 13f79535-47bb-0310-9956-ffa450edef68
2011-04-27 17:40:57 +00:00
Gary Tully c395917fa7 Ensure provided temp data store is started
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1097069 13f79535-47bb-0310-9956-ffa450edef68
2011-04-27 10:29:32 +00:00
Gary Tully adc45e8801 https://issues.apache.org/jira/browse/AMQ-3289 - ActiveMQ has problems storing >4K messages in Oracle - brought BlobAdapter up to speed and added @Override to other adapters to catch this sort of problem in the future
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1095376 13f79535-47bb-0310-9956-ffa450edef68
2011-04-20 11:52:50 +00:00
Gary Tully fe31092b54 https://issues.apache.org/jira/browse/AMQ-3288 - JDBC persistence adapter, intermittent performance degradation when a durable subscriber of priority messages falls behind. Store recovery was sometimes ignoring batch limit and would recover till memory limit was reached. Resolved issue with out or order delvery and immediatePriorityDelivery policy around memory limit boundaries. Resolved issue with over eager cleanup when priority and non priority destinations are mixed. Removed potential full table scan from cleanup. Resolved issue with null message ref (prefetch=0) and expiry. Added a bunch of corresponding tests
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1095352 13f79535-47bb-0310-9956-ffa450edef68
2011-04-20 10:39:25 +00:00
Timothy A. Bish 315b00fa14 fix for: https://issues.apache.org/jira/browse/AMQ-3278
fox for: https://issues.apache.org/jira/browse/AMQ-3271

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1094807 13f79535-47bb-0310-9956-ffa450edef68
2011-04-18 22:56:53 +00:00
Bosanac Dejan eb24079a93 https://issues.apache.org/jira/browse/AMQ-2774 - handling TransportDisposedIOException and making reconnection logic work in this case as well
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1094618 13f79535-47bb-0310-9956-ffa450edef68
2011-04-18 15:23:42 +00:00
Bosanac Dejan efcd57f60d https://issues.apache.org/jira/browse/AMQ-826 - ldap based authorization - add support for temp destinations
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1092098 13f79535-47bb-0310-9956-ffa450edef68
2011-04-14 10:27:59 +00:00
Bosanac Dejan 046130ef8e https://issues.apache.org/jira/browse/AMQ-826 - ldap based authorization - more fixes - support composite and easy advisory settings
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1091862 13f79535-47bb-0310-9956-ffa450edef68
2011-04-13 17:49:29 +00:00
Bosanac Dejan 26cf6a7f26 https://issues.apache.org/jira/browse/AMQ-826 - ldap based authorization - making tests work again, upgrading to apache ds 1.5.7, fixing ldif
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1091401 13f79535-47bb-0310-9956-ffa450edef68
2011-04-12 13:25:34 +00:00
Gary Tully 8a2892b9d0 https://issues.apache.org/jira/browse/AMQ-3276 - ConcurrentModificationException in embedded 5.5.0 broker. Rework https://issues.apache.org/jira/browse/AMQ-3219 - no need to set the context on thread creation as mdc impl uses an InheritableThreadLocal. This should avoid the concurrent mod, little test in mods to org.apache.activemq.bugs.AMQ2902Test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1090320 13f79535-47bb-0310-9956-ffa450edef68
2011-04-08 16:16:58 +00:00
Gary Tully 2c27e5edf2 add quick test variant to validate presence of mdc between threads
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1090318 13f79535-47bb-0310-9956-ffa450edef68
2011-04-08 16:16:27 +00:00
Bosanac Dejan 15de238fd6 https://issues.apache.org/jira/browse/AMQ-3272 - prevent RejectedExecutionException in kahadb
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1090186 13f79535-47bb-0310-9956-ffa450edef68
2011-04-08 10:22:40 +00:00
Bosanac Dejan 24ed4fe5ae https://issues.apache.org/jira/browse/AMQ-3275 - make udp protocol work
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1089864 13f79535-47bb-0310-9956-ffa450edef68
2011-04-07 12:59:24 +00:00
Bosanac Dejan 47833b7fb1 https://issues.apache.org/jira/browse/AMQ-3273 - file lock on win
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1089772 13f79535-47bb-0310-9956-ffa450edef68
2011-04-07 08:30:53 +00:00
Gary Tully 7fdd58e5b2 https://issues.apache.org/jira/browse/AMQ-3268 - Cannot use <SslContext> tag in blueprint configuration. Pull Resource from the api such that that string schema matches the java api. A resource is still used in the implementation such that a local or relative path or uri is supported
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1088944 13f79535-47bb-0310-9956-ffa450edef68
2011-04-05 09:47:19 +00:00
Gary Tully 951d87066c https://issues.apache.org/jira/browse/AMQ-3263 - ActiveMQ LoggingBrokerPlugin too verbose. add logSessionEvents attribute to split connection and session info. Patch applied with thanks
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1088631 13f79535-47bb-0310-9956-ffa450edef68
2011-04-04 14:09:30 +00:00
Bosanac Dejan 1760d1aefb https://issues.apache.org/jira/browse/AMQ-3262 - queue browser and message order
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1088593 13f79535-47bb-0310-9956-ffa450edef68
2011-04-04 12:27:11 +00:00
Gary Tully d55a3922c9 https://issues.apache.org/jira/browse/AMQ-3253 - Support Temporary Destinations in a network without advisories. Allow gc of regular destinations that have just network consumers, hub/spoke case with dynamic real reply destinations. policy entry: GcWithNetworkConsumers now applicable to all destinations. addition to https://issues.apache.org/jira/browse/AMQ-2571
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1088557 13f79535-47bb-0310-9956-ffa450edef68
2011-04-04 11:11:36 +00:00
Gary Tully 254d9209f5 https://issues.apache.org/jira/browse/AMQ-3253 - Support Temporary Destinations in a network without advisories. Support hub and spoke, such that two spokes can communicate. Revisit https://issues.apache.org/jira/browse/AMQ-2571 to make creating temp destinations on command configurable broker setAllowTempAutoCreationOnSend=true and allow temp destinations to be gced via gcInactiveDestinations policy
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1087912 13f79535-47bb-0310-9956-ffa450edef68
2011-04-01 21:56:34 +00:00
Gary Tully b9045dba98 https://issues.apache.org/jira/browse/AMQ-3253 - Support Temporary Destinations in a network without advisories. Allow the connection id generator prefix to be set via a connection factory such that temp identies can be configured such that they are suitable for inclusion in a network list of statically included destintions. Allow auto recreation of temp destinations by a new producer and tie lifecycle to the producers connection. This allows configurable support for request reply with temps in a network with advisory support disabled
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1087330 13f79535-47bb-0310-9956-ffa450edef68
2011-03-31 15:11:09 +00:00
Bosanac Dejan d8c142f1f4 https://issues.apache.org/jira/browse/AMQ-3249 - removing jaxb and stax from dependencies and distro
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1086566 13f79535-47bb-0310-9956-ffa450edef68
2011-03-29 12:32:34 +00:00
Gary Tully eb22a02563 https://issues.apache.org/jira/browse/AMQ-3236 - fix regression in MessageAckTest, ensure wireversion is used for marshaller test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1086542 13f79535-47bb-0310-9956-ffa450edef68
2011-03-29 10:33:21 +00:00
Timothy A. Bish b0a38ff6c1 Update the test case so that its not dependent on port 61616
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1086378 13f79535-47bb-0310-9956-ffa450edef68
2011-03-28 20:10:41 +00:00
Gary Tully 442232514c [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1086321 13f79535-47bb-0310-9956-ffa450edef68
2011-03-28 18:02:03 +00:00
Gary Tully c94de4230a [maven-release-plugin] prepare release activemq-5.5.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1086315 13f79535-47bb-0310-9956-ffa450edef68
2011-03-28 17:52:07 +00:00
Gary Tully 69ac6cc55e add missing license text
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1086294 13f79535-47bb-0310-9956-ffa450edef68
2011-03-28 16:30:46 +00:00
Bosanac Dejan 625f5e38a5 ExpiredMessagesWithNoConsumerTest failure on slow machines
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1086280 13f79535-47bb-0310-9956-ffa450edef68
2011-03-28 15:43:51 +00:00
Gary Tully 8443bd188a https://issues.apache.org/jira/browse/AMQ-3236 - preserve store compatability with new ack attribute. Only use version 7 openwire on the wire, persist using version 6 format. New ack cause attribute does not need to persist as it gets set in a DLQ message property. resolve regression - org.apache.activemq.store.amq.reader.AMQReaderTest.testIterateArchive
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1086277 13f79535-47bb-0310-9956-ffa450edef68
2011-03-28 15:41:18 +00:00
Gary Tully 41506505f4 https://issues.apache.org/jira/browse/AMQ-1780 - ActiveMQ broker does not automatically reconnect if the connection to the database is lost - extend the DefaultIOExceptionHandler http://activemq.apache.org/configurable-ioexception-handling.html to be aware of sql exceptions and provide a connector stop/resume option. This is now called in the event of a failure to get a jdbc connection, the default behaviour is to stop as before, but new iptions to ignore some sql exceptions or to stop/resume connectors are supported which allow a db restart to be recovered without restarting the broker
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1086182 13f79535-47bb-0310-9956-ffa450edef68
2011-03-28 11:00:06 +00:00
Timothy A. Bish 53f789b475 fix for: https://issues.apache.org/jira/browse/AMQ-3241
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1085773 13f79535-47bb-0310-9956-ffa450edef68
2011-03-26 17:24:27 +00:00
Timothy A. Bish bbd4b33646 On really slow machine this test can take a bit longer than the current timeout.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1085539 13f79535-47bb-0310-9956-ffa450edef68
2011-03-25 19:48:32 +00:00
Gary Tully d4d3915d91 help diagnose jenkins failure with expired messages advisory error, tidy up logging to include exception
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1085337 13f79535-47bb-0310-9956-ffa450edef68
2011-03-25 11:52:49 +00:00
Timothy A. Bish 08bd791c5d On a slow machine this test can take a lot longer, so increase the wait time accordingly.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1085119 13f79535-47bb-0310-9956-ffa450edef68
2011-03-24 20:31:26 +00:00
Timothy A. Bish 751ba900ae fix for: https://issues.apache.org/jira/browse/AMQ-2171
Need to send a pull command when prefetch is zero, also adds test case for this issue.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1085080 13f79535-47bb-0310-9956-ffa450edef68
2011-03-24 19:15:50 +00:00
Gary Tully 228abac0c1 remove hard dependency on free ports
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084902 13f79535-47bb-0310-9956-ffa450edef68
2011-03-24 11:29:26 +00:00
Gary Tully f23303ae66 add auto fail to ensure it won't block a hudson build again and we get a thread dump
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084900 13f79535-47bb-0310-9956-ffa450edef68
2011-03-24 11:22:49 +00:00
Gary Tully 4298a41af8 give it more time to produce for hudson
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084892 13f79535-47bb-0310-9956-ffa450edef68
2011-03-24 10:39:51 +00:00
Timothy A. Bish 883eed0e38 Update the tests so that they're not dependent on port 61616
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084797 13f79535-47bb-0310-9956-ffa450edef68
2011-03-23 22:58:18 +00:00
Timothy A. Bish 5cf486c975 Update the test so that its not dependant on port 61616
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084751 13f79535-47bb-0310-9956-ffa450edef68
2011-03-23 21:24:46 +00:00
Gary Tully c42d8de034 https://issues.apache.org/jira/browse/AMQ-2852 - Memory leak when undeploying webapp with ActiveMQ client - AMQ store piece
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084633 13f79535-47bb-0310-9956-ffa450edef68
2011-03-23 16:36:55 +00:00
Gary Tully eee1db625a https://issues.apache.org/jira/browse/AMQ-3236 - revert use of all caps in property name
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084604 13f79535-47bb-0310-9956-ffa450edef68
2011-03-23 14:42:59 +00:00
Bosanac Dejan 3da9f1c6ea https://issues.apache.org/jira/browse/AMQ-3219 - add prefix to mdc keys
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084576 13f79535-47bb-0310-9956-ffa450edef68
2011-03-23 13:17:09 +00:00
Gary Tully 88c10842df https://issues.apache.org/jira/browse/AMQ-3238 - Topic-Messages not redelivered to durable subscription after rollback and reconnect. resolve by making durable sub ack transaction aware, issue existed across all stores
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084550 13f79535-47bb-0310-9956-ffa450edef68
2011-03-23 11:50:50 +00:00
Bosanac Dejan 68bcac109a https://issues.apache.org/jira/browse/AMQ-3237 - FileLock.tryLock() doesn't work well in all environments
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084533 13f79535-47bb-0310-9956-ffa450edef68
2011-03-23 10:43:21 +00:00
Bosanac Dejan 8d65328f0f https://issues.apache.org/jira/browse/AMQ-3105 - removing icu4j from activemq-core and some more fixes
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084526 13f79535-47bb-0310-9956-ffa450edef68
2011-03-23 09:50:19 +00:00
Timothy A. Bish cad663a1e9 Update the test so that its not dependent on port 61617.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084379 13f79535-47bb-0310-9956-ffa450edef68
2011-03-22 22:23:14 +00:00
Gary Tully 32d24fbbdd https://issues.apache.org/jira/browse/AMQ-3003 - pass new sub parameter from expired processing
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084188 13f79535-47bb-0310-9956-ffa450edef68
2011-03-22 14:11:03 +00:00
Gary Tully e10f75c33d https://issues.apache.org/jira/browse/AMQ-3236 - In the case of DLQ processing due to an exception from onMessage, provide the exception string as a message property. New property, org.apache.activemq.command.ActiveMQMessage#DLQ_DELIVERY_FAILURE_CAUSE_PROPERTY will hold the string form of the exception that causes a posion ack for a dlq message. It may be null if the cause was regular calls to rollback or message expiry. Wireformat change to have exception included with messageAck. new version 7
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084175 13f79535-47bb-0310-9956-ffa450edef68
2011-03-22 13:46:16 +00:00
Gary Tully 27c1719757 https://issues.apache.org/jira/browse/AMQ-3003 - Allow the option of a DLQ per durable subscription DeadLetterStrategy. Additional attribute destinationPerDurableSubscriber, when true causes default dlq individual prefex to be prepended with the durab sub key, connectionid:subscriberName pair. Modified DeadLetterStrategy interface to pass in message and subscription, to provide fine level controll of dlq name. Also modified Broker interface to provide subscription to message expiry and sendToDLQ methods.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084023 13f79535-47bb-0310-9956-ffa450edef68
2011-03-21 23:41:44 +00:00
Gary Tully d618ab37b0 https://issues.apache.org/jira/browse/AMQ-3231 - have stompconnection use format instead of toString for marshalling such that toString can be used for logging; mask password and truncate content like text message
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084020 13f79535-47bb-0310-9956-ffa450edef68
2011-03-21 23:34:32 +00:00
Timothy A. Bish 8314d8651f Clean up the test a bit and adds some additional time to account for slower machines.
Removes System.out and replaces with logging.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084009 13f79535-47bb-0310-9956-ffa450edef68
2011-03-21 22:50:02 +00:00
Timothy A. Bish 8fd00fac58 fix test breakages caused by the initial fix for: https://issues.apache.org/jira/browse/AMQ-3231
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1083988 13f79535-47bb-0310-9956-ffa450edef68
2011-03-21 22:11:19 +00:00
Gary Tully e44ccf7f08 https://issues.apache.org/jira/browse/AMQ-3222 - fix test regression, xbean url parsing
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1083770 13f79535-47bb-0310-9956-ffa450edef68
2011-03-21 13:12:52 +00:00
Gary Tully 400990f98a https://issues.apache.org/jira/browse/AMQ-3231 - Stomp Frame should mask passcode header in toString output, so it does not pollute the log
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1083753 13f79535-47bb-0310-9956-ffa450edef68
2011-03-21 12:21:37 +00:00
Gary Tully 3973d8ff22 fix typo in accessor
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1083752 13f79535-47bb-0310-9956-ffa450edef68
2011-03-21 12:20:11 +00:00
Bosanac Dejan 0de4f88aa7 https://issues.apache.org/jira/browse/AMQ-3218 - exclusive consumer with highest priority should always get through
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1082939 13f79535-47bb-0310-9956-ffa450edef68
2011-03-18 14:53:44 +00:00
Bosanac Dejan cc810aa4da https://issues.apache.org/jira/browse/AMQ-3219 - adding missing MDCHelper class
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1082530 13f79535-47bb-0310-9956-ffa450edef68
2011-03-17 15:15:27 +00:00
Bosanac Dejan 2b456ddbd0 https://issues.apache.org/jira/browse/AMQ-3219 - more work on MDC logging
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1082489 13f79535-47bb-0310-9956-ffa450edef68
2011-03-17 13:53:38 +00:00
Gary Tully 986ed145a7 https://issues.apache.org/jira/browse/AMQ-3222 - Failover and SimpleDiscovery - query parameters getting dropped, resolve by leaving composite prams in place and seperating out params that need to be applied to discovered transports, new format 'discovered.x' for the mulitcast case. Revisit https://issues.apache.org/jira/browse/AMQ-2981,https://issues.apache.org/jira/browse/AMQ-2598,https://issues.apache.org/activemq/browse/AMQ-2939
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1082333 13f79535-47bb-0310-9956-ffa450edef68
2011-03-16 22:48:26 +00:00
Bosanac Dejan 2a558c80a6 https://issues.apache.org/jira/browse/AMQ-3220 - network connectors and wildcards
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1081810 13f79535-47bb-0310-9956-ffa450edef68
2011-03-15 15:08:50 +00:00
Bosanac Dejan 2900806b9e https://issues.apache.org/jira/browse/AMQ-3204 - adding additional null check
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1081697 13f79535-47bb-0310-9956-ffa450edef68
2011-03-15 09:39:47 +00:00
Timothy A. Bish 3d61acf2b2 fix for: https://issues.apache.org/jira/browse/AMQ-3199
fix for: https://issues.apache.org/jira/browse/AMQ-3200

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1081540 13f79535-47bb-0310-9956-ffa450edef68
2011-03-14 19:44:59 +00:00
Bosanac Dejan f0429be6ee https://issues.apache.org/jira/browse/AMQ-3219 - add basic support for MDC and enable broker name to appear in log entries
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1081502 13f79535-47bb-0310-9956-ffa450edef68
2011-03-14 18:24:21 +00:00
Gary Tully 55b9954873 give debug logging insight to the inactivity monitor negotiation, output local and remote infos
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1080560 13f79535-47bb-0310-9956-ffa450edef68
2011-03-11 12:58:19 +00:00
Gary Tully 286c9d0020 https://issues.apache.org/jira/browse/AMQ-3183 - fix typo in useAuthenticatedPrincipalForJMSXUserID
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1080512 13f79535-47bb-0310-9956-ffa450edef68
2011-03-11 10:53:02 +00:00
Gary Tully 3df3302c65 https://issues.apache.org/jira/browse/AMQ-3211 - ensure that a JMSXUserID property set by a client is ignored if an alternative userId mechanism is in place. This ensures that a client cannot spoof this value when the broker is configured to supply if from credentials. The client supplied value is only used as a last resourt
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1080212 13f79535-47bb-0310-9956-ffa450edef68
2011-03-10 13:24:34 +00:00
Gary Tully f93d05acef https://issues.apache.org/jira/browse/AMQ-3198 - unregister failed add connection but have unregister respect the reference count such that it is only removed if the refcount is 1
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1079885 13f79535-47bb-0310-9956-ffa450edef68
2011-03-09 17:01:55 +00:00
Timothy A. Bish 4f9784dafc apply patch for: https://issues.apache.org/jira/browse/AMQ-3209
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1079831 13f79535-47bb-0310-9956-ffa450edef68
2011-03-09 15:17:59 +00:00
Bosanac Dejan 8700ab7cde https://issues.apache.org/jira/browse/AMQ-3198 - don't unregister original connection
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1079782 13f79535-47bb-0310-9956-ffa450edef68
2011-03-09 13:06:43 +00:00
Gary Tully fe0a764836 give test plenty of time before failing
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1079757 13f79535-47bb-0310-9956-ffa450edef68
2011-03-09 11:43:29 +00:00
Bosanac Dejan 6c09e846b1 https://issues.apache.org/jira/browse/AMQ-2632 - dispose the old transport listener before rebalancing
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1079384 13f79535-47bb-0310-9956-ffa450edef68
2011-03-08 15:01:59 +00:00
Bosanac Dejan 373417c0df give FailoverClusterTest a bit more time to reconnect
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1079324 13f79535-47bb-0310-9956-ffa450edef68
2011-03-08 11:16:11 +00:00
Timothy A. Bish 5b5d494e65 Fix and test for: https://issues.apache.org/jira/browse/AMQ-2213
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1079004 13f79535-47bb-0310-9956-ffa450edef68
2011-03-07 22:49:17 +00:00
Timothy A. Bish 74a45502e2 Test for: https://issues.apache.org/jira/browse/AMQ-3199
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1078821 13f79535-47bb-0310-9956-ffa450edef68
2011-03-07 15:55:08 +00:00
Gary Tully 1c1aa17311 https://issues.apache.org/jira/browse/AMQ-3206 - Unsubscribed durable sub can leave dangling message reference in kahaDB, visible after a restart
resolved by correctly updating the persitent index when a durable sub with an outstanding backlog is unsubscribed. Additional test that vaidates fix

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1078799 13f79535-47bb-0310-9956-ffa450edef68
2011-03-07 14:58:26 +00:00
Bosanac Dejan 008b3e551c https://issues.apache.org/jira/browse/AMQ-3204 - support for non-standard destination path separator
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1078766 13f79535-47bb-0310-9956-ffa450edef68
2011-03-07 13:02:58 +00:00
Timothy A. Bish d75bb6d6d8 fix for: https://issues.apache.org/jira/browse/AMQ-3202
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1078312 13f79535-47bb-0310-9956-ffa450edef68
2011-03-05 17:15:25 +00:00
Timothy A. Bish f29c8011d0 Fix for: https://issues.apache.org/jira/browse/AMQ-3045
Adds an optional maximumRedeliveryDelay that defaults to -1 to indicate no max so behavior is unchanged from previous versions.  When the backoff multiplier is enabled and the maximumReliveryDelay is set > -1 then the delay returned by getNextReliveryDealy is capped by the max of either maximumReliveryDelay or redeliveryDelay preventing delays smaller than the configured redelivery delay.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1078189 13f79535-47bb-0310-9956-ffa450edef68
2011-03-04 22:39:11 +00:00
Gary Tully 69f56058f2 https://issues.apache.org/jira/browse/AMQ-3198 - Allow JAAS GuestLoginModule to fail if users specify a password
new option to GuestLoginModule, credentialsInvalidate, when true, presence of a password will cause module to fail login
allowing the next module to validate the credential. Will only guest users who don't specify a password

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1078048 13f79535-47bb-0310-9956-ffa450edef68
2011-03-04 16:48:01 +00:00
Gary Tully 78f85ed277 further reduction in stack traces at warn level in log for STOMP, suppress to stack trace to debug level, better for authorized broker
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1077889 13f79535-47bb-0310-9956-ffa450edef68
2011-03-04 11:46:39 +00:00
Gary Tully 1b45e3be04 https://issues.apache.org/jira/browse/AMQ-3193 - fix regression with spring listener test. IndirectMessageRef cannot do equals bc it will break composite destination delivery to a single consumer, possible to break inflight count as ack of one message removes others from dispatched when message ref matches in error.
Fix is to ensure message ref is passed about such that there is a single ref per message. rework some internals to pass ref rather than message.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1077886 13f79535-47bb-0310-9956-ffa450edef68
2011-03-04 11:31:01 +00:00
Bosanac Dejan d17ecebec4 https://issues.apache.org/jira/browse/AMQ-3197 - virtual destinations and wildcards
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1076651 13f79535-47bb-0310-9956-ffa450edef68
2011-03-03 15:24:32 +00:00
Gary Tully 93e2bd355b https://issues.apache.org/jira/browse/AMQ-3196 - Speed up initial message delivery for offline durable sub with keepDurableSubsActive=true and JDBC store
avoid stop/start of cursor when keepdurablesubsactive=true such that a valid message count is retained by the cursor, independent of the store. This avoids unnecessary calls to the underlyin gtore on activation and reactivation

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1076278 13f79535-47bb-0310-9956-ffa450edef68
2011-03-02 16:23:40 +00:00
Bosanac Dejan 330c9a896d https://issues.apache.org/jira/browse/AMQ-2981 - Connecting to broker using discovery protocol fails
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1076192 13f79535-47bb-0310-9956-ffa450edef68
2011-03-02 12:32:26 +00:00
Gary Tully d8fd5330a4 https://issues.apache.org/jira/browse/AMQ-3193 - implement equals for indirect message ref, so remove from pendingdispatch will work on moveMessages
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1075864 13f79535-47bb-0310-9956-ffa450edef68
2011-03-01 15:59:59 +00:00
Gary Tully 462efdb9de https://issues.apache.org/jira/browse/AMQ-3193 - rework of fix to always populate pagedInPending
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1075846 13f79535-47bb-0310-9956-ffa450edef68
2011-03-01 15:26:00 +00:00
Bosanac Dejan 645037e539 fix for FailoverTransportBrokerTest failure
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1075821 13f79535-47bb-0310-9956-ffa450edef68
2011-03-01 13:44:31 +00:00
Bosanac Dejan 1d885d393e https://issues.apache.org/jira/browse/AMQ-2981 - modified test with workaround
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1075820 13f79535-47bb-0310-9956-ffa450edef68
2011-03-01 13:43:55 +00:00
Gary Tully f38908eb52 https://issues.apache.org/jira/browse/AMQ-3195 - NetworkConnector initialization should be backed by an executor
added new broker attribute networkConnectorStartAsync (default false) that will cause network connectors
to be started in seperate threads such that a block of one does not effect the rest

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1075801 13f79535-47bb-0310-9956-ffa450edef68
2011-03-01 12:59:09 +00:00
Bosanac Dejan 5ad72d650c https://issues.apache.org/jira/browse/AMQ-2981 - test case for discory uri with params
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1075407 13f79535-47bb-0310-9956-ffa450edef68
2011-02-28 16:19:26 +00:00
Bosanac Dejan 99653c6c8c https://issues.apache.org/jira/browse/AMQ-3193 - consumers don't get messages after JMX remove
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1075346 13f79535-47bb-0310-9956-ffa450edef68
2011-02-28 14:23:30 +00:00
Timothy A. Bish 72a0fd1a43 fix for: https://issues.apache.org/jira/browse/AMQ-2256
suppress the stack trace output for the error and just log a warning that the URI path is not valid for binding to a local port.  Output the full exception stack trace if debug logging is turned on.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1074948 13f79535-47bb-0310-9956-ffa450edef68
2011-02-26 22:52:39 +00:00
Timothy A. Bish 56f8e368d5 fix for: https://issues.apache.org/jira/browse/AMQ-2929
Added test showing how a Text Message that was compressed can be received in a state where the text is not compressed but the Message compressed flag indicates it is resulting in an exception from getText() indicating an unknown compression type.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1074725 13f79535-47bb-0310-9956-ffa450edef68
2011-02-25 22:33:19 +00:00
Gary Tully 57f5e7efa5 https://issues.apache.org/jira/browse/AMQ-3192 - Add setTrustStore() and setKeyStore() methods to ActiveMQSslConnectionFactory class
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1074577 13f79535-47bb-0310-9956-ffa450edef68
2011-02-25 15:25:21 +00:00
Gary Tully 7739a3cc4a suppress stack trace from failed add connecton to debug level trace, such that the warn just has the exception toString, with an authenticated broker, the stack trace is too much information and is the predominant reason for a failure to add
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1074550 13f79535-47bb-0310-9956-ffa450edef68
2011-02-25 14:54:48 +00:00
Gary Tully 2d121f4092 https://issues.apache.org/jira/browse/AMQ-3190 - Durable Subscription - missing messages when selector matching sub resumes after broker restart
the next message id needs to be tracked such that unmatched messages are not ignored from the indexi after a restart. Tracking it as part of message add
in the ackPositions.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1074511 13f79535-47bb-0310-9956-ffa450edef68
2011-02-25 13:17:14 +00:00
Timothy A. Bish a5fc6dd999 Add fix for https://issues.apache.org/jira/browse/AMQ-3153 and add user supplied unit test.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1074289 13f79535-47bb-0310-9956-ffa450edef68
2011-02-24 21:00:26 +00:00
Timothy A. Bish 6595dc4a62 Apply patch for https://issues.apache.org/jira/browse/AMQ-3185
Confirmed the current code allows for two calls to stop before the disposed flag is triggered.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1074209 13f79535-47bb-0310-9956-ffa450edef68
2011-02-24 16:51:59 +00:00
Bosanac Dejan 0c98cb0818 fixing broker configurations
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1074094 13f79535-47bb-0310-9956-ffa450edef68
2011-02-24 10:13:33 +00:00
Bosanac Dejan d884ba2964 test topic replication in full mesh network scenario
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1074060 13f79535-47bb-0310-9956-ffa450edef68
2011-02-24 07:58:22 +00:00
Gary Tully 0298440d4f JDBC relative test too slow for hudson, disable this variant
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1073680 13f79535-47bb-0310-9956-ffa450edef68
2011-02-23 10:33:41 +00:00