Commit Graph

319 Commits

Author SHA1 Message Date
Hiram R. Chirino c1f5c77e62 part of package refactor
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@359578 13f79535-47bb-0310-9956-ffa450edef68
2005-12-28 17:49:50 +00:00
Hiram R. Chirino d29ca2a71b Refactor org.activemq -> org.apache.activemq
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@359567 13f79535-47bb-0310-9956-ffa450edef68
2005-12-28 17:24:02 +00:00
James Strachan 3062f751d7 added extra jar for testing of connection pool
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@359549 13f79535-47bb-0310-9956-ffa450edef68
2005-12-28 15:34:58 +00:00
Hiram R. Chirino a59fee46d5 Do better handling of the reference counting during dispatch.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@359548 13f79535-47bb-0310-9956-ffa450edef68
2005-12-28 15:34:06 +00:00
James Strachan e58897bd69 minor refactor to provide a hook when dispatching messages which have no consumers; so that we can for example, send them to a dead letter queue
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@359547 13f79535-47bb-0310-9956-ffa450edef68
2005-12-28 15:33:05 +00:00
Hiram R. Chirino 1e0bbfc3ed more m2 pom changes
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@359543 13f79535-47bb-0310-9956-ffa450edef68
2005-12-28 15:25:44 +00:00
Hiram R. Chirino 62b2f7fe53 Applying patch suggested by sanders@apache.org to fix stomp priority bug.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@359240 13f79535-47bb-0310-9956-ffa450edef68
2005-12-27 16:49:20 +00:00
Hiram R. Chirino 5cea195af2 Applied patch suggested by marcusp@absa.co.za on the dev mailing list.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@359239 13f79535-47bb-0310-9956-ffa450edef68
2005-12-27 16:47:56 +00:00
Adrian T. Co 5444ef92e1 Rollback changes to incrementReferenceCount, but maintained the incrementPreloadSize
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@359152 13f79535-47bb-0310-9956-ffa450edef68
2005-12-27 01:11:43 +00:00
Hiram R. Chirino a2601e64fe Marcus reported on the mailing list that we need to provide dispatching behaviour like 3.x did to work on webshere 5.x
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@358824 13f79535-47bb-0310-9956-ffa450edef68
2005-12-23 16:12:49 +00:00
Hiram R. Chirino 2c4274b997 Marcus reported on the mailing list that we need to provide dispatching behaviour like 3.x did to work on webshere 5.x
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@358823 13f79535-47bb-0310-9956-ffa450edef68
2005-12-23 16:10:53 +00:00
Adrian T. Co 29a6b9d1f6 Postpone incrementing of reference count and preload size, only after we are sure that the message will be dispatched by the current subscription. This is to prevent a memory leak type of scenario.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@358785 13f79535-47bb-0310-9956-ffa450edef68
2005-12-23 09:47:47 +00:00
Hiram R. Chirino bd17e0385f the login.config is at the root of the resouces dir. so use the class's classload to get the resource.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@358602 13f79535-47bb-0310-9956-ffa450edef68
2005-12-22 18:20:51 +00:00
Guillaume Nodet 3621f25504 Fix ClassCastException in pool
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@358598 13f79535-47bb-0310-9956-ffa450edef68
2005-12-22 18:01:52 +00:00
Hiram R. Chirino 749c76d57f applied bill dudney's sugestion to fix m2 build so that it works from activemq-project
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@358584 13f79535-47bb-0310-9956-ffa450edef68
2005-12-22 16:23:33 +00:00
Hiram R. Chirino 18dd4cd867 Fixed and added test cases for the consumer start() stop() methods.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@358579 13f79535-47bb-0310-9956-ffa450edef68
2005-12-22 15:43:42 +00:00
Adrian T. Co 841d99ee0f Added an AutoFailTestSupport as the super class of CombinationTestSupport. If enabled, this enforces each test case to run only on a predefined time frame (by default 5 mins). After the allotted time, a separate thread will force the vm to exit abnormally to prevent hanging the test case. The AutoFailTestSupport is disabled by default. Should be noted, when the test case exits abnormally, no output is written to the test reports, but there is output in the log4j log file.
Enabled auto fail for ProxyConnectorTest and DiscoveryTransportBrokerTest. Added ProxyConnectorTest to testing.

