Commit Graph

1305 Commits

Author SHA1 Message Date
Robert Davies 6ddeac7bc0 check we are not a slaveBroker() when dispatching
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491431 13f79535-47bb-0310-9956-ffa450edef68
2006-12-31 15:35:38 +00:00
Hiram R. Chirino 7695676339 Fix for CursorDurableTest.
The TopicStorePrefetch was iterating items that were in the subscription but not added to the pending list.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491346 13f79535-47bb-0310-9956-ffa450edef68
2006-12-30 23:49:03 +00:00
Robert Davies 2a682e2fb2 Applied patch from: https://issues.apache.org/activemq/browse/AMQ-961
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491185 13f79535-47bb-0310-9956-ffa450edef68
2006-12-30 07:27:06 +00:00
Robert Davies 7351c4bd0d clear batch entry if no more messages in the container
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491184 13f79535-47bb-0310-9956-ffa450edef68
2006-12-30 07:25:03 +00:00
Robert Davies fe3f492321 fixed class cast exception
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491128 13f79535-47bb-0310-9956-ffa450edef68
2006-12-29 23:01:39 +00:00
Robert Davies 71e44ce436 put back using kaha as persistent adaptor
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491093 13f79535-47bb-0310-9956-ffa450edef68
2006-12-29 20:27:00 +00:00
Robert Davies 3d0191e29e clear batch entry if no more messages in the container
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491092 13f79535-47bb-0310-9956-ffa450edef68
2006-12-29 20:25:58 +00:00
Robert Davies 8bc7f8636c clear batch entry if no more messages in the container
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491090 13f79535-47bb-0310-9956-ffa450edef68
2006-12-29 20:24:11 +00:00
Robert Davies cd687e389c clear last batch id if no more messages left to dispatch to a durable subscriber
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491089 13f79535-47bb-0310-9956-ffa450edef68
2006-12-29 20:21:10 +00:00
Robert Davies 8b0f88a257 put the synchronization back for now
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491088 13f79535-47bb-0310-9956-ffa450edef68
2006-12-29 20:19:25 +00:00
Robert Davies d7a9feb0a6 Fix for http://issues.apache.org/activemq/browse/AMQ-1113
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490967 13f79535-47bb-0310-9956-ffa450edef68
2006-12-29 09:28:01 +00:00
Robert Davies d2e606208d Use the store based cursor by default for Queues - which will enable very large queue support
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490814 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 21:03:53 +00:00
Robert Davies 6964747912 updated recoverNextMessages()
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490813 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 21:02:44 +00:00
Robert Davies a70f96bd37 set the basedir property - so can be run from inside eclipse
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490808 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 21:01:21 +00:00
Robert Davies 63d78acccc tidy up the tests
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490807 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 21:00:36 +00:00
Robert Davies 81920f61cc setPersistent() call has no affect when using XBeanBrokerFactory - start is already called
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490805 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 21:00:05 +00:00
Robert Davies 17f8a7ebcc use memory based persistence for this test
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490804 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 20:58:36 +00:00
Robert Davies 710e2fd8eb exclude TwoBrokerMulitcastQueueTest for now
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490802 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 20:58:00 +00:00
Robert Davies 5b33fefd41 persistent not used - but needs to be set in config - as only has affect before
start is called on the broker (which happens automatically via afterPropertiesSet())

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490800 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 20:57:17 +00:00
Robert Davies 974ec34df5 add a little more stress to the testManyProducersManyConsumers() test
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490798 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 20:55:56 +00:00
Robert Davies e5efc58cd4 Added support for hasMessagesToDeliver() method
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490796 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 20:52:41 +00:00
Robert Davies 4a16f4527a Transactions, when recovered, need to be recovered in prepare order:
a)  order determined by an unsorted map iterator might confuse people
b) brokerSequence can get out of step for messages recovered then committed - e.g. 
recovery on startup

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490795 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 20:51:22 +00:00
Robert Davies b1c94aa00b Provide a more robust implementation, and one that deletes messages after they have been consumed
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490794 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 20:50:04 +00:00
Robert Davies 3093ea0f6e Transactions, when recovered, need to be recovered in prepare order:
a)  order determined by an unsorted map iterator might confuse people
b) brokerSequence can get out of step for messages recovered then committed - e.g. 
recovery on startup

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490792 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 20:48:04 +00:00
Robert Davies 27ded73ca6 drop synchronization from connectionState and connection context -
not required when using ConcurrentHashMap and limited concurrency for 
publishers or transactions for the same client connection 

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490789 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 20:44:59 +00:00
Robert Davies bc03f37ebe Fix for http://issues.apache.org/activemq/browse/AMQ-841
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490786 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 20:29:34 +00:00
Robert Davies 63ec479423 forgot to remove the sophisticated debuging code - oops
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490454 13f79535-47bb-0310-9956-ffa450edef68
2006-12-27 07:43:43 +00:00
Robert Davies de64939643 somehow, somewhere, the ResponseCorrelator got dropped from the transport used by the
MasterBroker - so I've added it back here

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490452 13f79535-47bb-0310-9956-ffa450edef68
2006-12-27 07:40:13 +00:00
Robert Davies ef0b33eeb6 uses cases submitted by Brian Diesenhaus
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490319 13f79535-47bb-0310-9956-ffa450edef68
2006-12-26 16:14:14 +00:00
Robert Davies e6a418b13b check we don't through null pointer exceptions - as this can lead to stack overflows ...
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490174 13f79535-47bb-0310-9956-ffa450edef68
2006-12-25 21:05:57 +00:00
Robert Davies c651ace525 it's ensure dispatching happens in order
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490111 13f79535-47bb-0310-9956-ffa450edef68
2006-12-25 07:19:29 +00:00
Robert Davies d8674a0fed fix for http://issues.apache.org/activemq/browse/AMQ-1108
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490007 13f79535-47bb-0310-9956-ffa450edef68
2006-12-24 08:57:34 +00:00
Robert Davies 3be0113228 exclude QuickJournalXARecoveryBrokerTest
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@489769 13f79535-47bb-0310-9956-ffa450edef68
2006-12-22 21:22:42 +00:00
Adrian T. Co 2b903d446a Fix for AMQ-1106: PooledBrokerFactoryBean incorrectly compares broker config resources
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@489413 13f79535-47bb-0310-9956-ffa450edef68
2006-12-21 17:17:19 +00:00
Robert Davies 958c41a12b stop destinations when stoping a region
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@488958 13f79535-47bb-0310-9956-ffa450edef68
2006-12-20 08:33:50 +00:00
Robert Davies f6972ec84a remove println messages from remove()
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@488783 13f79535-47bb-0310-9956-ffa450edef68
2006-12-19 19:41:41 +00:00
James Strachan 419ed2ee91 Patch for AMQ-1093 to avoid a deadlock if the transport is being reconnected from inside a MessageListener which is calling a send(), lets make the explicit clear of the consumer dispatch list asynchronous and within the existing mutex
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@487235 13f79535-47bb-0310-9956-ffa450edef68
2006-12-14 15:23:47 +00:00
Robert Davies e500f2ecc4 synchronize around the send on a Message
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@487232 13f79535-47bb-0310-9956-ffa450edef68
2006-12-14 15:18:25 +00:00
Adrian T. Co 87d15d6b98 https://issues.apache.org/activemq/browse/AMQ-1097
- Fix for selector configured using destination options is not set
- Test case to demonstrate issue

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@487187 13f79535-47bb-0310-9956-ffa450edef68
2006-12-14 12:25:49 +00:00
Guillaume Nodet 747acfef69 Fix exception when removing message from MemoryMessageStore
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@486382 13f79535-47bb-0310-9956-ffa450edef68
2006-12-12 22:46:51 +00:00
Jonas B. Lim 16546f951a added fix for https://issues.apache.org/activemq/browse/AMQ-908
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@486131 13f79535-47bb-0310-9956-ffa450edef68
2006-12-12 13:19:03 +00:00
Guillaume Nodet 870401217a AMQ-1084: Allow o.a.a.pool to support XA transactions
Also enhance the pooled ConnectionFactory to reuse several connections.
Fix the lastUsed timestamp on the ConnectionPool to avoid discarding reusable connections.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@481742 13f79535-47bb-0310-9956-ffa450edef68
2006-12-03 09:24:55 +00:00
Robert Davies f1a989da9e sp mistake
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@480925 13f79535-47bb-0310-9956-ffa450edef68
2006-11-30 13:47:48 +00:00
Robert Davies 415d46cf46 log which Persistence Adaptor we are using
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@480924 13f79535-47bb-0310-9956-ffa450edef68
2006-11-30 13:46:08 +00:00
Frederick G. Oconer a9d1f21c05 http://jira.activemq.org/jira/browse/AMQ-583
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@480854 13f79535-47bb-0310-9956-ffa450edef68
2006-11-30 06:33:50 +00:00
Robert Davies 4597dddf79 Setting the Store based cursor as the default for Durable Subscribers
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@480731 13f79535-47bb-0310-9956-ffa450edef68
2006-11-29 22:09:33 +00:00
Hiram R. Chirino 789d4e5541 Fix for http://issues.apache.org/activemq/browse/AMQ-1078
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@480717 13f79535-47bb-0310-9956-ffa450edef68
2006-11-29 21:26:23 +00:00
Jonas B. Lim 346119bfc4 applied patch for http://issues.apache.org/activemq/browse/AMQ-908
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@480575 13f79535-47bb-0310-9956-ffa450edef68
2006-11-29 14:08:36 +00:00
Robert Davies d871d0e304 ensure container is initialized before accessing
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@480416 13f79535-47bb-0310-9956-ffa450edef68
2006-11-29 05:36:42 +00:00
Robert Davies 5c587a2f13 Ensure store is properly deleted, even if not initialized
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@480185 13f79535-47bb-0310-9956-ffa450edef68
2006-11-28 20:08:26 +00:00
James Strachan ed1537b79d Added support for JDBC Master Slave for MySQL for AMQ-1074 thanks to the kind patch from Steve Lotito
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@480072 13f79535-47bb-0310-9956-ffa450edef68
2006-11-28 14:47:05 +00:00
James Strachan 935fde0377 added a test case to try reproduce bug AMQ-1054 (unfortunately it doesnt) - also added a patch to try fix AMQ-1054 based on the kind suggestion from Shoaib Akhtar that it could be the cast from getData() causing the ClassCastException; so AMQ-1054 may be fixed but as yet we don't have a test case to prove it
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@479726 13f79535-47bb-0310-9956-ffa450edef68
2006-11-27 19:01:37 +00:00
James Strachan 4f7aeecc1e added support for AMQ-1073 to allow selectors to be used with virtual destinations
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@479694 13f79535-47bb-0310-9956-ffa450edef68
2006-11-27 17:16:33 +00:00
Jonas B. Lim e78e72f957 updates for http://issues.apache.org/activemq/browse/AMQ-795
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@479639 13f79535-47bb-0310-9956-ffa450edef68
2006-11-27 14:35:34 +00:00
Robert Davies a11060452b support for durable store cursors and retroactive subscribers
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@479614 13f79535-47bb-0310-9956-ffa450edef68
2006-11-27 13:40:11 +00:00
Robert Davies ec63977e81 Tidied up locking around cursor iterators
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@479156 13f79535-47bb-0310-9956-ffa450edef68
2006-11-25 17:58:41 +00:00
Hiram R. Chirino 6e3bb5d682 Moved the new JPA module to it's own directory.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@479145 13f79535-47bb-0310-9956-ffa450edef68
2006-11-25 16:56:12 +00:00
Robert Davies 9359e9f6ca Update to fix http://issues.apache.org/activemq/browse/AMQ-791
Use in mmeory list in FilePendingMessageCursor - until memory limit reached - then use disk.
USe FilePendingMessageCursor in TopicSubscription instead of LinkedList

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@479094 13f79535-47bb-0310-9956-ffa450edef68
2006-11-25 07:10:17 +00:00
Hiram R. Chirino 118c806907 Added a new org.apache.activemq.kaha.impl.asyc package that holds data manager/journal that implements both the Kaha DataManager and ActiveIO Journal interfaces.
- Initial bench marks show it to be as fast or faster than the default ActiveIO Journal.
- The bigest differentiator is that this implementation of the journal was built to also provide fast reads.
- The DataManager interface was extracted and now the KahaStore can switch between the original DataManager implementation and the new implementation in the kaha.impl.async packagge.
- Simplified the original implementation by removing the AsyncDataWriters stuff since this is largely what the new package is based on.



