Commit Graph

2142 Commits

Author SHA1 Message Date
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
Guillaume Nodet 2550bc44b7 AMQ-1107: Upgrade to xbean 2.8 to fix invalid generated schemas
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@489665 13f79535-47bb-0310-9956-ffa450edef68
2006-12-22 14:41:05 +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
Frederick G. Oconer e413e8711b AMQ-1091
Changes:
1. Fix assembly-src profile by providing the correct path to unix-src.xml and windows-src.xml assembly descriptor.
2. Commented out excluded "data" dir in source assembly descriptor because it wasn't including the data package in activemq-core.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@486479 13f79535-47bb-0310-9956-ffa450edef68
2006-12-13 03:33:29 +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
Hiram R. Chirino 0a361e504a getting rid of the 'Embedded error: The attribute Extension-Name may not occur more than once in the same section'
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@485741 13f79535-47bb-0310-9956-ffa450edef68
2006-12-11 16:35:55 +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
James Strachan 4554b5d22f used a separate room for CI messages
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@481216 13f79535-47bb-0310-9956-ffa450edef68
2006-12-01 10:08:11 +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 fbce65019c Fixed the test case so it actually does fail - before the patch was applied
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@480097 13f79535-47bb-0310-9956-ffa450edef68
2006-11-28 15:40:30 +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
Hiram R. Chirino c9e75006df Added some more annotations so that intexs and the lob is properly handled
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@479194 13f79535-47bb-0310-9956-ffa450edef68
2006-11-25 20:44:22 +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 24b005c3da Added derby to dependencies so tests pass.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@479147 13f79535-47bb-0310-9956-ffa450edef68
2006-11-25 17:05:44 +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