Propagated the setUp and tearDown method in BrokerTestSupport.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@358539 13f79535-47bb-0310-9956-ffa450edef68
2005-12-22 09:14:26 +00:00
Jonas B. Lim 92a698fe42 updated headers in source file to use apache header
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@358513 13f79535-47bb-0310-9956-ffa450edef68
2005-12-22 06:11:40 +00:00
Hiram R. Chirino d9201ada52 Enhanced the pom so that it generates the xbean metadata and uses javacc to build the selectors
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@358505 13f79535-47bb-0310-9956-ffa450edef68
2005-12-22 05:43:38 +00:00
Hiram R. Chirino 8935d82036 remove the java 5 dependency.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@358485 13f79535-47bb-0310-9956-ffa450edef68
2005-12-22 04:27:28 +00:00
Hiram R. Chirino 2457c42d7e More m2 build tweeks, brought in the activemq-optional module.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@358476 13f79535-47bb-0310-9956-ffa450edef68
2005-12-22 03:43:57 +00:00
Hiram R. Chirino 9e02d70011 tweeking the m2 build
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@358446 13f79535-47bb-0310-9956-ffa450edef68
2005-12-22 02:47:39 +00:00
Frederick G. Oconer 7497ba459b removed from default goal the creation javadoc api.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@358427 13f79535-47bb-0310-9956-ffa450edef68
2005-12-22 00:57:43 +00:00
Hiram R. Chirino bd66398a29 Applied patch at https://jira.logicblaze.com/jira/browse/AMQ-442
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@358392 13f79535-47bb-0310-9956-ffa450edef68
2005-12-21 21:43:55 +00:00
Hiram R. Chirino 22474cd541 Fixed: https://jira.logicblaze.com/jira/browse/AMQ-426
JMS api object now implement a toString() that can be used to correlate back to log messages on the message broker.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@358371 13f79535-47bb-0310-9956-ffa450edef68
2005-12-21 20:43:50 +00:00
Hiram R. Chirino 2040c9d75c reverted.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@358361 13f79535-47bb-0310-9956-ffa450edef68
2005-12-21 19:46:42 +00:00
Hiram R. Chirino f71b60f16b Got the stomp SUBSCRIBE test case working.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@358349 13f79535-47bb-0310-9956-ffa450edef68
2005-12-21 19:23:20 +00:00
James Strachan bd60590273 added a test case and fixes for the pooled connection factory. AMQ-449
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@358280 13f79535-47bb-0310-9956-ffa450edef68
2005-12-21 12:53:30 +00:00
Adrian T. Co 75a6b834b9 Added a basic mean to query the jmx context. Performed a little code restructuring and bug fixing. Type "query --help" for details.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@358241 13f79535-47bb-0310-9956-ffa450edef68
2005-12-21 09:31:18 +00:00
Hiram R. Chirino 230e459b26 Get the stomp wireformat working again and added some more tests to verify that it is working.
The stomp transport factory just reuses the tcp transport and sets the wireformat to be stomp.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@358217 13f79535-47bb-0310-9956-ffa450edef68
2005-12-21 05:45:09 +00:00
Hiram R. Chirino b6eb3a6319 only use the wire format negociator if needed.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@358216 13f79535-47bb-0310-9956-ffa450edef68
2005-12-21 05:43:16 +00:00
Frederick G. Oconer d0e9fa2990 renamed goal that deploys the xsd generated files to a more appropriate name.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@358207 13f79535-47bb-0310-9956-ffa450edef68
2005-12-21 05:01:08 +00:00
Hiram R. Chirino 8032ef40be - updated openwire marshalers.
- added some more toString() methods to the transports
- Fixed up the advisories so that duplicate consumer infos are not sent
- Changed the demand forwarding bridge so that loop back message filtering occurs in the broker instead of on the bridge


