Commit Graph

46 Commits

Author SHA1 Message Date
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 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
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 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
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
Bosanac Dejan fb5a97276b fix mbean test failure - get values in the right order from the pending list
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1424435 13f79535-47bb-0310-9956-ffa450edef68
2012-12-20 12:44:59 +00:00
Robert Davies 87871346c2 Added additional health checks
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1424367 13f79535-47bb-0310-9956-ffa450edef68
2012-12-20 08:38:01 +00:00
Timothy A. Bish d21b32e748 Fix BrokerService no longer setting started flag back to false when stop finishes causing some tests to fail.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1424019 13f79535-47bb-0310-9956-ffa450edef68
2012-12-19 18:45:20 +00:00
Bosanac Dejan 7400977609 https://issues.apache.org/jira/browse/AMQ-4222 - remove region reference for all mutable producer exchanges (and some more refactorings)
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1423834 13f79535-47bb-0310-9956-ffa450edef68
2012-12-19 11:41:17 +00:00
Gary Tully 0f3ce45cff fix up test regression causing hang broker needs to be started and stopped for jdbc pa test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1423828 13f79535-47bb-0310-9956-ffa450edef68
2012-12-19 11:25:04 +00:00
Timothy A. Bish df2c7bdad4 remove now unused variable.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1423692 13f79535-47bb-0310-9956-ffa450edef68
2012-12-18 22:06:12 +00:00
Timothy A. Bish a4be10c146 fix for: https://issues.apache.org/jira/browse/AMQ-3757
fix for: https://issues.apache.org/jira/browse/AMQ-3707
fix for: https://issues.apache.org/jira/browse/AMQ-4024

Add a strategy class for use in constructing the Published connect string for a transport connector.  Allows for setting whether the connector will send IP addres, hostname or FQDN along with configurable transport query options which allows control of client side transport and wireformat settings. User can override with their own version to further customize. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1423655 13f79535-47bb-0310-9956-ffa450edef68
2012-12-18 21:15:07 +00:00
James Strachan 973909ab44 refactored mbean name and properties to more comply with https://github.com/hawtio/hawtio/blob/master/doc/HealthMBeans.md#health-mbeans and make it a little more descriptive for users
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1422953 13f79535-47bb-0310-9956-ffa450edef68
2012-12-17 14:42:44 +00:00
Gary Tully 95e6d6074f https://issues.apache.org/jira/browse/AMQ-4224 - have broker update zero prefetch on consumer so that it can issue a pull request as appropriate
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1422873 13f79535-47bb-0310-9956-ffa450edef68
2012-12-17 11:48:01 +00:00
Christian Posta e07d29c962 Fix for https://issues.apache.org/jira/browse/AMQ-4222
ProducerBrokerExchange holds reference to "region" destination after message has been sent

Can cause leak with temp dests

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1421994 13f79535-47bb-0310-9956-ffa450edef68
2012-12-14 17:42:45 +00:00
Timothy A. Bish f21992ef41 apply fix for: https://issues.apache.org/jira/browse/AMQ-4068
Updated patch for new layout and fixed size returned to only include the dynamic journal size and not the total disk usage since that accounts for the full log file size and not just the used portion. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1421557 13f79535-47bb-0310-9956-ffa450edef68
2012-12-13 21:43:50 +00:00
Timothy A. Bish 05fb2bbcc9 Add warning about long destination names and mKahaDB for:
https://issues.apache.org/jira/browse/AMQ-4183 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1420778 13f79535-47bb-0310-9956-ffa450edef68
2012-12-12 15:41:03 +00:00
James Strachan 1797ce98e3 made minor update to the StatusView mbean to comply with these health mbean conventions https://github.com/hawtio/hawtio/blob/master/doc/HealthMBeans.md#health-mbeans
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1420092 13f79535-47bb-0310-9956-ffa450edef68
2012-12-11 10:56:19 +00:00
Hiram R. Chirino 32e63dce28 Fixes AMQ-4215: Simplify PList interface and provide a LevelDB store implementation.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1418686 13f79535-47bb-0310-9956-ffa450edef68
2012-12-08 15:21:14 +00:00
Christian Posta 96f29456e9 Fix for https://issues.apache.org/jira/browse/AMQ-4190 - Figure out what was intended with transactions and producer flow control for topics
Fix the counter so the logging happens

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1418378 13f79535-47bb-0310-9956-ffa450edef68
2012-12-07 16:19:08 +00:00
Christian Posta 25d396b589 Fix for:
https://issues.apache.org/jira/browse/AMQ-4209 - NetworkConnector and NetworkBridgeConfiguration have same named private variables for excludedDestination
https://issues.apache.org/jira/browse/AMQ-4210 -DynamicallyIncludedDestinations is not enforced for the other end of duplex bridge

