6758 Commits

Author SHA1 Message Date
Timothy A. Bish
800e0267fb fix test case after changes in https://issues.apache.org/jira/browse/AMQ-4237 broke the test's MBean lookup
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1429089 13f79535-47bb-0310-9956-ffa450edef68
2013-01-04 20:23:56 +00:00
Hiram R. Chirino
1949846c0a Switch to scala 2.10
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1429079 13f79535-47bb-0310-9956-ffa450edef68
2013-01-04 20:02:27 +00:00
Timothy A. Bish
c61ee931f6 Add to svn:ignore
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1429065 13f79535-47bb-0310-9956-ffa450edef68
2013-01-04 19:54:50 +00:00
Timothy A. Bish
b2de5f310f code fix and test fix for: https://issues.apache.org/jira/browse/AMQ-4225
NetworkBridge MBeans weren't getting registered because of changes in the Broker MBean naming.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1429064 13f79535-47bb-0310-9956-ffa450edef68
2013-01-04 19:53:47 +00:00
Timothy A. Bish
8e9896825f fix test case after changes in https://issues.apache.org/jira/browse/AMQ-4237 broke the test's MBean lookup
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1428983 13f79535-47bb-0310-9956-ffa450edef68
2013-01-04 17:02:29 +00:00
Timothy A. Bish
8a6ebc20a3 cleanup and fix warnings.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1428981 13f79535-47bb-0310-9956-ffa450edef68
2013-01-04 17:01:05 +00:00
Timothy A. Bish
f3407fe4b2 Fix broken unit test, openwire.v*.WireFormatInfoTest max property size not set correctly.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1428953 13f79535-47bb-0310-9956-ffa450edef68
2013-01-04 16:22:32 +00:00
Timothy A. Bish
cbee1cc147 fix test case after changes in https://issues.apache.org/jira/browse/AMQ-4237 broke the test's MBean lookup
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1428950 13f79535-47bb-0310-9956-ffa450edef68
2013-01-04 16:11:54 +00:00
Gary Tully
e5d616da50 https://issues.apache.org/jira/browse/AMQ-4160 - fix up multicast discovery regression - it was giving uniqueue events to add/remove. MulticastDiscoveryOnFaultyNetworkTest - added static variant to that test also to validate existing changes
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1428901 13f79535-47bb-0310-9956-ffa450edef68
2013-01-04 14:48:30 +00:00
Bosanac Dejan
603dc66b44 https://issues.apache.org/jira/browse/AMQ-4237 - first step at fixing web console to use new mbean name format
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1428899 13f79535-47bb-0310-9956-ffa450edef68
2013-01-04 14:45:35 +00:00
Timothy A. Bish
b6e3ca74ba fix test failure
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1428673 13f79535-47bb-0310-9956-ffa450edef68
2013-01-03 23:42:21 +00:00
Timothy A. Bish
b2681b9a82 Fix test breakage after latest round of broker fixes.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1428663 13f79535-47bb-0310-9956-ffa450edef68
2013-01-03 23:12:02 +00:00
Timothy A. Bish
7a7d55180e Add some defensive checks in cleanup method to avoid possible NPE
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1428632 13f79535-47bb-0310-9956-ffa450edef68
2013-01-03 22:06:43 +00:00
Timothy A. Bish
5ddc7d65c3 fix test case after changes in https://issues.apache.org/jira/browse/AMQ-4237 broke the test's MBean lookup
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1428578 13f79535-47bb-0310-9956-ffa450edef68
2013-01-03 20:37:04 +00:00
Timothy A. Bish
123a512370 fix test case after changes in https://issues.apache.org/jira/browse/AMQ-4237 broke the test's MBean lookup
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1428569 13f79535-47bb-0310-9956-ffa450edef68
2013-01-03 20:12:30 +00:00
Hiram R. Chirino
0aedae6b1d show test output in console for now.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1428551 13f79535-47bb-0310-9956-ffa450edef68
2013-01-03 18:58:11 +00:00
Hiram R. Chirino
9557e394e7 Make sure we set the activemqVersion system prop for the karaf itest
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1428550 13f79535-47bb-0310-9956-ffa450edef68
2013-01-03 18:56:25 +00:00
Hiram R. Chirino
8eb11a3aa7 Added a activemq-osgi module which is an uber OSGi bundle of all the ActiveMQ jars to make integrating into OSGi a little simpler.
Adding karaf-itests module.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1428537 13f79535-47bb-0310-9956-ffa450edef68
2013-01-03 18:37:45 +00:00
Hiram R. Chirino
8dbfbb0095 Make the activemq module just plain jars instead of bundles.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1428536 13f79535-47bb-0310-9956-ffa450edef68
2013-01-03 18:37:20 +00:00
Hiram R. Chirino
450b509d58 Add the slf4j-api as a dependency of the leveldb store.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1428535 13f79535-47bb-0310-9956-ffa450edef68
2013-01-03 18:37:04 +00:00
Timothy A. Bish
d0d7231414 fix test case after changes in https://issues.apache.org/jira/browse/AMQ-4237 broke the test's MBean lookup
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1428462 13f79535-47bb-0310-9956-ffa450edef68
2013-01-03 16:39:54 +00:00
Timothy A. Bish
4096f9109a fix test case after changes in https://issues.apache.org/jira/browse/AMQ-4237 broke the test's MBean lookup
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1428458 13f79535-47bb-0310-9956-ffa450edef68
2013-01-03 16:33:17 +00:00
Timothy A. Bish
1a57728305 fix test case after changes in https://issues.apache.org/jira/browse/AMQ-4237 broke the test's MBean lookup
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1428425 13f79535-47bb-0310-9956-ffa450edef68
2013-01-03 16:05:01 +00:00
Timothy A. Bish
a8da85f8a9 fix test case after changes in https://issues.apache.org/jira/browse/AMQ-4237 broke the test's MBean lookup
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1428422 13f79535-47bb-0310-9956-ffa450edef68
2013-01-03 16:03:15 +00:00
Timothy A. Bish
60d7cdc1dd fix test case after changes in https://issues.apache.org/jira/browse/AMQ-4237 broke the test's MBean lookup
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1428420 13f79535-47bb-0310-9956-ffa450edef68
2013-01-03 15:57:05 +00:00
Gary Tully
6335b7e331 fix up imports - resolve warn re permanently hidden defs
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1428409 13f79535-47bb-0310-9956-ffa450edef68
2013-01-03 15:41:43 +00:00
Gary Tully
69d8258308 fix up master advisory, advisories are only fired after broker is fully started so the nowMaster advisory needs to ocurr after start rather than as part of persistence adapter start, resolves org.apache.activemq.broker.ft.QueueMasterSlaveTestSupport#testAdvisory failures
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1428397 13f79535-47bb-0310-9956-ffa450edef68
2013-01-03 15:17:35 +00:00
Timothy A. Bish
157aaf9167 fix test case after changes in https://issues.apache.org/jira/browse/AMQ-4237 broker the tests queue MBean lookup
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1428093 13f79535-47bb-0310-9956-ffa450edef68
2013-01-02 22:34:44 +00:00
Timothy A. Bish
e06c23e22a fix and test for: https://issues.apache.org/jira/browse/AMQ-4225
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1428053 13f79535-47bb-0310-9956-ffa450edef68
2013-01-02 21:15:28 +00:00
Timothy A. Bish
e60087608e code fix and test fix for: https://issues.apache.org/jira/browse/AMQ-4225
AbortSlowConsumerStrategy was broken due to a malformed ObjectName being created when the strategy was registered on-demand. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1428051 13f79535-47bb-0310-9956-ffa450edef68
2013-01-02 21:09:36 +00:00
Timothy A. Bish
7a95e1809b fix test cases after changes in https://issues.apache.org/jira/browse/AMQ-4237 broker the tests queue MBean lookup
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1428029 13f79535-47bb-0310-9956-ffa450edef68
2013-01-02 20:59:18 +00:00
Timothy A. Bish
982943550f fix test cases after changes in https://issues.apache.org/jira/browse/AMQ-4237 broker the tests queue MBean lookup
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1427881 13f79535-47bb-0310-9956-ffa450edef68
2013-01-02 17:57:22 +00:00
Timothy A. Bish
19bf943dd7 fix test cases after changes in https://issues.apache.org/jira/browse/AMQ-4237 broker the tests queue MBean lookup
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1427878 13f79535-47bb-0310-9956-ffa450edef68
2013-01-02 17:45:19 +00:00
Hiram R. Chirino
64f3c55d80 Clean up some pom dependencies.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1427874 13f79535-47bb-0310-9956-ffa450edef68
2013-01-02 17:33:03 +00:00
Timothy A. Bish
2d84bbd992 fix test case after changes in https://issues.apache.org/jira/browse/AMQ-4237 broker the tests queue MBean lookup
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1427870 13f79535-47bb-0310-9956-ffa450edef68
2013-01-02 17:17:50 +00:00
Hiram R. Chirino
650d2b4d52 Add a profile to generate a dependency graph of the modules.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1427860 13f79535-47bb-0310-9956-ffa450edef68
2013-01-02 16:56:56 +00:00
Robert Davies
f0baf856d7 re-applied fix by dejanb
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1426121 13f79535-47bb-0310-9956-ffa450edef68
2012-12-27 05:10:13 +00:00
Bosanac Dejan
d0fb549f2c additional fix for VMTransportWaitForTest test failure
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1425958 13f79535-47bb-0310-9956-ffa450edef68
2012-12-26 15:47:01 +00:00
Bosanac Dejan
428a0631d3 fix for VMTransportWaitForTest test, prevent broker from being started twice
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1425904 13f79535-47bb-0310-9956-ffa450edef68
2012-12-26 13:36:59 +00:00
Robert Davies
4724913279 git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1425879 13f79535-47bb-0310-9956-ffa450edef68 2012-12-26 11:03:33 +00:00
Robert Davies
dfaa05d556 Fix for https://issues.apache.org/jira/browse/AMQ-4237
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1425878 13f79535-47bb-0310-9956-ffa450edef68
2012-12-26 11:02:34 +00:00
Robert Davies
26d70700b1 Fix for https://issues.apache.org/jira/browse/AMQ-4237
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1425877 13f79535-47bb-0310-9956-ffa450edef68
2012-12-26 11:00:58 +00:00
Robert Davies
cb7b657ce9 Fix for https://issues.apache.org/jira/browse/AMQ-4237
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1425875 13f79535-47bb-0310-9956-ffa450edef68
2012-12-26 10:58:30 +00:00
Robert Davies
c37859a80a Fix for https://issues.apache.org/jira/browse/AMQ-4237
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1425871 13f79535-47bb-0310-9956-ffa450edef68
2012-12-26 10:53:41 +00:00
Bosanac Dejan
1f8306b861 fix HealthViewMBeanTest failure when disk space is low
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1425740 13f79535-47bb-0310-9956-ffa450edef68
2012-12-25 12:03:27 +00:00
Bosanac Dejan
0c2b35d6ed fix RestTest failure due to default broker name
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1425736 13f79535-47bb-0310-9956-ffa450edef68
2012-12-25 10:53:45 +00:00
Timothy A. Bish
49f16ce0eb fix and test for: https://issues.apache.org/jira/browse/AMQ-4225
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1425162 13f79535-47bb-0310-9956-ffa450edef68
2012-12-21 22:05:48 +00:00
Gary Tully
bc45bf8065 https://issues.apache.org/jira/browse/AMQ-4234 https://issues.apache.org/jira/browse/AMQ-4235 - ensure prefetch set via consumer control gets interepreted by policy such that defaults can be overidden, tidy up default prefetch values choices for stomp so they can pick up broker overrides
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1424936 13f79535-47bb-0310-9956-ffa450edef68
2012-12-21 14:41:23 +00:00
Timothy A. Bish
0704edab2e https://issues.apache.org/jira/browse/AMQ-4180
Only force on nested Maps and Lists, otherwise we don't ever benefit from the UTF8Buffer.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1424703 13f79535-47bb-0310-9956-ffa450edef68
2012-12-20 21:02:09 +00:00
Bosanac Dejan
3a6bbfe51f https://issues.apache.org/jira/browse/AMQ-4180 - force unmarshaling for maps and lists
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1424587 13f79535-47bb-0310-9956-ffa450edef68
2012-12-20 16:53:33 +00:00