git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@479089 13f79535-47bb-0310-9956-ffa450edef68
2006-11-25 06:00:56 +00:00
Robert Davies 3bf0245e76 implementation of store based cursors for Queues and Durable Subscribers,
to fix:
http://issues.apache.org/activemq/browse/AMQ-845
http://issues.apache.org/activemq/browse/AMQ-1062
http://issues.apache.org/activemq/browse/AMQ-1061
http://issues.apache.org/activemq/browse/AMQ-493
http://issues.apache.org/activemq/browse/AMQ-914

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@478967 13f79535-47bb-0310-9956-ffa450edef68
2006-11-24 19:57:51 +00:00
Robert Davies be6fac15e2 setter for max duration
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@478598 13f79535-47bb-0310-9956-ffa450edef68
2006-11-23 15:30:34 +00:00
Frederick G. Oconer d81997d3eb AMQ-526: get TwoBrokerMulticastQueueTest to work.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@478558 13f79535-47bb-0310-9956-ffa450edef68
2006-11-23 13:07:33 +00:00
Robert Davies e00678027f support for different message storage cursor types for Queue destination policies
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@478509 13f79535-47bb-0310-9956-ffa450edef68
2006-11-23 08:19:00 +00:00
James Strachan 9e02c22529 Removed unnecessary System.out
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@478325 13f79535-47bb-0310-9956-ffa450edef68
2006-11-22 21:21:02 +00:00
James Strachan eb827e2780 Added a fix for AMQ-1068 to avoid lots of RAM being used up with deeply nested topic hierarchies - we basically create the AnyChild nodes on demand now rather than up front
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@478324 13f79535-47bb-0310-9956-ffa450edef68
2006-11-22 21:19:21 +00:00
Robert Davies 41b9089ac3 check messageId isn't null before trying to copy it
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@478292 13f79535-47bb-0310-9956-ffa450edef68
2006-11-22 19:16:52 +00:00
Robert Davies 5e1da9a9a6 Ensure clear all containers - not just active ones
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@478262 13f79535-47bb-0310-9956-ffa450edef68
2006-11-22 18:06:24 +00:00
Robert Davies e78a6f7ee9 added yield back into dispatch() - but with a counter - so not so much of a performance hog
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@478238 13f79535-47bb-0310-9956-ffa450edef68
2006-11-22 16:59:26 +00:00
Jonas B. Lim e34cbc1b07 applied patch for http://issues.apache.org/activemq/browse/AMQ-1029
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@477570 13f79535-47bb-0310-9956-ffa450edef68
2006-11-21 08:15:10 +00:00
Robert Davies 878b9645ce Updated Rapid Persistence Adaptor to do batching for cursors
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@477567 13f79535-47bb-0310-9956-ffa450edef68
2006-11-21 08:11:03 +00:00
Hiram R. Chirino ecb50234ec http://issues.apache.org/activemq/browse/AMQ-1042
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@477356 13f79535-47bb-0310-9956-ffa450edef68
2006-11-20 21:40:28 +00:00
Hiram R. Chirino 0607226831 Added the initial cut of a JPA based message store.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@477273 13f79535-47bb-0310-9956-ffa450edef68
2006-11-20 18:13:50 +00:00
Hiram R. Chirino ea66d50338 Output the # of producers and consumers running in perf test
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@477272 13f79535-47bb-0310-9956-ffa450edef68
2006-11-20 18:10:48 +00:00
Jonas B. Lim 7dde85b821 applied patch for http://issues.apache.org/activemq/browse/AMQ-959
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@477171 13f79535-47bb-0310-9956-ffa450edef68
2006-11-20 13:41:40 +00:00
Robert Davies 5367f1ecb0 fixed some timing issues using the Kaha Persistence Adaptor
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@477166 13f79535-47bb-0310-9956-ffa450edef68
2006-11-20 13:11:26 +00:00
Jonas B. Lim b02ca01826 applied patch for http://issues.apache.org/activemq/browse/AMQ-1006
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@477066 13f79535-47bb-0310-9956-ffa450edef68
2006-11-20 06:20:12 +00:00
Jonas B. Lim 979c5d55ee applied patch for http://issues.apache.org/activemq/browse/AMQ-967
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@476523 13f79535-47bb-0310-9956-ffa450edef68
2006-11-18 13:35:51 +00:00
Hiram R. Chirino 97d0a61057 switch from using the RecordLocation interface to the Location interface since the adapter will need to
be aware of what log file the active records are in so that it can delete un-used log files.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@476310 13f79535-47bb-0310-9956-ffa450edef68
2006-11-17 20:53:42 +00:00
Robert Davies ab66037b12 A simple test to allow profiler to get an idea of how much memory is allocated per
temporary Queue. It appears that the ConsumerAdvisory - one for each Connection, holds
a copy of every temporary Queue in the system.

