Commit Graph

289 Commits

Author SHA1 Message Date
Timothy A. Bish ba37cbb1de Fix for: https://issues.apache.org/jira/browse/AMQ-4571
test case for AMQ-4356 validates this

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1489471 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 15:27:18 +00:00
Timothy A. Bish 37ede54486 some fixes for: https://issues.apache.org/jira/browse/AMQ-4487
Allow the maxProducersToAudit value to be set of Queue and QueueBrowser subscriptions which can help to workaround OOM errors on QueueBrowsers when there are more than the max number of producers audited.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1489180 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 21:12:44 +00:00
Hiram R. Chirino ec9975c36e Additional fixes related to AMQ-4563: You can now configure the storeOpenWireVersion property of a broker to control which version of openwire is used by the persistence stores. This needs to be set to version 10 to preserve the original AMQP message ids.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1488375 13f79535-47bb-0310-9956-ffa450edef68
2013-05-31 19:56:03 +00:00
Timothy A. Bish a3060d0c7d fixes for: https://issues.apache.org/jira/browse/AMQ-4555
Only create update thread on demand. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1486074 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 14:27:08 +00:00
Timothy A. Bish 02a58c2a34 fixes for: https://issues.apache.org/jira/browse/AMQ-4555
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1486063 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 14:10:23 +00:00
Bosanac Dejan 620523a597 https://issues.apache.org/jira/browse/AMQ-4000 - initial implementation of keeping track of durable subscribers over network and unregister them appropriately
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1483827 13f79535-47bb-0310-9956-ffa450edef68
2013-05-17 14:27:48 +00:00
Gary Tully 3ded22df3d https://issues.apache.org/jira/browse/AMQ-4540 - wait for a max of 30 seconds for pending forwards to complete
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1483605 13f79535-47bb-0310-9956-ffa450edef68
2013-05-16 23:32:31 +00:00
Gary Tully 6f124c16f7 https://issues.apache.org/jira/browse/AMQ-4539 - add JMSActiveMQBrokerPath string property and brokerPath attribute via jmx message view, the list length is the current number of network hops
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1483600 13f79535-47bb-0310-9956-ffa450edef68
2013-05-16 23:03:17 +00:00
Timothy A. Bish f46b184f6c fix and test for: https://issues.apache.org/jira/browse/AMQ-4413
For durable subscriptions the PrefetchSubscription can't drop messages in dispatchPending otherwise they are never added back into the pending cursor. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1483111 13f79535-47bb-0310-9956-ffa450edef68
2013-05-15 22:22:39 +00:00
Hiram R. Chirino 5a192e790d Adding a Promise class that can allow us to use callbacks to get future computation results.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1482954 13f79535-47bb-0310-9956-ffa450edef68
2013-05-15 16:59:50 +00:00
Hiram R. Chirino c5788d24bc Reduce the amount of work done while the sendLock is acquired.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1482805 13f79535-47bb-0310-9956-ffa450edef68
2013-05-15 13:11:07 +00:00
Hiram R. Chirino 548c19496c reduce the number of times the sendSyncs map is accessed.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1482800 13f79535-47bb-0310-9956-ffa450edef68
2013-05-15 13:02:27 +00:00
Hiram R. Chirino 0deda2501d Fixing regression in last commit.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1482794 13f79535-47bb-0310-9956-ffa450edef68
2013-05-15 12:44:13 +00:00
Bosanac Dejan e06685fe81 https://issues.apache.org/jira/browse/AMQ-4000 - as part of this feature we need to properly send advisories when durable sub unregisters
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1482790 13f79535-47bb-0310-9956-ffa450edef68
2013-05-15 12:31:09 +00:00
Hiram R. Chirino 8461158178 Fixes AMQ-4535: Activemq configured with leveldb commit fail when accessed by PutGet from IBM Perf Harness
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1482789 13f79535-47bb-0310-9956-ffa450edef68
2013-05-15 12:30:45 +00:00
Gary Tully 58b9a83fe8 https://issues.apache.org/jira/browse/AMQ-4532 - fix and test - ensure disposed exception is propagated to clients on vm server shutdown
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1482117 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 21:43:39 +00:00
Timothy A. Bish 2bd0e5703e apply fix and patch for: https://issues.apache.org/jira/browse/AMQ-4530
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1481930 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 15:36:03 +00:00
Timothy A. Bish b820ac2bf9 fix for: https://issues.apache.org/jira/browse/AMQ-4512
Usage and MemoryUsage sync fixes to keep state consistent during thread contention.  Test case added.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1481106 13f79535-47bb-0310-9956-ffa450edef68
2013-05-10 17:13:48 +00:00
Timothy A. Bish 540b1c6a89 fix for: https://issues.apache.org/jira/browse/AMQ-4518
Allow purge to disable message expiration check when paging in Messages to be purged.  Avoids attempts at sending messages to a DLQ during a purge operation and in firing advisory messages for expired messages which are being thrown out by request. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1480731 13f79535-47bb-0310-9956-ffa450edef68
2013-05-09 17:50:26 +00:00
Hiram R. Chirino 4a16c1ff27 Implements AMQ-4526: ActiveMQ should automatically restart if a Locker looses it's lock.
* Adds a new broker config option 'restartAllowed'.  Set it to false to revert to the preserve behavior.
* Adds a new 'restart' JMX operation on the broker
* The default IO exception handler will trigger a broker restart instead of a broker stop.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1480325 13f79535-47bb-0310-9956-ffa450edef68
2013-05-08 15:34:00 +00:00
Bosanac Dejan fc8c8d339e https://issues.apache.org/jira/browse/AMQ-4522 - set timeToLive when sending a message using JMX
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1480189 13f79535-47bb-0310-9956-ffa450edef68
2013-05-08 09:15:17 +00:00
Timothy A. Bish ff9b80040b fix for: https://issues.apache.org/jira/browse/AMQ-4520
Load BouncyCastle if present in lib dir.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1480117 13f79535-47bb-0310-9956-ffa450edef68
2013-05-07 22:08:28 +00:00
Timothy A. Bish 0bb9013769 Fix for: https://issues.apache.org/jira/browse/AMQ-4517
Don't send MessageDLQd advisory for Message that aren't sent to a DLQ

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1480087 13f79535-47bb-0310-9956-ffa450edef68
2013-05-07 21:17:34 +00:00
Timothy A. Bish d7aaca5034 Fix and test for: https://issues.apache.org/jira/browse/AMQ-4513
Makes the locking in RegionBroker a bit more fine grained.  We hold a lock only for a short time and allow destination adds that aren't on the same destination to continue on concurrently.  

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1479963 13f79535-47bb-0310-9956-ffa450edef68
2013-05-07 16:13:18 +00:00
Christian Posta 866440dfb2 Fix for https://issues.apache.org/jira/browse/AMQ-4516 - Don't decrement topic enqueues when messages are expired
Removed the call to decrement the counters, and added unit test

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1479925 13f79535-47bb-0310-9956-ffa450edef68
2013-05-07 14:39:25 +00:00
Timothy A. Bish 3a8eb74a9f Fix and test for: https://issues.apache.org/jira/browse/AMQ-4505
When a broker was stopping it was sending out a cluster update after tearing down its bridges so any client connected to it would lose its awareness of other brokers in the cluster. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1478835 13f79535-47bb-0310-9956-ffa450edef68
2013-05-03 15:21:25 +00:00
Bosanac Dejan 7450a32ae7 https://issues.apache.org/jira/browse/AMQ-4495 - always get a max batch of messages from the store
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1478823 13f79535-47bb-0310-9956-ffa450edef68
2013-05-03 14:50:56 +00:00
Gary Tully 4742c7d86f https://issues.apache.org/jira/browse/AMQ-4504 - ensure all dests in a composite get a chance to dispatch to a consumer after an ack
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1478183 13f79535-47bb-0310-9956-ffa450edef68
2013-05-01 20:49:08 +00:00
Bosanac Dejan 5cbb4bfc12 https://issues.apache.org/jira/browse/AMQ-4467 - cursor memory usage when pfc is off
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1477574 13f79535-47bb-0310-9956-ffa450edef68
2013-04-30 11:44:03 +00:00
Timothy A. Bish 3039b67cb2 fix for: https://issues.apache.org/jira/browse/AMQ-4351
Ensure the destination statistics are updated on durable sub deactivate. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1476433 13f79535-47bb-0310-9956-ffa450edef68
2013-04-26 22:51:50 +00:00
Gary Tully 66e8011e9e https://issues.apache.org/jira/browse/AMQ-4485 - ensure cursor updates in same order as store orderindex via beforeCompletion with index lock. The before completion tracks ordered work that first thread completes as a unit. All updates to a destination are combined to a single sync, such that there is no cursor contention between transactions
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1475734 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 12:47:20 +00:00
Bosanac Dejan e1f170da6e https://issues.apache.org/jira/browse/AMQ-4483 - improve dlq managment
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1471420 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 14:01:16 +00:00
Timothy A. Bish 7e53814928 Fix and test for: https://issues.apache.org/jira/browse/AMQ-4475
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1469013 13f79535-47bb-0310-9956-ffa450edef68
2013-04-17 18:07:24 +00:00
Bosanac Dejan 15affd0755 https://issues.apache.org/jira/browse/AMQ-3706 - improve rebalance distribution which is more apparent when only two brokers are involved
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1467241 13f79535-47bb-0310-9956-ffa450edef68
2013-04-12 11:52:15 +00:00
Timothy A. Bish 0054941a53 fix and test for: https://issues.apache.org/jira/browse/AMQ-4356
The actual Durable subscription wasn't getting removed from the Store so on restart they were recovered.  

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1464729 13f79535-47bb-0310-9956-ffa450edef68
2013-04-04 20:30:00 +00:00
Timothy A. Bish b52c371cd9 fix for: https://issues.apache.org/jira/browse/AMQ-4364
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1462210 13f79535-47bb-0310-9956-ffa450edef68
2013-03-28 16:36:57 +00:00
Gary Tully 78bedd605a https://issues.apache.org/jira/browse/AMQ-4408 - fix and test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1461362 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 22:56:16 +00:00
Bosanac Dejan 9c909b5975 https://issues.apache.org/jira/browse/AMQ-4406 - remoce command agent
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1461133 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 13:58:26 +00:00
Bosanac Dejan 2f469c1744 https://issues.apache.org/jira/browse/AMQ-3883 - refactoring to make authoriation module with arbitrary group class configuration easier
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1460766 13f79535-47bb-0310-9956-ffa450edef68
2013-03-25 17:08:58 +00:00
Bosanac Dejan 9027d49516 https://issues.apache.org/jira/browse/AMQ-3883 - allow arbitrary group principal class to be used by authorization map
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1459834 13f79535-47bb-0310-9956-ffa450edef68
2013-03-22 15:08:51 +00:00
Gary Tully 27c424ca19 https://issues.apache.org/jira/browse/AMQ-4369 - ensure default handler in place before transport connectors are started
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1455944 13f79535-47bb-0310-9956-ffa450edef68
2013-03-13 14:02:38 +00:00
Hiram R. Chirino 846cf7df3f Added at test case and fix for AMQ-4351.
Avoids deadlock by not holding on to the pending and dispatch locks when we try to detach a durable sub from a topic.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1455290 13f79535-47bb-0310-9956-ffa450edef68
2013-03-11 19:18:23 +00:00
Gary Tully fc15f130d1 https://issues.apache.org/jira/browse/AMQ-4362 - Broker-based redelivery plugin - support for maximumRedeliveries="-1"
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1454330 13f79535-47bb-0310-9956-ffa450edef68
2013-03-08 11:43:46 +00:00
Gary Tully ef1d254e34 AMQ-4122 - add log warning if lease will expire due to mal configuration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1450213 13f79535-47bb-0310-9956-ffa450edef68
2013-02-26 15:25:47 +00:00
Timothy A. Bish 8b3761c575 fix for: https://issues.apache.org/jira/browse/AMQ-4319
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1449797 13f79535-47bb-0310-9956-ffa450edef68
2013-02-25 18:24:20 +00:00
Timothy A. Bish d75e418c3d https://issues.apache.org/jira/browse/AMQ-4330
Merge back the isSlave() JMS API. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1449077 13f79535-47bb-0310-9956-ffa450edef68
2013-02-22 15:32:26 +00:00
Gary Tully 806ec21eb6 https://issues.apache.org/jira/browse/AMQ-4328 - AMQ3274Test, org.apache.activemq.usecases.NetworkBridgeProducerFlowControlTest - sync needs to be conditional
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1448809 13f79535-47bb-0310-9956-ffa450edef68
2013-02-21 21:26:17 +00:00
Gary Tully 56cfa302cf need a different fix for https://issues.apache.org/jira/browse/AMQ-4328 - AMQ3274Test failure, conflicts with org.apache.activemq.usecases.NetworkBridgeProducerFlowControlTest
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1448798 13f79535-47bb-0310-9956-ffa450edef68
2013-02-21 20:54:23 +00:00
Gary Tully def8c77c07 Revert "Fix for https://issues.apache.org/jira/browse/AMQ-4000 Durable subscription not getting unregistered on networked broker, thanks torsten for the unit test!"
added DurableSubInBrokerNetworkTest to broken test profile till we get this resolved.