git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@358056 13f79535-47bb-0310-9956-ffa450edef68
2005-12-20 18:05:38 +00:00
James Strachan 35b8ea9308 Applied Bills patch for m2 build
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@358008 13f79535-47bb-0310-9956-ffa450edef68
2005-12-20 14:50:52 +00:00
James Strachan 2ab55ddb1d added WebSphere 5.1 version of a JNDI context that works nicely with ActiveMQ
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@357969 13f79535-47bb-0310-9956-ffa450edef68
2005-12-20 12:28:05 +00:00
Adrian T. Co dad9a3bf76 Re-removed old config documentation.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@357949 13f79535-47bb-0310-9956-ffa450edef68
2005-12-20 10:20:22 +00:00
Adrian T. Co 84a0179081 Added broker shutdown mechanism. Some exceptions are being thrown during shutdown, but doesn't seem to cause any problem. Printing of exceptions are currently disabled.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@357932 13f79535-47bb-0310-9956-ffa450edef68
2005-12-20 07:15:13 +00:00
Frederick G. Oconer 496be9c60e Added goal that will deploy core test and javadoc jars files and xbean generated files.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@357930 13f79535-47bb-0310-9956-ffa450edef68
2005-12-20 07:08:21 +00:00
Hiram R. Chirino ee0f2e3fd5 update lic header to match apache standard.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@357807 13f79535-47bb-0310-9956-ffa450edef68
2005-12-19 21:30:58 +00:00
James Strachan a71263c1e5 removed some old cruft
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@357739 13f79535-47bb-0310-9956-ffa450edef68
2005-12-19 18:00:21 +00:00
James Strachan 8b1f5a7202 * added test case to demonstrate query-based subscription recovery policy in action.
* minor refactor to the SubscriptionRecoveryPolicy API to make it easy to generate messages from inside the recovery policy

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@357732 13f79535-47bb-0310-9956-ffa450edef68
2005-12-19 17:43:22 +00:00
Hiram R. Chirino 99ee7f85ef make public to fix build
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@357727 13f79535-47bb-0310-9956-ffa450edef68
2005-12-19 17:20:57 +00:00
James Strachan 298ccf2a77 avoided NPE in a number of test cases
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@357717 13f79535-47bb-0310-9956-ffa450edef68
2005-12-19 16:19:51 +00:00
James Strachan 7c7cca9dfb added a helper class and strategy method for people wishing to implement their own custom MessageQuery strategies to be fired as a new subscriber is created
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@357712 13f79535-47bb-0310-9956-ffa450edef68
2005-12-19 15:54:17 +00:00
James Strachan 384e290b7f added enqueue/dequeue statistics at the Connection/Connector level in JMX
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@357683 13f79535-47bb-0310-9956-ffa450edef68
2005-12-19 12:22:09 +00:00
Frederick G. Oconer 0bf5ab3724 Added goal that will deploy activemq-core-test-<vrsn>.jar
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@357668 13f79535-47bb-0310-9956-ffa450edef68
2005-12-19 09:07:34 +00:00
James Strachan 24389c4929 added some more JMX stats
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@357195 13f79535-47bb-0310-9956-ffa450edef68
2005-12-16 17:48:33 +00:00
James Strachan 2c6156085c removed dead code
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@357194 13f79535-47bb-0310-9956-ffa450edef68
2005-12-16 17:48:17 +00:00
James Strachan bf65e7d3cf rolled back the use of ObjectName.quote() as it appends quotes and went back to Hiram's original code which looks much nicer in JMX consoles :)
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@357184 13f79535-47bb-0310-9956-ffa450edef68
2005-12-16 17:08:15 +00:00
Robert Davies 634ac91c3d son't use createMBean() on jmx server as class might not be in the same class loader
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@357174 13f79535-47bb-0310-9956-ffa450edef68
2005-12-16 15:54:54 +00:00
James Strachan 0d6f94b93d allow multiple calls to start() as its quite easy to do these days with all the different configuration mechanisms (URI, spring, xbean, command line)
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@357158 13f79535-47bb-0310-9956-ffa450edef68
2005-12-16 13:56:13 +00:00
Robert Davies 0f36e0231e Added a comment
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@357146 13f79535-47bb-0310-9956-ffa450edef68
2005-12-16 09:17:42 +00:00
James Strachan a37a074c81 tidied up the XBean factory bean to avoid it owning and closing the contained context.
also by default the broker is started when using the XML file

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@357018 13f79535-47bb-0310-9956-ffa450edef68
2005-12-15 14:15:18 +00:00
James Strachan db0855c342 make the agent more resilient to ordering; whether a service is registered before starting or started first etc. We seem to have both in our code base
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@357017 13f79535-47bb-0310-9956-ffa450edef68
2005-12-15 14:13:14 +00:00
James Strachan 20038a8264 updated javadoc
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@356833 13f79535-47bb-0310-9956-ffa450edef68
2005-12-14 19:15:44 +00:00
James Strachan 5cba8d744d better logging on startup to reveal the journal configuration
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@356827 13f79535-47bb-0310-9956-ffa450edef68
2005-12-14 19:00:44 +00:00
James Strachan 9fb8ee2dca added test case which demonstrates that you can start a JMS connection even when the broker is not there
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@356815 13f79535-47bb-0310-9956-ffa450edef68
2005-12-14 17:35:27 +00:00
James Strachan f1bbfd3201 fixed bug that prevented the initialReconnectDelay value from being changed
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@356814 13f79535-47bb-0310-9956-ffa450edef68
2005-12-14 17:34:16 +00:00
Hiram R. Chirino 9b1345bb32 - Updated the config xml to use new discovery syntax.
- Using specific version of activeio as that may change a bit soon.
- The vm transport now support specifing a broker config file: vm://localhost?brokerConfig=xbean:/path/to/config/file
- Starting the JMX connector was taking a LONG time to start up... so I switch to starting it up async.
- The object name for a managed transport connection could be invalid so we now encode the name so that it's not.