I don't think this is a big issue - unless - as in this case - all the connections and the
broker are in the same jvm.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@476299 13f79535-47bb-0310-9956-ffa450edef68
2006-11-17 20:23:54 +00:00
Hiram R. Chirino 51e6a0d593 Made PerfRate a more thread safe.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@476297 13f79535-47bb-0310-9956-ffa450edef68
2006-11-17 20:17:15 +00:00
Robert Davies 5f68126945 sbe in dumpProducerRate()
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@476294 13f79535-47bb-0310-9956-ffa450edef68
2006-11-17 20:10:34 +00:00
Hiram R. Chirino d47855ace3 added ability to have the consumer slow down. also better rate info.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@476279 13f79535-47bb-0310-9956-ffa450edef68
2006-11-17 19:48:47 +00:00
Hiram R. Chirino 87f2f502d7 enabled asyn sends.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@476266 13f79535-47bb-0310-9956-ffa450edef68
2006-11-17 19:23:08 +00:00
Hiram R. Chirino f9a159723c set the checkpoint workers to 1
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@476265 13f79535-47bb-0310-9956-ffa450edef68
2006-11-17 19:22:39 +00:00
Hiram R. Chirino 411e750806 added some comments about what we should problably do...
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@476262 13f79535-47bb-0310-9956-ffa450edef68
2006-11-17 19:17:59 +00:00
Hiram R. Chirino 94f16ac6ab Adding a perf test that uses the journal kaha combination.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@476255 13f79535-47bb-0310-9956-ffa450edef68
2006-11-17 18:59:58 +00:00
Hiram R. Chirino f65acf552b force the datafile before it is removed so that all async writes are completed before the file handle is closed.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@476225 13f79535-47bb-0310-9956-ffa450edef68
2006-11-17 17:30:53 +00:00
Hiram R. Chirino 57a4071d94 Better.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@476198 13f79535-47bb-0310-9956-ffa450edef68
2006-11-17 16:29:35 +00:00
Hiram R. Chirino e0fdce4f01 Ehanced these performance tests so that the producers are running in their own threads.
Also change the dumping of stats to be time based and not based on the number of messages received.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@476189 13f79535-47bb-0310-9956-ffa450edef68
2006-11-17 16:04:57 +00:00
Robert Davies 629bc81fb2 Adding persitent cursor support for Queues
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@476101 13f79535-47bb-0310-9956-ffa450edef68
2006-11-17 10:33:57 +00:00
Robert Davies 3b28c7c3ec tightened up synchronization around dispatching
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@476100 13f79535-47bb-0310-9956-ffa450edef68
2006-11-17 10:29:23 +00:00
Jonas B. Lim 9dcd00823b applied patch for http://issues.apache.org/activemq/browse/AMQ-1010
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@476099 13f79535-47bb-0310-9956-ffa450edef68
2006-11-17 10:24:04 +00:00
Robert Davies e582e2fd40 only rotate consumers if there are consumers to rotate!
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@476093 13f79535-47bb-0310-9956-ffa450edef68
2006-11-17 09:48:27 +00:00
Hiram R. Chirino 69e5439718 More Java 5 Ehancements.
- Use activeio-3.1 snapshot since that has been upgraded to Java 5
 - Don't need mx4j since Java 5 includes a JMX server



