9600242662
merge from trunk: r826696 - resolve some timing issues with slow tests and potential jmx port clash
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@826705 13f79535-47bb-0310-9956-ffa450edef68
2009-10-19 15:38:00 +00:00
2049bb7ddb
merge from trunk fix race condition in test that validates dequeue count, thanks Al on irc
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@825088 13f79535-47bb-0310-9956-ffa450edef68
2009-10-14 11:30:18 +00:00
fe81c0fc98
fix for https://issues.apache.org/activemq/browse/AMQ-2448 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@824823 13f79535-47bb-0310-9956-ffa450edef68
2009-10-13 15:56:58 +00:00
ee61961807
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@823118 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 10:23:10 +00:00
b8d8222ba8
[maven-release-plugin] prepare release activemq-5.3.0
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@823116 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 10:23:01 +00:00
79b4d44c92
apply fix for AMQ-2439 to 5.3 branch
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@822911 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 20:59:52 +00:00
47bf82495c
AMQ-2439: KahaDB + Network of Brokers + Restart = Duplicate Messages that cannot be removed from the data store
...
- merges in 821090 821103 821115
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@822813 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 17:53:55 +00:00
3b03a5f348
merging 822797 - sendAdvisoryIfNoConsumers
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@822799 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 16:41:17 +00:00
ece0653e8e
merging 822295 - timestamp plugin fix
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@822318 13f79535-47bb-0310-9956-ffa450edef68
2009-10-06 15:32:25 +00:00
6a6e806552
merging 822231 - stomp and xmpp test on ibm jdk 6
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@822235 13f79535-47bb-0310-9956-ffa450edef68
2009-10-06 12:09:48 +00:00
4ae5d3b704
merging 820268,821106 - jdbc recovery
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@821112 13f79535-47bb-0310-9956-ffa450edef68
2009-10-02 17:50:55 +00:00
2b50ad6378
merging 820955 - jdbc sync issue under high load
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@820957 13f79535-47bb-0310-9956-ffa450edef68
2009-10-02 10:44:18 +00:00
67b1873b66
AMQ-2435: NullPointer Exception Occurs when using producer flow control
...
When producer window based flow control kicks in now, we copy the context since it will be
changed while the message send request is waiting for space on the queue.
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@820715 13f79535-47bb-0310-9956-ffa450edef68
2009-10-01 16:51:32 +00:00
075f16d783
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@820592 13f79535-47bb-0310-9956-ffa450edef68
2009-10-01 09:54:05 +00:00
986a3a121c
[maven-release-plugin] prepare release activemq-5.3.0
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@820590 13f79535-47bb-0310-9956-ffa450edef68
2009-10-01 09:53:55 +00:00
3b70bd2f06
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@820338 13f79535-47bb-0310-9956-ffa450edef68
2009-09-30 16:27:29 +00:00
df853085d5
[maven-release-plugin] prepare release activemq-5.3.0
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@820335 13f79535-47bb-0310-9956-ffa450edef68
2009-09-30 16:27:21 +00:00
f2a06f92c4
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@820306 13f79535-47bb-0310-9956-ffa450edef68
2009-09-30 15:47:15 +00:00
402dcf7f27
[maven-release-plugin] prepare release activemq-5.3.0
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@820304 13f79535-47bb-0310-9956-ffa450edef68
2009-09-30 15:46:30 +00:00
ba842ad58f
AMQ-2414 fixes for MySQL cluster setup
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@820032 13f79535-47bb-0310-9956-ffa450edef68
2009-09-29 17:07:12 +00:00
7e551e100e
reverting rev 818936 re: issue AMQ-2414
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@820012 13f79535-47bb-0310-9956-ffa450edef68
2009-09-29 16:16:31 +00:00
f53358fb55
merging http://svn.apache.org/viewvc?rev=819998&view=rev
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@820001 13f79535-47bb-0310-9956-ffa450edef68
2009-09-29 15:57:07 +00:00
a085227268
merging http://svn.apache.org/viewvc?rev=819493&view=rev
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@819495 13f79535-47bb-0310-9956-ffa450edef68
2009-09-28 11:00:01 +00:00
cb3dd92ed2
Merge fix for https://issues.apache.org/activemq/browse/AMQ-2426 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@819037 13f79535-47bb-0310-9956-ffa450edef68
2009-09-25 21:47:48 +00:00
20f47285a8
Merged /activemq/trunk:r818947-818955
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@818957 13f79535-47bb-0310-9956-ffa450edef68
2009-09-25 19:00:43 +00:00
1b6f8e26cf
AMQ-2414: Fixing the failing create tables problem on MySQL cluster.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@818937 13f79535-47bb-0310-9956-ffa450edef68
2009-09-25 18:10:48 +00:00
d76664ae1a
Was part of AMQ-2414: reduce verbosity of expection traces in the console.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@818925 13f79535-47bb-0310-9956-ffa450edef68
2009-09-25 17:36:51 +00:00
81f8131fcc
AMQ-2414: Support mysql cluster configurations
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@818911 13f79535-47bb-0310-9956-ffa450edef68
2009-09-25 16:27:08 +00:00
8dd67934e6
AMQ-2416: Provide xbean xml elements for the JDBC adapter classes to support the simpler XML configuration syntax
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@818910 13f79535-47bb-0310-9956-ffa450edef68
2009-09-25 16:26:27 +00:00
37aba7aa11
merging http://svn.apache.org/viewvc?view=rev&revision=818812
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@818813 13f79535-47bb-0310-9956-ffa450edef68
2009-09-25 10:48:55 +00:00
fdf3571a8b
Merged /activemq/trunk:r818724-818762
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@818768 13f79535-47bb-0310-9956-ffa450edef68
2009-09-25 08:36:16 +00:00
64917b8032
merging rev 818609: Test case fix JMSConsumerTest
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@818615 13f79535-47bb-0310-9956-ffa450edef68
2009-09-24 20:08:56 +00:00
e51506ca29
Merging 818516,818513 Fixes osgi issues
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@818587 13f79535-47bb-0310-9956-ffa450edef68
2009-09-24 18:59:13 +00:00
0dd7973aa2
merging http://fisheye6.atlassian.com/changelog/activemq/trunk?cs=818013
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@818541 13f79535-47bb-0310-9956-ffa450edef68
2009-09-24 16:34:56 +00:00
1c121bcded
merging revisions 817222:817842
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@818540 13f79535-47bb-0310-9956-ffa450edef68
2009-09-24 16:32:07 +00:00
14b983cab1
merging http://fisheye6.atlassian.com/changelog/activemq/trunk?cs=817713
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@818536 13f79535-47bb-0310-9956-ffa450edef68
2009-09-24 16:23:12 +00:00
9e588fd1ad
Merged /activemq/trunk:r818504-818510
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@818525 13f79535-47bb-0310-9956-ffa450edef68
2009-09-24 15:52:46 +00:00
f830e07b66
merging http://svn.apache.org/viewvc?view=rev&revision=818496
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@818497 13f79535-47bb-0310-9956-ffa450edef68
2009-09-24 14:35:24 +00:00
660f9cf819
Merging http://svn.apache.org/viewvc?view=rev&revision=818487
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@818488 13f79535-47bb-0310-9956-ffa450edef68
2009-09-24 14:03:03 +00:00
71da0cd97a
Merging http://svn.apache.org/viewvc?view=rev&revision=818484
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@818485 13f79535-47bb-0310-9956-ffa450edef68
2009-09-24 13:49:08 +00:00
3008cfb442
Merged /activemq/trunk:r818480
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@818481 13f79535-47bb-0310-9956-ffa450edef68
2009-09-24 13:36:14 +00:00
70144c9fe9
Merged /activemq/trunk:r818140-818147,818160-818176,818225-818262
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@818418 13f79535-47bb-0310-9956-ffa450edef68
2009-09-24 09:39:05 +00:00
88d5c9c296
merging http://svn.apache.org/viewvc?view=rev&revision=818224
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@818226 13f79535-47bb-0310-9956-ffa450edef68
2009-09-23 19:47:01 +00:00
9f6d8d21c7
Merging http://svn.apache.org/viewvc?view=rev&revision=818155
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@818158 13f79535-47bb-0310-9956-ffa450edef68
2009-09-23 16:21:22 +00:00
4037e9db9c
Merging: http://svn.apache.org/viewvc?view=rev&revision=818138
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@818139 13f79535-47bb-0310-9956-ffa450edef68
2009-09-23 15:33:31 +00:00
b6c35d6312
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@816304 13f79535-47bb-0310-9956-ffa450edef68
2009-09-17 17:54:20 +00:00
ba05c2106c
[maven-release-plugin] prepare release activemq-5.3.0
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@816302 13f79535-47bb-0310-9956-ffa450edef68
2009-09-17 17:54:10 +00:00
d31324c8b0
Merging lic. header fixes
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@816299 13f79535-47bb-0310-9956-ffa450edef68
2009-09-17 17:39:47 +00:00
6ee44f5fee
addapting versions to 5.3 branch
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@816273 13f79535-47bb-0310-9956-ffa450edef68
2009-09-17 16:49:17 +00:00
05a2c0773e
[maven-release-plugin] prepare release activemq-5.3.0
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@816195 13f79535-47bb-0310-9956-ffa450edef68
2009-09-17 14:01:35 +00:00
Gary Tully
Bosanac Dejan
Hiram R. Chirino
Timothy A. Bish
Robert Davies