git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@356616 13f79535-47bb-0310-9956-ffa450edef68
2005-12-13 21:02:04 +00:00
James Strachan a558fef374 use the standard JMX quote method when creating JMX names
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@356559 13f79535-47bb-0310-9956-ffa450edef68
2005-12-13 18:15:36 +00:00
James Strachan 687bf43d9f added a ConsumerListener so that you can listen to consumers coming and going easily (hiding the details of the Advisories behind a simple Bean API) as well as be notified on exactly how many consumers there are to be able to drive demand based publishing etc
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@356524 13f79535-47bb-0310-9956-ffa450edef68
2005-12-13 16:21:32 +00:00
James Strachan e1cfbad4bc added test case for using the BrokerService with JMX
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@356523 13f79535-47bb-0310-9956-ffa450edef68
2005-12-13 16:20:38 +00:00
James Strachan 1835e45369 added some helper methods to make it easy to see the type of removal event
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@356522 13f79535-47bb-0310-9956-ffa450edef68
2005-12-13 16:20:11 +00:00
James Strachan ecfbe6168d avoid persistence and TCP by default in test cases
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@356521 13f79535-47bb-0310-9956-ffa450edef68
2005-12-13 16:19:37 +00:00
James Strachan 507bb1bbab fixed bug where setting the clientID on the MBean ObjectName could break a JMX name
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@356520 13f79535-47bb-0310-9956-ffa450edef68
2005-12-13 16:19:06 +00:00
James Strachan 262a5596d9 optimisation; if a JMS exception has already been thrown then don't wrap it again
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@356519 13f79535-47bb-0310-9956-ffa450edef68
2005-12-13 16:18:23 +00:00
James Strachan ab8f458612 removed old configuration documentation
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@356518 13f79535-47bb-0310-9956-ffa450edef68
2005-12-13 16:17:50 +00:00
James Strachan 8f40a7eeca removed old configuration documentation
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@356517 13f79535-47bb-0310-9956-ffa450edef68
2005-12-13 16:17:31 +00:00
James Strachan 40a7d3b6ac Moved the trunk code into the trunk sub directory
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@356304 13f79535-47bb-0310-9956-ffa450edef68
2005-12-12 17:53:59 +00:00