Commit Graph

128 Commits

Author SHA1 Message Date
James Strachan d7f91463d6 enabled the hash bucket based implementation of MessageGroupMap by default and made the bucketCount configurable in the destination policy map
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@366208 13f79535-47bb-0310-9956-ffa450edef68
2006-01-05 15:58:49 +00:00
James Strachan e1d4780221 minor refactor to allow pluggable MessageGroupMap implementations so that we don't have to keep around every single GroupID in RAM if we don't want to (which could very easily become a RAM leak) and can use a provider which uses hashbuckets instead.
added an initial implementation of a hashbucket based MessageGroupMap which should be fine; am waiting on a unit test run to complete before I dare enable it by default :)

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@366204 13f79535-47bb-0310-9956-ffa450edef68
2006-01-05 15:36:07 +00:00
Hiram R. Chirino 71bd33d3ec Fix SQL statement.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@366203 13f79535-47bb-0310-9956-ffa450edef68
2006-01-05 15:35:45 +00:00
James Strachan ab1d1afc1c fixed test case to close down the connection in between test cases to avoid duplicate clientID exceptions
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@366199 13f79535-47bb-0310-9956-ffa450edef68
2006-01-05 15:23:18 +00:00
Robert Davies ef3b50e18b when sending - use quality of service applicable to message and subscriber
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@366191 13f79535-47bb-0310-9956-ffa450edef68
2006-01-05 14:58:35 +00:00
James Strachan 95a2aa6b8f fixed reconnection test which was creating a new connection with a client ID before closing the previous one which threw the InvalidClientIDException
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@366188 13f79535-47bb-0310-9956-ffa450edef68
2006-01-05 14:48:09 +00:00
Robert Davies c68a1460ba Fix for AMQ-464
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@366176 13f79535-47bb-0310-9956-ffa450edef68
2006-01-05 13:04:31 +00:00
James Strachan f0454b1e88 part of the fix for AMQ-286 to allow the redelivery policy to be configured on a consumer
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@366170 13f79535-47bb-0310-9956-ffa450edef68
2006-01-05 12:21:24 +00:00
James Strachan c5b3802c61 made it easy to copy a RedeliveryPolicy
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@366151 13f79535-47bb-0310-9956-ffa450edef68
2006-01-05 10:43:17 +00:00
Adrian T. Co 34cadafaab Change subtractive query to use -xQ and --xobjname instead of !. Having trouble using ! in linux.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@366145 13f79535-47bb-0310-9956-ffa450edef68
2006-01-05 10:04:04 +00:00
Adrian T. Co 04e2cdcf3f - Added wildcard searching using query. (i.e. -QTopic=*Advisory*, -QQueue=TEST.???)
- Added subtractive searching using query. (i.e. query -QTopic=* -Q!Topic=ActiveMQ.Advisory.*) will get all topics, but filter out advisory topics.
- Added querying using similar to object name format. (i.e. query --objname Type=*Connect*,BrokerName=BROKER_1 --objname !Type=NetworkConnector) will select all connection and connector belonging to BROKER_1. It will filter out all network connectors.
- Performed a little code restructuring.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@366120 13f79535-47bb-0310-9956-ffa450edef68
2006-01-05 08:26:37 +00:00
James Strachan c8d74e7113 removed RedeliveryPolicy from openwire and moved into the client package
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@366118 13f79535-47bb-0310-9956-ffa450edef68
2006-01-05 08:22:59 +00:00
Hiram R. Chirino 9b64c37c4c Added a SubscriptionInfo[] getAllSubscriptions() to the TopicMessageStore. We will need this if we want to eagerly load the durable subs when the broker starts up.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@365993 13f79535-47bb-0310-9956-ffa450edef68
2006-01-04 21:09:16 +00:00
Hiram R. Chirino 27329abdcb don't log a message when the WireFormatInfo comes in from the other side.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@365966 13f79535-47bb-0310-9956-ffa450edef68
2006-01-04 18:41:16 +00:00
Hiram R. Chirino e6efdb1955 Fix the security test.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@365965 13f79535-47bb-0310-9956-ffa450edef68
2006-01-04 18:39:23 +00:00
Hiram R. Chirino c0edaf0532 Use the jdbc catalog to avoid displaying warning messages on startup when the activemq tables allready exist.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@365954 13f79535-47bb-0310-9956-ffa450edef68
2006-01-04 17:40:32 +00:00
Hiram R. Chirino 3852a53f3e use "Topic." rather than "topic://" as the separator when making advisories. This makes it easier for folks to use * notation.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@365941 13f79535-47bb-0310-9956-ffa450edef68
2006-01-04 16:49:43 +00:00
James Strachan de231491a7 added test case and fix for AMQ-463 to test for duplicate clientIDs connecting
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@365917 13f79535-47bb-0310-9956-ffa450edef68
2006-01-04 14:42:24 +00:00
James Strachan c62a775af4 added more edge cases to the DestinationMap test case
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@365890 13f79535-47bb-0310-9956-ffa450edef68
2006-01-04 10:53:14 +00:00
James Strachan 8b28367f3d fixed the DestinationMap so that it can hold queues and topics with the same name without intermixing the two trees
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@365888 13f79535-47bb-0310-9956-ffa450edef68
2006-01-04 10:42:21 +00:00
James Strachan 0a8efc977b added test case to show the use of individual dead letter strategy via XML
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@365885 13f79535-47bb-0310-9956-ffa450edef68
2006-01-04 10:32:07 +00:00
James Strachan 8f22cfa4fc make destinations sortable
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@365883 13f79535-47bb-0310-9956-ffa450edef68
2006-01-04 10:31:15 +00:00
James Strachan 664b534be5 fixed edge cases in DestinationMap
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@365882 13f79535-47bb-0310-9956-ffa450edef68
2006-01-04 10:30:40 +00:00
Adrian T. Co 6cbd6d2e8d Added adding of started broker to lists of brokers.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@365876 13f79535-47bb-0310-9956-ffa450edef68
2006-01-04 09:58:35 +00:00
Adrian T. Co b70c8d1cb2 Re-included the means to prevent the main thread from exiting until the vm is exited elsewhere (either Ctrl+C, terminateJVM, etc.)
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@365865 13f79535-47bb-0310-9956-ffa450edef68
2006-01-04 08:48:41 +00:00
Hiram R. Chirino 050637cdf6 use the BrokerFactory to create BrokerService objects
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@365746 13f79535-47bb-0310-9956-ffa450edef68
2006-01-03 21:01:10 +00:00
Hiram R. Chirino 6027d2aee9 generated resources were not being copied to target/classes
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@365740 13f79535-47bb-0310-9956-ffa450edef68
2006-01-03 20:47:18 +00:00
Hiram R. Chirino 7dbbe0c854 Fix test case
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@365713 13f79535-47bb-0310-9956-ffa450edef68
2006-01-03 18:55:54 +00:00
Hiram R. Chirino a4618caf0c better pom for m2
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@365712 13f79535-47bb-0310-9956-ffa450edef68
2006-01-03 18:54:54 +00:00
Hiram R. Chirino d9987ffd31 The roundrobin test was failing on slow machines because the prefetch size was too small so the round robined
distribution was not equals since the slow consumer's prefetch window would fill up and other consumers would
unevenly get more messages.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@365537 13f79535-47bb-0310-9956-ffa450edef68
2006-01-03 04:35:23 +00:00
Hiram R. Chirino 161448a5e3 The SimpleDispatchPolicyTest and RoundRobinDispatchPolicyTest were failing on my single proc powerbook.
The parent of the MessageIdList was being called before the clild had processed the message which
cause the test to not wait till the childeren had processed the messages so tests would fail 
due to short counts.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@365367 13f79535-47bb-0310-9956-ffa450edef68
2006-01-02 16:05:31 +00:00
Hiram R. Chirino ef64a25b9f Better test setup
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@365280 13f79535-47bb-0310-9956-ffa450edef68
2006-01-02 02:50:00 +00:00
Hiram R. Chirino 6bdfbf3d73 This fixes the timing issues that the RecoveryBrokerTests were having.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@365277 13f79535-47bb-0310-9956-ffa450edef68
2006-01-02 02:12:56 +00:00
Hiram R. Chirino 61ab31e758 imporoved the advisory message being sent by topics when no consumer is listening:
- It sends it non transactional
 - It does does not block due to flow control

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@360329 13f79535-47bb-0310-9956-ffa450edef68
2005-12-31 16:50:52 +00:00
Hiram R. Chirino 77dd8fb71d use a tighter wait() based on the remaining time
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@360323 13f79535-47bb-0310-9956-ffa450edef68
2005-12-31 16:48:55 +00:00
Hiram R. Chirino 14f96a9e6f The testcase would wait for all the messages to arrive. But in the topic case the total number of messages computed was wrong and the test would not wait long enough.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@360318 13f79535-47bb-0310-9956-ffa450edef68
2005-12-31 16:33:49 +00:00
Hiram R. Chirino 3516e1005a better tearDown: allows setup and tear down to be call multiple times in a single testcase.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@360315 13f79535-47bb-0310-9956-ffa450edef68
2005-12-31 16:30:26 +00:00
Hiram R. Chirino 7703aeef0c not sure why.. but these guys are passing for me now.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@360197 13f79535-47bb-0310-9956-ffa450edef68
2005-12-30 23:33:46 +00:00
Hiram R. Chirino 3d95025a47 Depending on the test configuration parameters, it was possible to get an OutOfMemory error. The causes were:
- The MessageList was holding on to all the messages being consumed, changed this so that it only holds on to the messageIds
 - Was using a non persistent broker, but was sending it persistent messages, in the topic case, he holds on to the messages in a memory based message store.  By default we now send non persistent messages.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@360195 13f79535-47bb-0310-9956-ffa450edef68