git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@476007 13f79535-47bb-0310-9956-ffa450edef68
2006-11-17 00:56:16 +00:00
Hiram R. Chirino 86cbdfd5db Switching to Java 5.. Build and Runtime now require Java 5 see: http://www.nabble.com/Switching-to-ActiveMQ-4.2-to-Java-5----tf2637427.html
- Update maven build
- Removed dependency on concurrent-backport



git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@475999 13f79535-47bb-0310-9956-ffa450edef68
2006-11-17 00:29:03 +00:00
Hiram R. Chirino 849d2f330e The async writer is now working and enabled by default.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@475943 13f79535-47bb-0310-9956-ffa450edef68
2006-11-16 22:06:22 +00:00
Hiram R. Chirino a58d36b9b3 see: http://issues.apache.org/activemq/browse/AMQ-1056
We now expire messages on the broker.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@475848 13f79535-47bb-0310-9956-ffa450edef68
2006-11-16 18:24:14 +00:00
Hiram R. Chirino 4f3f52392d Started on an AsyncDataFileWriter implementation so that we can get more concurrent writes and batch up
file sync() calls done.



git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@475775 13f79535-47bb-0310-9956-ffa450edef68
2006-11-16 15:37:35 +00:00
Hiram R. Chirino 822df45e38 Rev up openwire version in case someone makes changes
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@475773 13f79535-47bb-0310-9956-ffa450edef68
2006-11-16 15:35:24 +00:00
James Strachan 86faaef7c9 Fix for AMQ-1053. Added support for pluggable message transformation together with an implementation using XStream to marshall ObjectMessage instances as TextMessages. See the XStreamTransformTest to see how a producer can send ObjectMessages but then consumers can see either ObjectMessages or TextMessages depending on their requirements.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@475701 13f79535-47bb-0310-9956-ffa450edef68
2006-11-16 12:08:22 +00:00
James Strachan 34fb326a0a added test case for AMQ-1027
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@475680 13f79535-47bb-0310-9956-ffa450edef68
2006-11-16 10:56:07 +00:00
Robert Davies fc6ab9c687 change Queue message store in Kaha store adaptor to use memory efficent list instead
of Map containers

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@475416 13f79535-47bb-0310-9956-ffa450edef68
2006-11-15 20:56:21 +00:00
Hiram R. Chirino ba476b36f0 Setting some svn eol-styles and improving source distro assembly
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@475265 13f79535-47bb-0310-9956-ffa450edef68
2006-11-15 15:43:24 +00:00
James Strachan 940850910d added a simple command agent that can be used to send messages to a destination (ActiveMQ.Agent) to interact with the broker via the activemq-console commands (list, query, browse etc)
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@475210 13f79535-47bb-0310-9956-ffa450edef68
2006-11-15 12:02:34 +00:00
Hiram R. Chirino 06a365f12c Setting svn:eol-style
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@474985 13f79535-47bb-0310-9956-ffa450edef68
2006-11-14 21:16:11 +00:00
Hiram R. Chirino 9e6eb830b3 Set the eol-style
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@474977 13f79535-47bb-0310-9956-ffa450edef68
2006-11-14 21:02:18 +00:00
Hiram R. Chirino ae5cf8ef9e https://issues.apache.org/activemq/browse/AMQ-1016
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@474872 13f79535-47bb-0310-9956-ffa450edef68
2006-11-14 17:11:37 +00:00
Hiram R. Chirino c0bc3e00c1 http://issues.apache.org/activemq/browse/AMQ-1045 we now evict failed connections from a connection pool.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@474799 13f79535-47bb-0310-9956-ffa450edef68
2006-11-14 14:12:03 +00:00
Hiram R. Chirino caa30ffdc0 Added synconization to the methods that setup connection state so that when an async error is detected, it properly does a full cleanup. Previously subscriptions were not properly cleaned up since they were being setup at the same time as they were being cleaned up.
Also start 1 async exception thread ever since an async exception leads to connection tear down.  Subsequent failures do not need additional async threads started.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@474769 13f79535-47bb-0310-9956-ffa450edef68
2006-11-14 12:44:16 +00:00
Robert Davies 7a3de7693b log the the exception if an exception caught in rotating the consumers
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@474674 13f79535-47bb-0310-9956-ffa450edef68
2006-11-14 06:27:34 +00:00
Robert Davies 6895d009d8 Split the internal messages in a Queue destination in two - messages accessed by the
PendingMessageCursor and work in progress or pagedInMessages - which are instances
of QueueMessageReference - hence keeping the semantics for Message Groups etc. and keeping
the majority of the 'fiddly bits' intact.



