Commit Graph

5655 Commits

Author SHA1 Message Date
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 d04c10845c have test wait for both network bridges before starting producer to check load balance
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1209201 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 19:25:38 +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
Bosanac Dejan 33bb129bee first attempt at creating karaf integration test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1206238 13f79535-47bb-0310-9956-ffa450edef68
2011-11-25 15:57:41 +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 6352502376 https://issues.apache.org/jira/browse/AMQ-2968 - osgi import typo fixed
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1205823 13f79535-47bb-0310-9956-ffa450edef68
2011-11-24 13:28:56 +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
Bosanac Dejan d19e9e387c activemq-run build should work with deploy profile - turning off source attachment
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1205034 13f79535-47bb-0310-9956-ffa450edef68
2011-11-22 15:15:17 +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
Bosanac Dejan 7c2d5e492f activemq-rar build should work with deploy profile - turning off source attachment
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1204975 13f79535-47bb-0310-9956-ffa450edef68
2011-11-22 13:19:07 +00:00
Bosanac Dejan 2e2681f2c2 activemq-all build should work with deploy profile - turning off source attachment
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1204962 13f79535-47bb-0310-9956-ffa450edef68
2011-11-22 12:51:38 +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 5396b2bca1 Update XStream and slf4j to latest releases
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1201067 13f79535-47bb-0310-9956-ffa450edef68
2011-11-11 22:03:11 +00:00
Timothy A. Bish 7b02226bd6 fix for: https://issues.apache.org/jira/browse/AMQ-3589
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1201059 13f79535-47bb-0310-9956-ffa450edef68
2011-11-11 21:30:47 +00:00
Timothy A. Bish 5af811f272 Fix for: https://issues.apache.org/jira/browse/AMQ-3590
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1201054 13f79535-47bb-0310-9956-ffa450edef68
2011-11-11 21:15:14 +00:00
Timothy A. Bish 5886b66ed3 apply patch for: https://issues.apache.org/jira/browse/AMQ-3588
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1200532 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 20:28:20 +00:00
Timothy A. Bish 77f9b87294 Add missing license header and a tearDown method to ensure the created BrokerService gets stopped.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1200489 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 19:28:59 +00:00
Bosanac Dejan 55e7216292 https://issues.apache.org/jira/browse/AMQ-3581 - web console escape url
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1199259 13f79535-47bb-0310-9956-ffa450edef68
2011-11-08 14:29:34 +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
Bosanac Dejan e0b23f27e2 https://issues.apache.org/jira/browse/AMQ-3579 - http transport in osgi
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1197537 13f79535-47bb-0310-9956-ffa450edef68
2011-11-04 12:38:15 +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