Commit Graph

3366 Commits

Author SHA1 Message Date
Bosanac Dejan 89944c7988 https://issues.apache.org/activemq/browse/AMQ-2598 - applying parameters for composite urls in discovery agent
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@984738 13f79535-47bb-0310-9956-ffa450edef68
2010-08-12 12:19:31 +00:00
Timothy A. Bish 612b044169 fix for: https://issues.apache.org/activemq/browse/AMQ-2866
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@984489 13f79535-47bb-0310-9956-ffa450edef68
2010-08-11 17:38:26 +00:00
Hadrian Zbarcea 0fad136cc6 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@984126 13f79535-47bb-0310-9956-ffa450edef68
2010-08-10 17:07:29 +00:00
Hadrian Zbarcea 30d7a7d7d3 [maven-release-plugin] prepare release activemq-5.4.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@984124 13f79535-47bb-0310-9956-ffa450edef68
2010-08-10 17:06:59 +00:00
Bosanac Dejan ab28b31451 adding license headers
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@984091 13f79535-47bb-0310-9956-ffa450edef68
2010-08-10 15:37:47 +00:00
Bosanac Dejan 261ccabf65 adding license headers
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@984049 13f79535-47bb-0310-9956-ffa450edef68
2010-08-10 14:24:26 +00:00
Gary Tully 604ec7cc9f validate if concurrentstore and dispatch topics causes an issue for message order with durable subs, actually turn if off! : https://issues.apache.org/activemq/browse/AMQ-2864
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@983971 13f79535-47bb-0310-9956-ffa450edef68
2010-08-10 12:47:59 +00:00
Gary Tully 4625a468a0 validate if concurrentstore and dispatch topics causes an issue for message order with durable subs: https://issues.apache.org/activemq/browse/AMQ-2864
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@983966 13f79535-47bb-0310-9956-ffa450edef68
2010-08-10 12:43:16 +00:00
Hadrian Zbarcea ac652da52d [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@983897 13f79535-47bb-0310-9956-ffa450edef68
2010-08-10 09:02:54 +00:00
Hadrian Zbarcea 3f8cb55122 [maven-release-plugin] prepare release activemq-5.4.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@983895 13f79535-47bb-0310-9956-ffa450edef68
2010-08-10 09:02:36 +00:00
Bosanac Dejan 948e386fbd adding license header
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@983886 13f79535-47bb-0310-9956-ffa450edef68
2010-08-10 08:50:09 +00:00
Hadrian Zbarcea 45116abe3a [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@983854 13f79535-47bb-0310-9956-ffa450edef68
2010-08-10 02:16:19 +00:00
Hadrian Zbarcea 3796cf4497 [maven-release-plugin] prepare release activemq-5.4.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@983852 13f79535-47bb-0310-9956-ffa450edef68
2010-08-10 02:15:55 +00:00
Gary Tully 7629eafd0a resolve https://issues.apache.org/activemq/browse/AMQ-2119 - have transport errors log at info level rather than debug
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@983584 13f79535-47bb-0310-9956-ffa450edef68
2010-08-09 11:06:00 +00:00
Gary Tully 670a9c4c56 resolve: https://issues.apache.org/activemq/browse/AMQ-2776 - apply variant of patch. also related to https://issues.apache.org/activemq/browse/AMQ-2771, avoid unnecessary local host name resolution
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@983565 13f79535-47bb-0310-9956-ffa450edef68
2010-08-09 09:38:46 +00:00
Gary Tully 7f7a95b457 resolve: https://issues.apache.org/activemq/browse/AMQ-2840 - add test and apply patch with thanks
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@983564 13f79535-47bb-0310-9956-ffa450edef68
2010-08-09 09:12:45 +00:00
Gary Tully ab2cd1133d resolve https://issues.apache.org/activemq/browse/AMQ-2659 - allow XAConnection/Session to be used without an XA transaction, defaults to auto_ack mode. Can still be only used transactionally with an XA transaction
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@983057 13f79535-47bb-0310-9956-ffa450edef68
2010-08-06 17:05:59 +00:00
Bosanac Dejan 34dcc17aa3 test case for https://issues.apache.org/activemq/browse/AMQ-2203 - start=false
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@983035 13f79535-47bb-0310-9956-ffa450edef68
2010-08-06 15:58:46 +00:00
Bosanac Dejan 144a362aee test case for https://issues.apache.org/activemq/browse/AMQ-2203 - start=false
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@983027 13f79535-47bb-0310-9956-ffa450edef68
2010-08-06 15:35:09 +00:00
Gary Tully b18255665f resolve: https://issues.apache.org/activemq/browse/AMQ-2125 - remove the error log, replace with warn as these are can ocurr on failover in normal usage, but are indicative of another consumer getting the message
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@982990 13f79535-47bb-0310-9956-ffa450edef68
2010-08-06 14:30:04 +00:00
Gary Tully 05101de839 resolve: https://issues.apache.org/activemq/browse/AMQ-2771 - it does not makes sense to have a hack for osx enabled by defaultm it is counter intuitive, can be enabled via transport option useLocalHost if needed in special cases
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@982962 13f79535-47bb-0310-9956-ffa450edef68
2010-08-06 13:50:58 +00:00
Gary Tully 01495a00e9 fix failure of org.apache.activemq.store.kahadb.KahaDBMessagePriorityTest - getMessageCount left cursor at end of data, reset needed at the end
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@982955 13f79535-47bb-0310-9956-ffa450edef68
2010-08-06 13:35:45 +00:00
Bosanac Dejan 474a30d7ce reverting to annotation spec 1.0 and including activemq-ra in the feature
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@982934 13f79535-47bb-0310-9956-ffa450edef68
2010-08-06 11:34:06 +00:00
Gary Tully 74495451af revert http://svn.apache.org/viewvc?rev=982099&view=rev - seems to make tests fail locally, now work ok - mvn clean test -Dtest=SimpleNetworkTest,ThreeBrokerQueueNetworkTest
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@982912 13f79535-47bb-0310-9956-ffa450edef68
2010-08-06 09:16:56 +00:00
Gary Tully c23f9e6584 resolve: fix https://issues.apache.org/activemq/browse/AMQ-1847 - set initialRedeliveryDelay=0 to get non delayed first redelivery, use deliveryDelay to set the base for subsequent redelivery. existing users with an initialRedeliveryDelay set will now see it being respected.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@982903 13f79535-47bb-0310-9956-ffa450edef68
2010-08-06 08:10:52 +00:00
Bosanac Dejan 6b81869fc6 upgrade to geronimo annotation spec 1.1
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@982677 13f79535-47bb-0310-9956-ffa450edef68
2010-08-05 16:08:02 +00:00
Bosanac Dejan 8cb9ef312f fix for JmsDurableTopicSlowReceiveTest - we must update cursor after iterating
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@982511 13f79535-47bb-0310-9956-ffa450edef68
2010-08-05 09:04:14 +00:00
Bosanac Dejan 6dffe4debe https://issues.apache.org/activemq/browse/AMQ-2861 - composite destinations and cursor memory usage
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@982317 13f79535-47bb-0310-9956-ffa450edef68
2010-08-04 16:15:31 +00:00
Gary Tully 0af6b063e7 revert http://fisheye6.atlassian.com/changelog/activemq/?cs=958009 - concurrent dispatch with transaction completion breaks when the cache is disabled, either through memory limit or through durable subs with existing messages in the store. cannot see the use case though as the transaction semantic is broken if a message can get dispatched but a commit can still fail. With dispatch ocurring postCommit like before, the option for kahaDB to do concurrent transaction dispatch is disabled
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@982240 13f79535-47bb-0310-9956-ffa450edef68
2010-08-04 12:56:42 +00:00
Gary Tully 6f7e3fc1d5 resolve failure if DestinationRemoveRestartTest - destinations were auto created in the store on resetbatch which ocurred on shutdown
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@982180 13f79535-47bb-0310-9956-ffa450edef68
2010-08-04 09:41:54 +00:00
Hadrian Zbarcea 8c4bb36bbe Speed tests up a bit. Bridge formation fails for a few tests
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@982099 13f79535-47bb-0310-9956-ffa450edef68
2010-08-04 01:35:42 +00:00
Gary Tully c1acb4030d validate properties added to disvovered transports
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@981840 13f79535-47bb-0310-9956-ffa450edef68
2010-08-03 12:20:00 +00:00
Gary Tully 969e7585f3 resolve issue with kahaDB based variant of AMQ2149Test - revert http://svn.apache.org/viewvc?rev=958330&view=rev
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@980462 13f79535-47bb-0310-9956-ffa450edef68
2010-07-29 15:04:07 +00:00
Robert Davies cba046834c changes for https://issues.apache.org/activemq/browse/AMQ-2789 - message priority
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@980458 13f79535-47bb-0310-9956-ffa450edef68
2010-07-29 14:52:03 +00:00
Gary Tully e6c4d7e81e resolve intermittent hudson failure with test, may not always produce dups so verify that case
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@980095 13f79535-47bb-0310-9956-ffa450edef68
2010-07-28 15:30:22 +00:00
Gary Tully 4f32c6bcc1 regression with https://issues.apache.org/activemq/browse/AMQ-2849 - FanoutTransportFactory needed to remove used parameters from original rather than from copy... resolve hang in FanoutTest
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@980025 13f79535-47bb-0310-9956-ffa450edef68
2010-07-28 11:44:53 +00:00
Gary Tully 6b4509cdea apply patch from https://issues.apache.org/activemq/browse/AMQ-2774
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@980014 13f79535-47bb-0310-9956-ffa450edef68
2010-07-28 10:43:27 +00:00
Robert Davies 43c2315257 version 1 kahaDB
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@980007 13f79535-47bb-0310-9956-ffa450edef68
2010-07-28 09:47:23 +00:00
Robert Davies e8ff71d371 added version 1 database for KahaDB
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@980004 13f79535-47bb-0310-9956-ffa450edef68
2010-07-28 09:29:25 +00:00
Robert Davies 91ae1712f4 added version 1 database for KahaDB
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@980002 13f79535-47bb-0310-9956-ffa450edef68
2010-07-28 09:25:54 +00:00
Robert Davies cca20b81d7 fixed an issue for copying directories
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@979977 13f79535-47bb-0310-9956-ffa450edef68
2010-07-28 08:07:12 +00:00
Gary Tully 5e0e4248de resolve https://issues.apache.org/activemq/browse/AMQ-2850, still needs a kahadb variant
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@979775 13f79535-47bb-0310-9956-ffa450edef68
2010-07-27 17:04:24 +00:00
Gary Tully af5d8d154a resolve: https://issues.apache.org/activemq/browse/AMQ-2842 - patch applied with thanks
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@979324 13f79535-47bb-0310-9956-ffa450edef68
2010-07-26 15:24:11 +00:00
Gary Tully 9ecc679b38 resolve: https://issues.apache.org/activemq/browse/AMQ-2849 - patch applied with thanks
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@979277 13f79535-47bb-0310-9956-ffa450edef68
2010-07-26 13:34:24 +00:00
Robert Davies 0004917cd8 updated copy() method to copy directories
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@979216 13f79535-47bb-0310-9956-ffa450edef68
2010-07-26 09:52:17 +00:00
Robert Davies 5f400b3853 prevent npe
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@978813 13f79535-47bb-0310-9956-ffa450edef68
2010-07-24 06:44:15 +00:00
Gary Tully f206a1bd11 resolve https://issues.apache.org/activemq/browse/AMQ-2580 - patch was good for AMQ store, fix needed for kahaDB and JDBC now done, test case was great, thanks.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@967134 13f79535-47bb-0310-9956-ffa450edef68
2010-07-23 15:31:10 +00:00
Gary Tully 21e641d496 fix issue with size of SimplePriorityMessageDispatchChannel, cause intermittent failure of FailoverConsumerUnconsumedTest
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@967052 13f79535-47bb-0310-9956-ffa450edef68
2010-07-23 11:42:31 +00:00
Bosanac Dejan 2677c6bf0e https://issues.apache.org/activemq/browse/AMQ-2843 - support database schema upgrades
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@967008 13f79535-47bb-0310-9956-ffa450edef68
2010-07-23 09:01:08 +00:00
Bosanac Dejan 4f5e620d1c https://issues.apache.org/activemq/browse/AMQ-2843 - first stab at supporting priority for durable subs
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@966712 13f79535-47bb-0310-9956-ffa450edef68
2010-07-22 15:46:18 +00:00
Gary Tully 383d12ed0e resolve: https://issues.apache.org/activemq/browse/AMQ-2741 - visibility of abort slow consumer policy in via jmx
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@966319 13f79535-47bb-0310-9956-ffa450edef68
2010-07-21 17:09:33 +00:00
Bosanac Dejan 12f0195913 https://issues.apache.org/activemq/browse/AMQ-2843 - first stab at adding priority for queues in JDBC store
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@966291 13f79535-47bb-0310-9956-ffa450edef68
2010-07-21 16:06:39 +00:00
Bosanac Dejan c4425caa2f https://issues.apache.org/activemq/browse/AMQ-2789 and https://issues.apache.org/activemq/browse/AMQ-2843 - adds tests for cursors and stores and fixes a PrioritizedPendingList bug
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@966223 13f79535-47bb-0310-9956-ffa450edef68
2010-07-21 13:38:40 +00:00
Bosanac Dejan 03f38ae402 https://issues.apache.org/activemq/browse/AMQ-2843 - add mechanism for stores to know whether to use prioritized recovery or not
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@966145 13f79535-47bb-0310-9956-ffa450edef68
2010-07-21 08:59:42 +00:00
Bosanac Dejan 8ed8dd41c4 https://issues.apache.org/activemq/browse/AMQ-2841 - log stomp protocol errors
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@965897 13f79535-47bb-0310-9956-ffa450edef68
2010-07-20 16:25:52 +00:00
Bosanac Dejan 11705e70b4 https://issues.apache.org/activemq/browse/AMQ-2702 - remove runtime spring dependency
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@965820 13f79535-47bb-0310-9956-ffa450edef68
2010-07-20 12:07:27 +00:00
Robert Davies c6af867113 Patch applied for https://issues.apache.org/activemq/browse/AMQ-2833
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@965542 13f79535-47bb-0310-9956-ffa450edef68
2010-07-19 16:10:22 +00:00
Gary Tully 607f1ef669 resolve: https://issues.apache.org/activemq/browse/AMQ-2836 - copy message before logging
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@965517 13f79535-47bb-0310-9956-ffa450edef68
2010-07-19 14:59:27 +00:00
Gary Tully d85895666a resolve https://issues.apache.org/activemq/browse/AMQ-2832 - impl for AMQ pa
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@964866 13f79535-47bb-0310-9956-ffa450edef68
2010-07-16 17:30:25 +00:00
Bosanac Dejan 145c80a298 https://issues.apache.org/activemq/browse/AMQ-2574 - removing runtime OSGi dependency
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@964847 13f79535-47bb-0310-9956-ffa450edef68
2010-07-16 16:20:21 +00:00
Gary Tully f2517c01b8 resolve https://issues.apache.org/activemq/browse/AMQ-2832 - track ack file references to prevent cleanup of data files with acks for inuse message files, impl for kahaDB
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@964804 13f79535-47bb-0310-9956-ffa450edef68
2010-07-16 14:19:27 +00:00
Gary Tully a7f9164464 resolve NPE on stop when reconnect fails - resolve https://issues.apache.org/activemq/browse/AMQ-2811
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@964367 13f79535-47bb-0310-9956-ffa450edef68
2010-07-15 10:18:02 +00:00
Bosanac Dejan 3817ed9a97 https://issues.apache.org/activemq/browse/AMQ-2825 - jettison 1.2
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@964087 13f79535-47bb-0310-9956-ffa450edef68
2010-07-14 15:51:37 +00:00
Gary Tully 54a1520393 add test that validates https://issues.apache.org/activemq/browse/AMQ-1893 is resolved on trunk
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@964051 13f79535-47bb-0310-9956-ffa450edef68
2010-07-14 13:56:17 +00:00
Gary Tully 73433372e9 rework fix for https://issues.apache.org/activemq/browse/AMQ-1730 - better support for unordered message consumption when there are multiple short lived consumers, eg with spring mlc and concurrent consumers > 1
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@963894 13f79535-47bb-0310-9956-ffa450edef68
2010-07-13 22:40:58 +00:00
Bosanac Dejan 03349fecda https://issues.apache.org/activemq/browse/AMQ-2817 - prevent test from failing
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@963678 13f79535-47bb-0310-9956-ffa450edef68
2010-07-13 11:08:35 +00:00
Gary Tully b1d7a78c0a further reduction in contention on inflight transacitons in kahaDB store
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@963674 13f79535-47bb-0310-9956-ffa450edef68
2010-07-13 10:54:59 +00:00
Bosanac Dejan 584d52c1f0 https://issues.apache.org/activemq/browse/AMQ-2822 - stomp+nio and content-length
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@963282 13f79535-47bb-0310-9956-ffa450edef68
2010-07-12 13:57:11 +00:00
Robert Davies cee683f84c Fix for https://issues.apache.org/activemq/browse/AMQ-2475
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@963118 13f79535-47bb-0310-9956-ffa450edef68
2010-07-11 17:51:51 +00:00
Robert Davies ea0ceacef0 Fix for https://issues.apache.org/activemq/browse/AMQ-2070
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@963104 13f79535-47bb-0310-9956-ffa450edef68
2010-07-11 16:33:03 +00:00
Robert Davies 70314ea8a6 Fix for https://issues.apache.org/activemq/browse/AMQ-2821
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@963096 13f79535-47bb-0310-9956-ffa450edef68
2010-07-11 16:09:02 +00:00
Robert Davies 2705e3606f Fix for https://issues.apache.org/activemq/browse/AMQ-2821
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@963095 13f79535-47bb-0310-9956-ffa450edef68
2010-07-11 16:08:15 +00:00
Robert Davies 26430893ae set name of temporary store to tmpDB
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@962620 13f79535-47bb-0310-9956-ffa450edef68
2010-07-09 17:58:54 +00:00
Bosanac Dejan 681cf04da9 https://issues.apache.org/activemq/browse/AMQ-2817 - sanitize stomp headers
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@962512 13f79535-47bb-0310-9956-ffa450edef68
2010-07-09 12:55:21 +00:00
Gary Tully 5763561d60 resolve PerDestinationStoreLimitTest - have store size reflect stored messages rather than disk usage (so now it reports used rather than allocated disk soace excluding the index) such that 100MB messages gives store size ~100MB while disk utilisation may be bigger. getDiskSize still exsits to get totall allocated space on disk. This allows configured limits to be more accuratly enforced and fixes this test regression. Also calculation is accumulative rather than on demand so it much faster
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@962468 13f79535-47bb-0310-9956-ffa450edef68
2010-07-09 09:52:43 +00:00
Gary Tully a6a6a708ff resolve https://issues.apache.org/activemq/browse/AMQ-2800, https://issues.apache.org/activemq/browse/AMQ-2542, https://issues.apache.org/activemq/browse/AMQ-2803 - implement duplicate checker in transport for a failover: reconnect, uses last seqid from store. iimplemented for kahaDB and JDBC
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@961783 13f79535-47bb-0310-9956-ffa450edef68
2010-07-08 14:23:21 +00:00
Robert Davies 89e538db7c Only start Producer Flow Control thread when needed
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@961500 13f79535-47bb-0310-9956-ffa450edef68
2010-07-07 20:31:40 +00:00
Robert Davies b47da808d7 Improve concurrency
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@961484 13f79535-47bb-0310-9956-ffa450edef68
2010-07-07 19:34:09 +00:00
Robert Davies 720ff40ac0 fixed a potential hole around lock usage
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@961272 13f79535-47bb-0310-9956-ffa450edef68
2010-07-07 07:35:31 +00:00
Robert Davies 28180b35bd Improve concurrency by using read/write locks
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@961245 13f79535-47bb-0310-9956-ffa450edef68
2010-07-07 05:10:17 +00:00
Gary Tully cc700dd841 reinstate this test case
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@960869 13f79535-47bb-0310-9956-ffa450edef68
2010-07-06 10:58:06 +00:00
Gary Tully 4160249750 resolve https://issues.apache.org/activemq/browse/AMQ-2603 - update to org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec:1.0.1
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@960857 13f79535-47bb-0310-9956-ffa450edef68
2010-07-06 09:55:17 +00:00
Robert Davies 179bd54e22 synchronization around creation of preparedTransactions
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@960645 13f79535-47bb-0310-9956-ffa450edef68
2010-07-05 17:18:10 +00:00
Robert Davies 95ba6efceb updated doc
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@960632 13f79535-47bb-0310-9956-ffa450edef68
2010-07-05 16:27:57 +00:00
Robert Davies caea2f22f0 remove unnecessary started flag
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@960590 13f79535-47bb-0310-9956-ffa450edef68
2010-07-05 13:16:36 +00:00
Robert Davies 6a5030b9f5 removed unnecessary synchronization around dispatch list
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@960444 13f79535-47bb-0310-9956-ffa450edef68
2010-07-05 05:06:18 +00:00
Robert Davies 42ee51fe9a Applied patch for https://issues.apache.org/activemq/browse/AMQ-2795
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@960298 13f79535-47bb-0310-9956-ffa450edef68
2010-07-04 06:28:36 +00:00
Robert Davies c14c7e791d Fix for https://issues.apache.org/activemq/browse/AMQ-2807
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@960296 13f79535-47bb-0310-9956-ffa450edef68
2010-07-04 05:49:20 +00:00
Gary Tully 76f842d371 improve async task concurrency, contention over indexMutex for transactions and taskMap, not per destination. Added some metrics enabled by system properties to help further diagnosis of journal usage
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@960060 13f79535-47bb-0310-9956-ffa450edef68
2010-07-02 17:11:00 +00:00
Gary Tully d1e35e6c3a add trivial boolean selector test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@959298 13f79535-47bb-0310-9956-ffa450edef68
2010-06-30 13:12:19 +00:00
Robert Davies 452ceae26e Name the BrokerService TaskRunner
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@959200 13f79535-47bb-0310-9956-ffa450edef68
2010-06-30 05:57:45 +00:00
Robert Davies d1b5029dc6 Remove the need to check if the store is empty when checking to enable cache
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@958330 13f79535-47bb-0310-9956-ffa450edef68
2010-06-27 06:07:02 +00:00
Robert Davies dd48ebea00 Use KahaDB (as now the default store)
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@958329 13f79535-47bb-0310-9956-ffa450edef68
2010-06-27 06:05:46 +00:00
Timothy A. Bish 9807ee3253 fix for: https://issues.apache.org/activemq/browse/AMQ-2098
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@958103 13f79535-47bb-0310-9956-ffa450edef68
2010-06-25 20:23:56 +00:00
Robert Davies ddb2c91c20 transaction performance enhancements
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@958009 13f79535-47bb-0310-9956-ffa450edef68
2010-06-25 15:45:47 +00:00
Gary Tully 39c536395a work around: javax.net.ssl.SSLHandshakeException: renegotiation is not allowed - http://java.sun.com/javase/javaseforbusiness/docs/TLSReadme.html for SslBrokerServiceTest with latest jdk security fixes
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@957916 13f79535-47bb-0310-9956-ffa450edef68
2010-06-25 12:23:07 +00:00
Gary Tully fb591e7b89 fix intermittent failure in JDBCNegativeQueueTest, sync store add and cursor add such that cursor is always in order w.r.t the store. Hense, when the cursor cache is exhausted, resuming from the store is just fine. Without the sync, moving from cache to store can result in duplicate messages, out of order messages and on occasion missing messages. disabling the cache resolved all of the above but kills performance. Syncing the sore add and cursor add is the correct solution, but it has an impact on concurrent transaction completion for a destination, paralell completion across destinations can still continue, so there is still some batching potential
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@957899 13f79535-47bb-0310-9956-ffa450edef68
2010-06-25 11:49:01 +00:00
Robert Davies 00879cf683 changes for https://issues.apache.org/activemq/browse/AMQ-2791
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@957881 13f79535-47bb-0310-9956-ffa450edef68
2010-06-25 10:28:17 +00:00
Bosanac Dejan eeacd65a2b https://issues.apache.org/activemq/browse/AMQ-2081 - anonymous access
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@957509 13f79535-47bb-0310-9956-ffa450edef68
2010-06-24 11:16:09 +00:00
Bosanac Dejan 1f063e8557 https://issues.apache.org/activemq/browse/AMQ-2790 - check connection to prevent NPEs
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@957213 13f79535-47bb-0310-9956-ffa450edef68
2010-06-23 14:23:51 +00:00
Bosanac Dejan ac77a047c0 https://issues.apache.org/activemq/browse/AMQ-2695 - counter fix
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@957210 13f79535-47bb-0310-9956-ffa450edef68
2010-06-23 14:11:19 +00:00
Bosanac Dejan d53609ff08 https://issues.apache.org/activemq/browse/AMQ-2695 - kahadb store directory location
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@957194 13f79535-47bb-0310-9956-ffa450edef68
2010-06-23 13:39:14 +00:00
Bosanac Dejan 9f417a2e5a https://issues.apache.org/activemq/browse/AMQ-2695 - additional fix for amq store
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@957181 13f79535-47bb-0310-9956-ffa450edef68
2010-06-23 13:06:19 +00:00
Bosanac Dejan 2aa2278fc2 https://issues.apache.org/activemq/browse/AMQ-2793 - KahaDB default dir
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@957154 13f79535-47bb-0310-9956-ffa450edef68
2010-06-23 11:00:43 +00:00
Robert Davies 7ad152bac8 Ensure executor constructed correctly
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@957005 13f79535-47bb-0310-9956-ffa450edef68
2010-06-22 20:08:12 +00:00
Robert Davies c14dc3a06f Fix for https://issues.apache.org/activemq/browse/AMQ-2790
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@956918 13f79535-47bb-0310-9956-ffa450edef68
2010-06-22 15:20:49 +00:00
Bosanac Dejan a8b0d39915 intermittent failures on slow machines
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@956570 13f79535-47bb-0310-9956-ffa450edef68
2010-06-21 13:14:06 +00:00
Robert Davies 69e3b6c8c8 Fix for https://issues.apache.org/activemq/browse/AMQ-2786
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@956481 13f79535-47bb-0310-9956-ffa450edef68
2010-06-21 07:57:32 +00:00
Gary Tully d55404445a give it more time to build up writes
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@955993 13f79535-47bb-0310-9956-ffa450edef68
2010-06-18 13:08:31 +00:00
Gary Tully e85dda9c64 have KahaDB lock work in vm, so master slave tests can work ok. preserver kaha behaiour in this regard as it makes testing simpler. fix npe on shutdown if start fails
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@955973 13f79535-47bb-0310-9956-ffa450edef68
2010-06-18 12:27:51 +00:00
Bosanac Dejan ae5300b190 https://issues.apache.org/activemq/browse/AMQ-2782 - removing temp destinations over the network
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@955621 13f79535-47bb-0310-9956-ffa450edef68
2010-06-17 14:56:23 +00:00
Bosanac Dejan 9703219972 https://issues.apache.org/activemq/browse/AMQ-2782 - test case
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@955505 13f79535-47bb-0310-9956-ffa450edef68
2010-06-17 08:33:37 +00:00
Robert Davies f42c91f43d Fix for https://issues.apache.org/activemq/browse/AMQ-2475
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@955504 13f79535-47bb-0310-9956-ffa450edef68
2010-06-17 08:24:26 +00:00
Robert Davies 1999d948bb handle Future correctly passed back from the store
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@955221 13f79535-47bb-0310-9956-ffa450edef68
2010-06-16 12:49:24 +00:00
Robert Davies ddf228227c Enable XBean property editors
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@955183 13f79535-47bb-0310-9956-ffa450edef68
2010-06-16 10:24:53 +00:00
Robert Davies 47181b7b07 Fix for https://issues.apache.org/activemq/browse/AMQ-2738
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@955179 13f79535-47bb-0310-9956-ffa450edef68
2010-06-16 10:17:06 +00:00
Robert Davies 37b7d9cfbd remove JDK 1.6 specific calls
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@955178 13f79535-47bb-0310-9956-ffa450edef68
2010-06-16 10:12:23 +00:00
Robert Davies 774a9daa4d fixed incorrect broker URL
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@955171 13f79535-47bb-0310-9956-ffa450edef68
2010-06-16 09:42:32 +00:00
Robert Davies e70308804f clear down async tasks on stop
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@955168 13f79535-47bb-0310-9956-ffa450edef68
2010-06-16 09:38:46 +00:00
Robert Davies 7a5abebea8 make concurrent store and dispatch with transactions optional
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@955149 13f79535-47bb-0310-9956-ffa450edef68
2010-06-16 07:40:33 +00:00
Robert Davies 27262c8463 Transactions dispatch and commit to the store asynchronously, though the commit only returns to the producer when they both complete for KahaDB
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@955039 13f79535-47bb-0310-9956-ffa450edef68
2010-06-15 20:33:41 +00:00
Gary Tully ad06a5f9c3 resolve https://issues.apache.org/activemq/browse/AMQ-2765 - rework fix for https://issues.apache.org/activemq/browse/AMQ-2772 - each consumer needs to indicate when interuption processing is complete. till there is a need to do other wise, the connection consumers (used by the RA managed connection) immediatly allow redelivery
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@954972 13f79535-47bb-0310-9956-ffa450edef68
2010-06-15 17:17:07 +00:00
Bosanac Dejan 370d56e300 https://issues.apache.org/activemq/browse/AMQ-2770 - durable subscription mbean
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@954893 13f79535-47bb-0310-9956-ffa450edef68
2010-06-15 14:06:43 +00:00
Robert Davies dc6dc7e540 updated performance tests
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@954604 13f79535-47bb-0310-9956-ffa450edef68
2010-06-14 19:35:17 +00:00
Robert Davies 794e62fbaa Fix for https://issues.apache.org/activemq/browse/AMQ-2777
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@954599 13f79535-47bb-0310-9956-ffa450edef68
2010-06-14 19:21:21 +00:00
Gary Tully 027d2e71b6 resolve https://issues.apache.org/activemq/browse/AMQ-2779 - add selectorAware option to a virtual topic such that only message matching some exisitng subscription selector are propagated to a subscription queue, this allows dynamic selector usage withough the build up of unmatched messages on a destination
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@954540 13f79535-47bb-0310-9956-ffa450edef68
2010-06-14 16:25:57 +00:00
Bosanac Dejan bc2b677c4d https://issues.apache.org/activemq/browse/AMQ-2695 - durable subs and selectors - test that verifies amq store
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@954412 13f79535-47bb-0310-9956-ffa450edef68
2010-06-14 11:20:40 +00:00
Bosanac Dejan d96c1cb7a3 https://issues.apache.org/activemq/browse/AMQ-2695 - durable subs and selectors - fix for kahadb
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@954406 13f79535-47bb-0310-9956-ffa450edef68
2010-06-14 10:34:54 +00:00
Gary Tully 6b18edc771 add test for https://issues.apache.org/activemq/browse/AMQ-2084 that works just fine
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@953739 13f79535-47bb-0310-9956-ffa450edef68
2010-06-11 15:48:46 +00:00
Bosanac Dejan 9444a7903e https://issues.apache.org/activemq/browse/AMQ-2769 - durable sub unsubscribe
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@953708 13f79535-47bb-0310-9956-ffa450edef68
2010-06-11 14:46:40 +00:00
Gary Tully e771b88479 resolve: https://issues.apache.org/activemq/browse/AMQ-2772 - patch applied with thanks and new test case created to protect the change
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@953696 13f79535-47bb-0310-9956-ffa450edef68
2010-06-11 13:40:49 +00:00
Bosanac Dejan 2b6f36dbfd first stab at resolving https://issues.apache.org/activemq/browse/AMQ-2695
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@953384 13f79535-47bb-0310-9956-ffa450edef68
2010-06-10 16:43:38 +00:00
Bosanac Dejan bb17d61516 https://issues.apache.org/activemq/browse/AMQ-2665 - additional fix
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@953382 13f79535-47bb-0310-9956-ffa450edef68
2010-06-10 16:39:27 +00:00
Bosanac Dejan 9c47f6b385 https://issues.apache.org/activemq/browse/AMQ-2665 - durable activation and predefined topics
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@952976 13f79535-47bb-0310-9956-ffa450edef68
2010-06-09 12:22:52 +00:00
Bosanac Dejan bf61bebd79 cleaning up AMQ2413Test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@952962 13f79535-47bb-0310-9956-ffa450edef68
2010-06-09 11:14:10 +00:00
Bosanac Dejan 9fcf16eaab https://issues.apache.org/activemq/browse/AMQ-2663 - keepDurableSubsActive=false reactivation
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@952946 13f79535-47bb-0310-9956-ffa450edef68
2010-06-09 10:31:49 +00:00
Bosanac Dejan 121ecb5599 https://issues.apache.org/activemq/browse/AMQ-2767 - proxyToLocalBroker <proxyConnector> property
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@952642 13f79535-47bb-0310-9956-ffa450edef68
2010-06-08 12:58:28 +00:00
Bosanac Dejan 99ef19a43d https://issues.apache.org/activemq/browse/AMQ-2753 - additional test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@951067 13f79535-47bb-0310-9956-ffa450edef68
2010-06-03 16:51:40 +00:00
Gary Tully 3c8df79eca add test to veriry loadbalance across network, effect of prefetch on vm client vs nework consumer, allowed prefetch to be configured via xml property (ie string in schema) for xml config
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@950515 13f79535-47bb-0310-9956-ffa450edef68
2010-06-02 12:08:58 +00:00
Gary Tully 3271401883 resolve durable restart test regressions with kahaDB as default store, the next message sequence id could get out of sync for a durable sub when drained and reused, fix for https://issues.apache.org/activemq/browse/AMQ-2755
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@950171 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 17:28:21 +00:00
Gary Tully 7f0ced9402 resolve regression in FailoverTransactionTest following change to fix resolve https://issues.apache.org/activemq/browse/AMQ-2751, fix needs to be conditional on delayed delivery otherwise it can effect async transacted redelivery on failover
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@949789 13f79535-47bb-0310-9956-ffa450edef68
2010-05-31 16:12:06 +00:00
Gary Tully 72015ca681 resolve https://issues.apache.org/activemq/browse/AMQ-2754 - fix issue with conduit sub removal
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@949742 13f79535-47bb-0310-9956-ffa450edef68
2010-05-31 13:44:17 +00:00
Gary Tully ecf068e23b first cut at resolution to: https://issues.apache.org/activemq/browse/AMQ-2753 - add priority network consumer dispatch policy that will ignore duplicates such that there can be redundancy in the network with the addition of suppressDuplicateTopicSubscriptions attribute on a network bridge
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@948911 13f79535-47bb-0310-9956-ffa450edef68
2010-05-27 17:02:41 +00:00
Gary Tully b50ede668d resolve https://issues.apache.org/activemq/browse/AMQ-2752 - allow timestamp broker plugin to optinally modify network messages, processNetworkMessages attribute
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@948858 13f79535-47bb-0310-9956-ffa450edef68
2010-05-27 15:22:43 +00:00
Gary Tully ae7df9fcaa help in diagnosis of https://issues.apache.org/activemq/browse/AMQ-2749 - provide log message when waiting for space to free up
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@948489 13f79535-47bb-0310-9956-ffa450edef68
2010-05-26 16:29:38 +00:00
Gary Tully 18adfefabe resolve https://issues.apache.org/activemq/browse/AMQ-2751 - duplicate suppression over eager with listener, session.recover from a message listener when default delayed redelivery is in place
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@948463 13f79535-47bb-0310-9956-ffa450edef68
2010-05-26 14:52:20 +00:00
Gary Tully 33f4190343 resolve regression in ThreeBrokerVirtualTopicNetworkTest - asnyc tasks need to use destination in key as id is not uniqueue with virtual topics. Also, on a failed cancle, we must wait for the write to compete so the ack/remove does not lag the write leaving an outstanding message. consequence of fixes for https://issues.apache.org/activemq/browse/AMQ-2620 and
https://issues.apache.org/activemq/browse/AMQ-2568

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@948209 13f79535-47bb-0310-9956-ffa450edef68
2010-05-25 21:20:40 +00:00
Bosanac Dejan aace7c6937 https://issues.apache.org/activemq/browse/AMQ-1464 - fanout regression
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@947757 13f79535-47bb-0310-9956-ffa450edef68
2010-05-24 18:43:39 +00:00
Gary Tully 35593638f5 resolve ConnectorXBeanConfigTest, broker service needs to null more impls at shutdown to allow restart to find new impls of scheudaler etc. consequence of fixes for https://issues.apache.org/activemq/browse/AMQ-2620 and
https://issues.apache.org/activemq/browse/AMQ-2568

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@947671 13f79535-47bb-0310-9956-ffa450edef68
2010-05-24 15:36:14 +00:00
Gary Tully e1389a6acc allow journal write batching, resolve global transaction lock and journal lock, let writes accumulate on the datafileappender rather than at the store, also tie transaction completion and after commit processing together with a callback rather than with a global lock so that concurrent commits can batch their writes - rework of fix for https://issues.apache.org/activemq/browse/AMQ-2594
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@947657 13f79535-47bb-0310-9956-ffa450edef68
2010-05-24 14:48:55 +00:00