git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@474475 13f79535-47bb-0310-9956-ffa450edef68
2006-11-13 20:06:49 +00:00
Robert Davies 55f4aad761 check that Queue messages aren't acknowledged before applying a filter
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@474469 13f79535-47bb-0310-9956-ffa450edef68
2006-11-13 19:54:40 +00:00
Robert Davies 9fcfa5c6d2 remove RangeLimitedMap - will be replaced with B+ Tree
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@474468 13f79535-47bb-0310-9956-ffa450edef68
2006-11-13 19:52:47 +00:00
Robert Davies 6b5840f8c1 remove RangeLimitedMap - will be replaced with B+ Tree
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@474467 13f79535-47bb-0310-9956-ffa450edef68
2006-11-13 19:51:38 +00:00
Robert Davies b376ce24ef propagate exceptions up to the caller
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@474466 13f79535-47bb-0310-9956-ffa450edef68
2006-11-13 19:50:31 +00:00
Robert Davies 43d2ef0469 log an error for ConnectionErrors that are not transport or
Broker in shutdown related

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@474465 13f79535-47bb-0310-9956-ffa450edef68
2006-11-13 19:49:33 +00:00
Jonas B. Lim 2510b088ad fixed for http://issues.apache.org/activemq/browse/AMQ-1042
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@473647 13f79535-47bb-0310-9956-ffa450edef68
2006-11-11 06:09:59 +00:00
Adrian T. Co beaca8a043 Fix some failing test cases in windows.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@473224 13f79535-47bb-0310-9956-ffa450edef68
2006-11-10 07:29:23 +00:00
Adrian T. Co a8f4f6978c Added optimization to determine the highest priority consumer during addition of subscription.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@473223 13f79535-47bb-0310-9956-ffa450edef68
2006-11-10 07:28:27 +00:00
Adrian T. Co 8951023556 https://issues.apache.org/activemq/browse/AMQ-1024
- Fix case where a non-exclusive consumer registered first will receive a message, before an exclusive consumer.
- Added junit test case to demonstrate the issue.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@473219 13f79535-47bb-0310-9956-ffa450edef68
2006-11-10 07:16:25 +00:00
Hiram R. Chirino d71bc421f8 We should let a client change the client id on a connection even if it was set on the connection factory.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@473167 13f79535-47bb-0310-9956-ffa450edef68
2006-11-10 02:04:40 +00:00
Hiram R. Chirino 8be1b5eb5a Reving up version
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@472518 13f79535-47bb-0310-9956-ffa450edef68
2006-11-08 15:27:38 +00:00
Robert Davies 4b5bc5eb2d added synchronization around marshal/unmarshal
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@472421 13f79535-47bb-0310-9956-ffa450edef68
2006-11-08 08:23:08 +00:00
Hiram R. Chirino da5139c24b All message dispatching should occur from the session's executor. Also, we should dispatch any messages in the consumers queue before dispatching messages in the session's queues.
http://issues.apache.org/activemq/browse/AMQ-1031
http://issues.apache.org/activemq/browse/AMQ-1032