This reverts commit b7c32d924a.

Conflicts:
	activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubInBrokerNetworkTest.java

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1448161 13f79535-47bb-0310-9956-ffa450edef68
2013-02-20 13:33:36 +00:00
Gary Tully f4bed15738 https://issues.apache.org/jira/browse/AMQ-4328 - regression in AMQ3274Test, need to sync demand sub creation on async vm transport
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1447715 13f79535-47bb-0310-9956-ffa450edef68
2013-02-19 13:33:20 +00:00
Gary Tully f08a178c1d https://issues.apache.org/jira/browse/AMQ-4328 - fix and test. With a large backlog the flow can block when the vm transport is sync b/c the async requests can overlap with acks
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1447323 13f79535-47bb-0310-9956-ffa450edef68
2013-02-18 15:27:26 +00:00
Christian Posta b7c32d924a Fix for https://issues.apache.org/jira/browse/AMQ-4000 Durable subscription not getting unregistered on networked broker, thanks torsten for the unit test!
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1446447 13f79535-47bb-0310-9956-ffa450edef68
2013-02-15 05:22:08 +00:00
Hiram R. Chirino ecd5c2f738 Fixes AMQ-4320: Destinations are not auto created when using Composite Destination configured on the broker
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1446300 13f79535-47bb-0310-9956-ffa450edef68
2013-02-14 18:57:28 +00:00
Christian Posta f406e86b8a https://issues.apache.org/jira/browse/AMQ-4303 Health status MBean - Feeling ill, hard to read "ill" in jconsole... changed to "getting worried"
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1445476 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 05:45:43 +00:00
Gary Tully 56174e770d [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1443026 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 15:45:26 +00:00
Gary Tully 5e257808f3 [maven-release-plugin] prepare release activemq-5.8.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1443024 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 15:43:41 +00:00
Gary Tully fc519e186a fix up missing license files - our rat check friend
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1442984 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 14:27:03 +00:00
Gary Tully 88d85ae552 https://issues.apache.org/jira/browse/AMQ-3331 - fix regression in BrokerNetworkWithStuckMessagesTest - vm connector exposed some turnips in there w.r.t the response correlator
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1442613 13f79535-47bb-0310-9956-ffa450edef68
2013-02-05 14:48:31 +00:00
Gary Tully a34970a959 remove dup call to startRemote
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1442144 13f79535-47bb-0310-9956-ffa450edef68
2013-02-04 14:57:23 +00:00
Gary Tully c372448471 https://issues.apache.org/jira/browse/AMQ-4082 - fix regression with org.apache.activemq.usecases.NetworkOfTwentyBrokersTest nd org.apache.activemq.usecases.RequestReplyNoAdvisoryNetworkTest - statically included dests in duplex case being ignored and unregister without register
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1442122 13f79535-47bb-0310-9956-ffa450edef68
2013-02-04 14:06:06 +00:00
Gary Tully f383ca1de4 https://issues.apache.org/jira/browse/AMQ-3331 - make bridge alwaysSyncSend=true the default
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1441545 13f79535-47bb-0310-9956-ffa450edef68
2013-02-01 17:21:59 +00:00
Timothy A. Bish 972176ea33 Add a fix for: https://issues.apache.org/jira/browse/AMQ-4147
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1441240 13f79535-47bb-0310-9956-ffa450edef68
2013-01-31 22:47:25 +00:00
Gary Tully 7e87cf2685 https://issues.apache.org/jira/browse/AMQ-4285 - tidied up test to be tolerant of pitfalls of request/reply with temps over a network
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1440988 13f79535-47bb-0310-9956-ffa450edef68
2013-01-31 14:41:35 +00:00
Timothy A. Bish f1eb92eaac apply patch for: https://issues.apache.org/jira/browse/AMQ-4082
Reduces async work that's don't during network bridge startup. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1440531 13f79535-47bb-0310-9956-ffa450edef68
2013-01-30 17:15:05 +00:00
Gary Tully 30a9fe104d https://issues.apache.org/jira/browse/AMQ-4283 - fix and test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1440415 13f79535-47bb-0310-9956-ffa450edef68
2013-01-30 13:49:55 +00:00
Timothy A. Bish a5dd237a60 Wrap a couple of heavier LOG calls in quick tests for enabled.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1440225 13f79535-47bb-0310-9956-ffa450edef68
2013-01-30 00:19:45 +00:00
Timothy A. Bish 5fc2535edf Some additional code cleanup, doc fixes, etc.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1440181 13f79535-47bb-0310-9956-ffa450edef68
2013-01-29 22:14:10 +00:00
Timothy A. Bish e35c39bbcf remove unused imports and add override annotations. Fix some spelling in the comments.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1440116 13f79535-47bb-0310-9956-ffa450edef68
2013-01-29 20:46:49 +00:00
Timothy A. Bish 99c2b2e2d2 fix for: https://issues.apache.org/jira/browse/AMQ-4282
Make sure that we don't allow advisory destinations to be marked as sync dispatch. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1440018 13f79535-47bb-0310-9956-ffa450edef68
2013-01-29 17:36:26 +00:00
Gary Tully bf787569d2 https://issues.apache.org/jira/browse/AMQ-4276 - remove sub from conduit lis immediatly or weget duplicate remove avents as shown by org.apache.activemq.usecases.TwoBrokerQueueSendReceiveTest
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1439870 13f79535-47bb-0310-9956-ffa450edef68
2013-01-29 12:50:15 +00:00
Timothy A. Bish a55aae00e7 Scrub the pom files and remove old cruft and leftovers from the recent refactoring
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1439680 13f79535-47bb-0310-9956-ffa450edef68
2013-01-28 22:44:25 +00:00
Christian Posta 0bfa0cdf1a Fix for https://issues.apache.org/jira/browse/AMQ-4272 updated queueConsumers.jsp to only allow the link to connection page for connections directly to the broker, but go to network.jsp for bridge consumers
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1439193 13f79535-47bb-0310-9956-ffa450edef68
2013-01-27 21:44:55 +00:00
Gary Tully 8012f28511 https://issues.apache.org/jira/browse/AMQ-4276 - deal with destnotexist for temps. support alwaysSyncSend for duplex. improve reporting of failures. additional test.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1438734 13f79535-47bb-0310-9956-ffa450edef68
2013-01-25 21:47:17 +00:00
Timothy A. Bish c5184983cf apply fix and updated test for: https://issues.apache.org/jira/browse/AMQ-4148
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1438123 13f79535-47bb-0310-9956-ffa450edef68
2013-01-24 18:39:09 +00:00
Bosanac Dejan 61cbe46fc6 https://issues.apache.org/jira/browse/AMQ-4271 - virtualSelectorCacheBrokerPlugin support for consumers with no selectors
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1438032 13f79535-47bb-0310-9956-ffa450edef68
2013-01-24 14:54:49 +00:00
Timothy A. Bish 5d4d7487e4 Add some methods for creating destination queries
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1434926 13f79535-47bb-0310-9956-ffa450edef68
2013-01-17 21:43:10 +00:00
Gary Tully 1cd3bd8d95 add license header
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1434909 13f79535-47bb-0310-9956-ffa450edef68
2013-01-17 20:42:46 +00:00
Gary Tully aa1310c70c add PersistenceAdapterView
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1434906 13f79535-47bb-0310-9956-ffa450edef68
2013-01-17 20:41:40 +00:00
Gary Tully 3bffaf7e4c rudimentary generic persistence adapter mbean view - help show data and transaction info - usefull when blocked on usage
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1434903 13f79535-47bb-0310-9956-ffa450edef68
2013-01-17 20:40:23 +00:00
Timothy A. Bish 1898869fbc apply patch for: https://issues.apache.org/jira/browse/AMQ-4121
Allows for more user customization of MemoryUsage if desired.  

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1434849 13f79535-47bb-0310-9956-ffa450edef68
2013-01-17 18:27:51 +00:00
Timothy A. Bish 1958aeb069 https://issues.apache.org/jira/browse/AMQ-4248
Don't swallow the exception.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1432963 13f79535-47bb-0310-9956-ffa450edef68
2013-01-14 15:57:05 +00:00
Timothy A. Bish ae61847d02 https://issues.apache.org/jira/browse/AMQ-4248
Add expanded transmit callback interface so that a failure to transmit can be distinguished from normal operation and allow for no further attempts at dispatch fixing the current NPE when async dispatch is enabled. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1432487 13f79535-47bb-0310-9956-ffa450edef68
2013-01-12 18:13:27 +00:00
Timothy A. Bish 5b5bc45b17 fix for: https://issues.apache.org/jira/browse/AMQ-4238
ensure we clean up when the ManagementContext gets shut down. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1432112 13f79535-47bb-0310-9956-ffa450edef68
2013-01-11 15:56:08 +00:00
Gary Tully 109cbe0993 https://issues.apache.org/jira/browse/AMQ-4248 - ensure iter is cleared when we are done, i.e. on call to release
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1431660 13f79535-47bb-0310-9956-ffa450edef68
2013-01-10 21:27:47 +00:00
Gary Tully 7d7d6fa08a fix typo in utility class name
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1431374 13f79535-47bb-0310-9956-ffa450edef68
2013-01-10 14:15:15 +00:00
Gary Tully aaa81deb40 https://issues.apache.org/jira/browse/AMQ-3438 - keep both mbean names, by remoteaddress and by clientid - as navigation between subs and connections uses the clientid but remote connection info based on address has real value to opts. https://issues.apache.org/jira/browse/AMQ-4237 - partition both address types using connectionViewType=remoteAddress|clientId and add clientId to connetionView - now easier to see connections under a clientConnector
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1431369 13f79535-47bb-0310-9956-ffa450edef68
2013-01-10 14:04:40 +00:00
Gary Tully 99682093d9 https://issues.apache.org/jira/browse/AMQ-3438 - update so we only register a conneciton mbean once, default by remote address or by client id - ManagementContext#allowRemoteAddressInMBeanNames=false (once connectionInfo is received)
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1431319 13f79535-47bb-0310-9956-ffa450edef68
2013-01-10 12:33:56 +00:00
Timothy A. Bish 63a660ac04 https://issues.apache.org/jira/browse/AMQ-4237
To support the bean renaming effort this pulls together the various code that create all our MBean names and puts them into one location which could later add supporting methods to create MBean queries for the unit tests etc.  This should make it simpler to iron out the naming as we go.  

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1430908 13f79535-47bb-0310-9956-ffa450edef68
2013-01-09 15:48:15 +00:00
Timothy A. Bish 9a3bd32e90 clean up imports.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1430340 13f79535-47bb-0310-9956-ffa450edef68
2013-01-08 15:51:37 +00:00
Gary Tully e3626e19bc https://issues.apache.org/jira/browse/AMQ-4237 - resolve unit test regressions for dynamic networkBridge mbeans
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1430266 13f79535-47bb-0310-9956-ffa450edef68
2013-01-08 13:13:27 +00:00
Timothy A. Bish 3cd8da80a6 fixes: https://issues.apache.org/jira/browse/AMQ-4246
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1429878 13f79535-47bb-0310-9956-ffa450edef68
2013-01-07 16:19:35 +00:00
Timothy A. Bish b5625e31ee Add in a log4j properties file for the tests
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1429141 13f79535-47bb-0310-9956-ffa450edef68
2013-01-04 21:40:32 +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
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