2005-12-30 23:25:03 +00:00
Hiram R. Chirino 5be5a62df6 Updated/Added more apache copyright headers
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@360181 13f79535-47bb-0310-9956-ffa450edef68
2005-12-30 22:37:11 +00:00
Hiram R. Chirino e7246d9327 Make the default thread pool create deamon threads
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@360169 13f79535-47bb-0310-9956-ffa450edef68
2005-12-30 21:27:21 +00:00
Hiram R. Chirino 475925394a Fixed the QueueSubscriptionTest. When multiple producers would pound all at once at a destionation. Some messages would not get dispatched. Due to timing issue with the consumer list held by the destination.
Added some more synchronization blocks and now everything is happy again.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@360167 13f79535-47bb-0310-9956-ffa450edef68
2005-12-30 21:14:03 +00:00
Hiram R. Chirino 90e21b4e8f Modified the BrokerInfo so that the redelivery policy is now purely configured on the client side. Also the connection's transport
is not started until the connection if fully configured now.



git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@360140 13f79535-47bb-0310-9956-ffa450edef68
2005-12-30 18:48:31 +00:00
James Strachan 1f3f80cf77 fixed bug in test case
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@360135 13f79535-47bb-0310-9956-ffa450edef68
2005-12-30 18:36:29 +00:00
James Strachan de7f650b16 avoid possible NPE; only set the redeliveryPolicy if there is one configured
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@360132 13f79535-47bb-0310-9956-ffa450edef68
2005-12-30 18:25:15 +00:00
Hiram R. Chirino 80f5e0ced1 Fixed https://jira.logicblaze.com/jira/browse/AMQ-460
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@360127 13f79535-47bb-0310-9956-ffa450edef68
2005-12-30 18:09:24 +00:00
James Strachan eac597346c allows for the specifying of ActiveMQ specific connection headers
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@360111 13f79535-47bb-0310-9956-ffa450edef68
2005-12-30 15:55:20 +00:00
James Strachan 10c6b2964f added test cases to demonstrate shared and individual DLQ strategies; which highlight a bug in the rollback logic in the client
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@360108 13f79535-47bb-0310-9956-ffa450edef68
2005-12-30 15:36:19 +00:00
James Strachan ffb9d2aabb allow the RedeliveryPolicy to be configured on an ActiveMQConnectionFactory
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@360105 13f79535-47bb-0310-9956-ffa450edef68
2005-12-30 15:34:31 +00:00
James Strachan 88203aea9b added the ability to configure the DLQ policy on a per destination basis; either use 1 global DLQ for all messages or use 1 DLQ for a bunch of messages via a wildcard PolicyEntry or use an individual DLQ per destination (which again can be attached to a wildcard via a PolicyEntry)
fixes AMQ-459

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@360089 13f79535-47bb-0310-9956-ffa450edef68
2005-12-30 14:05:51 +00:00