git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@472345 13f79535-47bb-0310-9956-ffa450edef68
2006-11-08 00:14:56 +00:00
Adrian T. Co c636b3798f Added test case to test resizing of internal buffer of DataByteArrayOutputStream.
Fix bug during resizing of internal buffer of DataByteArrayOutputStream.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@472258 13f79535-47bb-0310-9956-ffa450edef68
2006-11-07 21:00:46 +00:00
Hiram R. Chirino 0c93dfde72 Added message ordering assertions and also a test case that uses consumer.receive() instead of a messsage listener
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@472237 13f79535-47bb-0310-9956-ffa450edef68
2006-11-07 20:30:37 +00:00
James Strachan 11501cb38e removed java 5 annotations :)
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@472209 13f79535-47bb-0310-9956-ffa450edef68
2006-11-07 19:12:48 +00:00
James Strachan 39b0376001 added a test case to reproduce a bad ack bug
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@472207 13f79535-47bb-0310-9956-ffa450edef68
2006-11-07 19:10:01 +00:00
Hiram R. Chirino 3daf923b51 Added some fields for future use to the BrokerInfo and ProducerInfo classes.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@472165 13f79535-47bb-0310-9956-ffa450edef68
2006-11-07 16:56:12 +00:00
Hiram R. Chirino da7478d9d5 Eliminated AbstractConnection by inlining it into TransportConnection. The synchronization complexity between the two was making my head spin. Now that they are consolidated, we can try to simply them a little more.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@472157 13f79535-47bb-0310-9956-ffa450edef68
2006-11-07 16:40:23 +00:00
Hiram R. Chirino cafe4cbcc4 http://issues.apache.org/activemq/browse/AMQ-1026
Created a ReconnectTest that showed problems with the synchronization used when a client reconnects to a server via failover before the server detects the client failure.
- InactivityMonitor : Better syncronization so that an inactivty exception is only raised once.
- Connection: Added serviceExceptionAsync() method and change all methods that are dispatching to use this instead of serviceException() to avoid possible deadlock that can occur during connection shutdown.
- MockTransport: finer grained sychonization to avoid deadlocks.
- PrefetchSubscription: it is possible it will get duplicate acks on a failover reconnect



