Commit Graph

2588 Commits

Author SHA1 Message Date
Hiram R. Chirino 43ba1be188 Fixing checkstyle issues
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@563930 13f79535-47bb-0310-9956-ffa450edef68
2007-08-08 16:30:17 +00:00
Hiram R. Chirino 230a86c489 Fixing a bunch of checkstyle violations
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@563921 13f79535-47bb-0310-9956-ffa450edef68
2007-08-08 15:52:25 +00:00
Hiram R. Chirino 0945e32b6a Fix the TopicMasterSlaveTest that was failing
- Stack was overflowing due to the advisory broker advising on topic advisories
 - MasterConnector now makes sync request to the slave if it's given a sync request
 - Test was failing due to kaha not being able to create a file that was too long.. fixed by making the 
   sub name and client id and dest name shorter.  Need to revisit.



git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@563854 13f79535-47bb-0310-9956-ffa450edef68
2007-08-08 13:22:15 +00:00
James Strachan b6fad12ac6 migrated the Camel destination code from the camel project into ActiveMQ as it makes more sense to host it here - and avoids a circular dependency issue when releasing ActiveMQ 5.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@563611 13f79535-47bb-0310-9956-ffa450edef68
2007-08-07 18:38:42 +00:00
James Strachan 4102accade migrated the Camel destination code from the camel project into ActiveMQ as it makes more sense to host it here - and avoids a circular dependency issue when releasing ActiveMQ 5.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@563609 13f79535-47bb-0310-9956-ffa450edef68
2007-08-07 18:36:58 +00:00
Hiram R. Chirino 2728ccbb88 Fix for AMQ-1356 : Durable Subscriptions do not work with Wildcards after broker is restarted.
- Added a RecoveryBrokerTest.testWildCardSubscriptionPreservedOnRestart() test case that was showing
   that that wildcards did not work with DurableSubscriptions
 - Fix the TransactedTopicMasterSlaveTest so that setDeleteAllMessagesOnStartup() takes effect (had to be done before the connectors are added.
 - Change the MessageStore interface so that subscriptions are created using the data in the SubscriptionInfo class
 - Added a subscribedDestination field to the SubscriptionInfo so that the original wildcard subscrption can be remembered
 - The KahaReference store now deletes it's State store too when deleteAllMessages() is called
 - Fixed KahaPersistenceAdapter.getDestinations() so that it actually returns all the destinations.
 - We now recover all the topics eagerly when the topic region is started.



git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@563194 13f79535-47bb-0310-9956-ffa450edef68
2007-08-06 17:07:55 +00:00
Hiram R. Chirino 8b68c62249 Switched from using ${activemq-version} to using ${version}
added a required dependency in activemq-web to spring-web


git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@562099 13f79535-47bb-0310-9956-ffa450edef68
2007-08-02 13:03:33 +00:00
Robert Davies 64b8fb64f4 Added explicit error for badly formated broker name
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@561815 13f79535-47bb-0310-9956-ffa450edef68
2007-08-01 14:49:48 +00:00
Robert Davies ec6a7029c5 updated message properties
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@561428 13f79535-47bb-0310-9956-ffa450edef68
2007-07-31 18:34:32 +00:00
Hiram R. Chirino 5ad4732038 - Faster VMTransport shutdown by avoiding a potential deadlock
- Better connection shutdown.


git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@561180 13f79535-47bb-0310-9956-ffa450edef68
2007-07-30 23:11:24 +00:00
Hiram R. Chirino f90c62c640 Fix for intermitent test failure at:
testOneProducerManyConsumersManyMessages(org.apache.activemq.broker.policy.RoundRobinDispatchPolicyTest)
It was checking that messages were evenly distributed accross consumers but that can only be garanteed when 
the consumer prefetches can hold all the published messages.



git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@561113 13f79535-47bb-0310-9956-ffa450edef68
2007-07-30 20:50:01 +00:00
Robert Davies 350a2aad7f Fix for https://issues.apache.org/activemq/browse/AMQ-1305
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@561109 13f79535-47bb-0310-9956-ffa450edef68
2007-07-30 20:36:16 +00:00
Hiram R. Chirino 0e87c01f22 The JPAReferenceStore does not track XA transaction so force a journal recover always. Fixes the QuickJPAStoreXARecoveryBrokerTest
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@561103 13f79535-47bb-0310-9956-ffa450edef68
2007-07-30 19:57:34 +00:00
Robert Davies c07b23352c Fix for https://issues.apache.org/activemq/browse/AMQ-567
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@561088 13f79535-47bb-0310-9956-ffa450edef68
2007-07-30 18:45:49 +00:00
Robert Davies b3eb9a5e5b added support for properties brokerInTime and brokerOutTime
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@561028 13f79535-47bb-0310-9956-ffa450edef68
2007-07-30 16:07:17 +00:00
Robert Davies a401575569 Added support for length of time messages are processed by the broker -
fix for https://issues.apache.org/activemq/browse/AMQ-1160,
https://issues.apache.org/activemq/browse/AMQ-1072,
https://issues.apache.org/activemq/browse/AMQ-936 
and ground work for for https://issues.apache.org/activemq/browse/AMQ-567

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@561026 13f79535-47bb-0310-9956-ffa450edef68
2007-07-30 16:01:37 +00:00
Hiram R. Chirino b97f7d8479 Fixed pom so that it generates the openwire commands when mvn clean compile -P openwire-generate
is run

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@560989 13f79535-47bb-0310-9956-ffa450edef68
2007-07-30 14:10:04 +00:00
Hiram R. Chirino 2d27d56e59 - Fix for the xmpp transport needed du to recently added stop() synchronization.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@560979 13f79535-47bb-0310-9956-ffa450edef68
2007-07-30 13:41:59 +00:00
Hiram R. Chirino ea74731701 Serveral changes needed to Fix https://issues.apache.org/activemq/browse/AMQ-1349
- The vm:// transport was delivering events to the listener before start() was called.  Also clean it up a little by consolidating
   the use of the prePeerSetQueue and messageQueue field.
 - the tcp:// .stop() method now blocks until the thread that calls out to the listener is shutdown.
 - TransportConnection was not doing a good job synchronizing when multiple concurrent conenctions to the same connection Id was established.
   IllegalStateExceptions were common when a failover connection reconnected.  Now we make sure that only 1 connection with a given connectionId
   is activley operating in the broker.  Also removed 1 un-needed hash lookup by replacing the brokerConnectionStates Map with the 
   connectionState variable.
    
Also added a pause in the JmsTempDestinationTest to avoid intermitent failures.



git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@560872 13f79535-47bb-0310-9956-ffa450edef68
2007-07-30 05:34:37 +00:00
Robert Davies 3a5f48d277 Fix for http://issues.apache.org/activemq/browse/AMQ-1080
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@560783 13f79535-47bb-0310-9956-ffa450edef68
2007-07-29 19:01:29 +00:00
Robert Davies eeb8d5bafc remove println
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@560700 13f79535-47bb-0310-9956-ffa450edef68
2007-07-29 08:59:46 +00:00
Robert Davies 13729a3690 Enabled
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@560699 13f79535-47bb-0310-9956-ffa450edef68
2007-07-29 08:59:30 +00:00
Robert Davies 6013b64f97 updated for junit test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@560698 13f79535-47bb-0310-9956-ffa450edef68
2007-07-29 08:58:59 +00:00
Robert Davies 35ba427ec9 Fix for http://issues.apache.org/activemq/browse/AMQ-920
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@560696 13f79535-47bb-0310-9956-ffa450edef68
2007-07-29 08:57:31 +00:00
Robert Davies 50c6d9ccc8 A message is a message isMessage()
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@560695 13f79535-47bb-0310-9956-ffa450edef68
2007-07-29 08:56:54 +00:00
Robert Davies 14180c5cb3 check for nulls
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@560694 13f79535-47bb-0310-9956-ffa450edef68
2007-07-29 08:56:21 +00:00
Robert Davies 1e3e5b7223 Fix for http://issues.apache.org/activemq/browse/AMQ-1294
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@560693 13f79535-47bb-0310-9956-ffa450edef68
2007-07-29 08:54:49 +00:00
Hiram R. Chirino 3b73e60233 Fix for http://issues.apache.org/activemq/browse/AMQ-1348
Better file locking on windows.  We now use a seperate lock file to signifiy the lock on the kaha db.



git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@560352 13f79535-47bb-0310-9956-ffa450edef68
2007-07-27 18:49:47 +00:00
Hiram R. Chirino 9d2e5418fe Added a handy processingDelay option to the MessageIdList so that a test case and simulate a slow consumer
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@560294 13f79535-47bb-0310-9956-ffa450edef68
2007-07-27 16:02:04 +00:00
Hiram R. Chirino d56ebd842d fix for AMQ-1346.. moved handling the not full event into the queue's task runner to avoid deadlocks and the recursiveness of the pagIn call that was
causing the Illeagal state exception.



git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@560282 13f79535-47bb-0310-9956-ffa450edef68
2007-07-27 15:42:31 +00:00
Robert Davies 956fe93bd2 No need to create destination twice when doing a destination lookup
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@560274 13f79535-47bb-0310-9956-ffa450edef68
2007-07-27 15:29:51 +00:00
Hiram R. Chirino 6a928d5cfe - Made the dispatchValve handling a little safer.. it was previously possible that an exception could cause the broker to miss turning it off before trying to turn it on.
- better producer flow control logic, was not working for sync send producers without a window


git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@559915 13f79535-47bb-0310-9956-ffa450edef68
2007-07-26 18:07:16 +00:00
Hiram R. Chirino 3b88ba0c47 Fix for AMQ-1344 - Deadlock can occur when cerating and deleting many destinations concurrently
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@559155 13f79535-47bb-0310-9956-ffa450edef68
2007-07-24 18:27:49 +00:00
Hiram R. Chirino 76b2a3ed8f Fix for AMQ-1343 - Network conntions not shutdown propertly when a InvalidClientIDException occurs
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@559139 13f79535-47bb-0310-9956-ffa450edef68
2007-07-24 17:51:32 +00:00
Hiram R. Chirino 7c94a73ba6 Fix for AMQ-1342 - Added backoff delay in generating discovery events when broker failures are reported
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@559132 13f79535-47bb-0310-9956-ffa450edef68
2007-07-24 17:43:26 +00:00
Hiram R. Chirino 97a591f08f Fix for AMQ-1341 - Improve the InvalidClientIDException message so that we know where the previous connection was established from.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@559111 13f79535-47bb-0310-9956-ffa450edef68
2007-07-24 17:08:31 +00:00
Hiram R. Chirino 5a3a45f0c0 Fix for AMQ-1340 - Thread gets stuck in a WAIT and never returns
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@559092 13f79535-47bb-0310-9956-ffa450edef68
2007-07-24 16:19:43 +00:00
Hiram R. Chirino 8f6fac7f1b Fix for AMQ-1339 - Give the connection dispatcher threads names that are easy to associate with the peer.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@559071 13f79535-47bb-0310-9956-ffa450edef68
2007-07-24 15:01:32 +00:00
Hiram R. Chirino 3a7c673dec https://issues.apache.org/activemq/browse/AMQ-1337 - Broker should finish accepting connection in an async thread.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@558814 13f79535-47bb-0310-9956-ffa450edef68
2007-07-23 18:02:41 +00:00
Robert Davies 20364163e9 applied patch for https://issues.apache.org/activemq/browse/AMQ-1254
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@558774 13f79535-47bb-0310-9956-ffa450edef68
2007-07-23 15:27:43 +00:00
Hiram R. Chirino 6ce8c3bf87 AMQ-1335 - Exclusive consumers are now selected up front when the consumer gets registered.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@558767 13f79535-47bb-0310-9956-ffa450edef68
2007-07-23 15:09:28 +00:00
Robert Davies a414c20dcb Fix for:
http://issues.apache.org/activemq/browse/AMQ-1207
http://issues.apache.org/activemq/browse/AMQ-880
http://issues.apache.org/activemq/browse/AMQ-450
http://issues.apache.org/activemq/browse/AMQ-879

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@558054 13f79535-47bb-0310-9956-ffa450edef68
2007-07-20 17:08:10 +00:00
Robert Davies cfdc5e3de3 fix null pointer in test case
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@558052 13f79535-47bb-0310-9956-ffa450edef68
2007-07-20 17:03:39 +00:00
Robert Davies 2d5bb84a47 Applying patch for http://issues.apache.org/activemq/browse/AMQ-1323
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@558044 13f79535-47bb-0310-9956-ffa450edef68
2007-07-20 16:47:40 +00:00
Robert Davies 83a6eff431 move decision about being a slave from the Broker to the ConnectionContext - so can be done on a Connection basis if required
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@557748 13f79535-47bb-0310-9956-ffa450edef68
2007-07-19 19:24:31 +00:00
Robert Davies 993f78caac persist in-progress XA transactions - in order to speed up recovery
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@557391 13f79535-47bb-0310-9956-ffa450edef68
2007-07-18 20:34:19 +00:00
Robert Davies 2438ada6ad Split out Transaction class from AMQTrandactionStore -
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@557389 13f79535-47bb-0310-9956-ffa450edef68
2007-07-18 20:32:45 +00:00
Robert Davies 3d1fca08fe Added some java doc
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@557386 13f79535-47bb-0310-9956-ffa450edef68
2007-07-18 20:31:09 +00:00
Robert Davies 3cfa0b6e4d Add a CommandMarshaller
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@557385 13f79535-47bb-0310-9956-ffa450edef68
2007-07-18 20:30:21 +00:00
Robert Davies 71a3324b93 implement Comparable (well, badly)
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@557384 13f79535-47bb-0310-9956-ffa450edef68
2007-07-18 20:29:13 +00:00