excludedDestinations
dynamicallyIncludedDestinations
staticallyIncludedDestinations
Updated some tests: request-reply with temp dest is not supported with dynamicallyAddedDestinations ATM

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1418373 13f79535-47bb-0310-9956-ffa450edef68
2012-12-07 16:13:49 +00:00
Bosanac Dejan 75f8f6970b https://issues.apache.org/jira/browse/AMQ-4181 - don't let queue refs go negative
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1417333 13f79535-47bb-0310-9956-ffa450edef68
2012-12-05 09:37:33 +00:00
Bosanac Dejan 5bfbc542b1 https://issues.apache.org/jira/browse/AMQ-4181 - remove the browser imidiatelly when finished
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1417331 13f79535-47bb-0310-9956-ffa450edef68
2012-12-05 09:37:16 +00:00
Bosanac Dejan db1e6d1cb7 https://issues.apache.org/jira/browse/AMQ-3935 - always page in messages when browsing
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1417328 13f79535-47bb-0310-9956-ffa450edef68
2012-12-05 09:28:48 +00:00
Gary Tully c6cf88b836 https://issues.apache.org/jira/browse/AMQ-3894 - remove requirement for destination property enforced by spring - for a default entry there is no need for a destination - fix dependants
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1415661 13f79535-47bb-0310-9956-ffa450edef68
2012-11-30 14:48:08 +00:00
Christian Posta 915d66dec5 https://issues.apache.org/jira/browse/AMQ-4198 Include username in ConnectionInfo for ActiveMQ.Advisory.Connection messages
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1415631 13f79535-47bb-0310-9956-ffa450edef68
2012-11-30 13:42:48 +00:00
James Strachan 3cf129a79f added a more jolokia friendly statusList() method which returns nicer JSON for the status query
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1415594 13f79535-47bb-0310-9956-ffa450edef68
2012-11-30 12:21:21 +00:00
Gary Tully 27440aefc2 https://issues.apache.org/jira/browse/AMQ-4196 - fix order of removedest and removesubscription commands in network bridge async advisory processing - https://issues.apache.org/jira/browse/AMQ-3038 revisit - temp dest should not be deleted client side before close b/c open consumers will not get advisories due to no destination - just clearing the map is sufficient; the broker will deal with removal of the temp dest as part of the removeInfo
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1415406 13f79535-47bb-0310-9956-ffa450edef68
2012-11-29 22:05:45 +00:00
Bosanac Dejan ed96e2ec08 https://issues.apache.org/jira/browse/AMQ-4191 - prototype of the Status MBean
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1415159 13f79535-47bb-0310-9956-ffa450edef68
2012-11-29 13:28:37 +00:00
Hiram R. Chirino 30f531d741 Changes for https://issues.apache.org/jira/browse/AMQ-4165 : Remove pure master/slave functionality
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1413846 13f79535-47bb-0310-9956-ffa450edef68
2012-11-26 21:13:25 +00:00
Bosanac Dejan 915333e1d5 https://issues.apache.org/jira/browse/AMQ-4181 - jms queue browsing
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1411632 13f79535-47bb-0310-9956-ffa450edef68
2012-11-20 11:59:46 +00:00
Robert Davies a713e6a7d0 Fix for https://issues.apache.org/jira/browse/AMQ-4177
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1410767 13f79535-47bb-0310-9956-ffa450edef68
2012-11-17 19:52:22 +00:00
Timothy A. Bish 21b2f84399 fix for breakage caused by earlier fix to: https://issues.apache.org/jira/browse/AMQ-4062
Only reconfigure when keepDurableSubsActive=false

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1409489 13f79535-47bb-0310-9956-ffa450edef68
2012-11-14 22:43:15 +00:00
Timothy A. Bish dd0b16d38b apply patch: https://issues.apache.org/jira/browse/AMQ-4160
Additional fixes and test updates.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1409045 13f79535-47bb-0310-9956-ffa450edef68
2012-11-14 00:46:27 +00:00
Robert Davies 39ff4d9fd8 Fix for https://issues.apache.org/jira/browse/AMQ-4165 - remove pure master/slave functionality
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1408651 13f79535-47bb-0310-9956-ffa450edef68
2012-11-13 09:31:37 +00:00
Timothy A. Bish 7f346a8b79 fixes for: https://issues.apache.org/jira/browse/AMQ-4160
Fixed the code to properly handle the active events adds and remove. 
Disable one of the test cases because the fixed code now invalidates that test case. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1408415 13f79535-47bb-0310-9956-ffa450edef68
2012-11-12 19:39:14 +00:00
Gary Tully fdd0534fcb https://issues.apache.org/jira/browse/AMQ-4166 - fix processing of expired - stack-trace-1.txt was in error, expiry check should not have used the oneshot broker check, just checing the messages state is required
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1407640 13f79535-47bb-0310-9956-ffa450edef68
2012-11-09 21:13:57 +00:00
Hiram R. Chirino a68916dcc5 Fixes AMQ-4167 and AMQ-4168, also changes the MQTT tests to use dynamic ports to avoid port conflicts. Fixes SSL tests.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1407497 13f79535-47bb-0310-9956-ffa450edef68
2012-11-09 15:42:41 +00:00
Hiram R. Chirino 60646c955b Moved the amp-store related command to the activemq-amqp-store module. Hand to introduce dynamic Command discovery to get this working and remove the compile time dependency on activemq-spring from the activemq-console module.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1407178 13f79535-47bb-0310-9956-ffa450edef68
2012-11-08 17:35:58 +00:00
Hiram R. Chirino 5f9b11cd95 Move the JAXP XPath evaluator to the broker package.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1407176 13f79535-47bb-0310-9956-ffa450edef68
2012-11-08 17:34:46 +00:00
Hiram R. Chirino 7c9fec6e25 Removed all un-needed dependencies from the activemq-broker pom. Moved the remaining spring support classes into activemq-spring.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1406852 13f79535-47bb-0310-9956-ffa450edef68
2012-11-07 22:53:41 +00:00
Hiram R. Chirino 2c8225821c Clean up activemq-client pom, removed un-needed dependencies and plugins. Move XPath evaluator to the broker.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1406814 13f79535-47bb-0310-9956-ffa450edef68
2012-11-07 21:22:30 +00:00
Hiram R. Chirino bfbe90b399 rename the activemq-leveldb module to activemq-leveldb-store to be consistent with other store modules. Move more spring/xbean support bits into the activemq-spring module.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1406726 13f79535-47bb-0310-9956-ffa450edef68
2012-11-07 17:26:31 +00:00
Hiram R. Chirino c5cf03806d Refactored out the remaining plugins in the activemq-core module into their own modules.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1406686 13f79535-47bb-0310-9956-ffa450edef68
2012-11-07 16:00:07 +00:00
Hiram R. Chirino 58aca86981 Refactor all the core broker classes from the activemq-core module into the activemq-broker module.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1406629 13f79535-47bb-0310-9956-ffa450edef68
2012-11-07 13:37:50 +00:00