git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@471837 13f79535-47bb-0310-9956-ffa450edef68
2006-11-06 19:35:59 +00:00
Jonas B. Lim 36de58b371 fix for https://issues.apache.org/activemq/browse/AMQ-1023
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@470695 13f79535-47bb-0310-9956-ffa450edef68
2006-11-03 07:15:37 +00:00
Robert Davies 4821b9da70 Use Input/Output Stream intefaces instead of concrete classes
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@470398 13f79535-47bb-0310-9956-ffa450edef68
2006-11-02 15:49:58 +00:00
Robert Davies 8a8f41c33b Added test to make sure ConnectionFactory is serializable - which
is a requirement of the JMS spec

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@470395 13f79535-47bb-0310-9956-ffa450edef68
2006-11-02 15:47:46 +00:00
Robert Davies ae687a1182 moved StoreByteArray stream methods to util
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@470391 13f79535-47bb-0310-9956-ffa450edef68
2006-11-02 15:36:21 +00:00
Robert Davies 166a04bc58 make size of io buffers configurable
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@470390 13f79535-47bb-0310-9956-ffa450edef68
2006-11-02 15:35:46 +00:00
Robert Davies fdcc973923 optimized
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@470389 13f79535-47bb-0310-9956-ffa450edef68
2006-11-02 15:34:53 +00:00
Robert Davies 330e73140a moved utility methods for reading byte streams to utils package from Kaha
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@470388 13f79535-47bb-0310-9956-ffa450edef68
2006-11-02 15:34:22 +00:00
Robert Davies 526cb5bae8 make enabling statistics configurable
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@470387 13f79535-47bb-0310-9956-ffa450edef68
2006-11-02 15:33:25 +00:00
James Strachan 12fff78943 fixed typo
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@470282 13f79535-47bb-0310-9956-ffa450edef68
2006-11-02 08:57:54 +00:00
Robert Davies 3f74b0e1c0 support for ByteSequence
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@469986 13f79535-47bb-0310-9956-ffa450edef68
2006-11-01 17:13:39 +00:00
James Strachan b3e315fcc2 disabled the use of the CommandAgent by default to avoid causing the VM broker to keep around forever (since the broker itself creates a VM transport which avoids it ever being closed)
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@469972 13f79535-47bb-0310-9956-ffa450edef68
2006-11-01 16:37:39 +00:00
Robert Davies b93cd9ec13 Ensure Administered objects are Serializable
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@469873 13f79535-47bb-0310-9956-ffa450edef68
2006-11-01 11:47:51 +00:00
James Strachan 49e10d36fc added support for a simple message based command agent so that you can send management commands to the broker over JMS
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@469135 13f79535-47bb-0310-9956-ffa450edef68
2006-10-30 12:17:14 +00:00
Hiram R. Chirino 41265f2b53 make the setProperty public since it can be handy.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@468911 13f79535-47bb-0310-9956-ffa450edef68
2006-10-29 14:30:36 +00:00
James Strachan efd516866d fixed trivial javadoc warning
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@468030 13f79535-47bb-0310-9956-ffa450edef68
2006-10-26 15:02:45 +00:00
James Strachan 04015a5e3d switched to released version
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@467949 13f79535-47bb-0310-9956-ffa450edef68
2006-10-26 10:28:08 +00:00
Brian McCallister 47a97ef893 Change default multicast IP used as we had been using one in the reserved range, now it uses 239.255.2.3, which is in th
e range designated for site-local stuff


git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@467791 13f79535-47bb-0310-9956-ffa450edef68
2006-10-25 22:15:35 +00:00
Hiram R. Chirino 349d0f219f Fix javadoc description.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@467789 13f79535-47bb-0310-9956-ffa450edef68
2006-10-25 22:13:45 +00:00
Hiram R. Chirino ec09a75e7a Commenting out failing test. see:
http://issues.apache.org/activemq/browse/AMQ-1002

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@467716 13f79535-47bb-0310-9956-ffa450edef68
2006-10-25 17:12:38 +00:00