Commit Graph

653 Commits

Author SHA1 Message Date
James Strachan 2ed21cedd0 removed a couple of possible concurrent accesses of the message collection
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@390041 13f79535-47bb-0310-9956-ffa450edef68
2006-03-30 09:15:47 +00:00
Frederick G. Oconer b8b2258fc7 Fix for maven 2 builds and organized the dependencies.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@389950 13f79535-47bb-0310-9956-ffa450edef68
2006-03-30 01:12:00 +00:00
Hiram R. Chirino 18d616c8db - Since we now have per destination usage managers, I updated the MessageStore API so that each destination's store can be maded aware of the manager for that store.
Some stores like the journal hold messages around and use the usage manager to know when it should flush to disk.
- Moved alot of the message reference counting logic from the PrefetchSubscription up to it's subclasses since they all seem to do it just a slightly different way.
  I think it makes easier to see now how the usage manager is affected by operations.
- I fixed and verifed that the keepDurableSubsActive=true option actually works.  I think we should make this the default setting since it
  make recovery safer.  Once we have a better spooling implementation we can turn if off again.


git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@389941 13f79535-47bb-0310-9956-ffa450edef68
2006-03-30 00:36:21 +00:00
Hiram R. Chirino f1e3420e1d better debug so we can see the sql statement being executed.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@389893 13f79535-47bb-0310-9956-ffa450edef68
2006-03-29 21:20:57 +00:00
Hiram R. Chirino 38d8b832ef Better content-length handling.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@389845 13f79535-47bb-0310-9956-ffa450edef68
2006-03-29 17:52:01 +00:00
Hiram R. Chirino c80b084cdc Use the JMS methods to get the bytes in a BytesMessage since those decompress the payload if the content was compressed.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@389841 13f79535-47bb-0310-9956-ffa450edef68
2006-03-29 17:26:58 +00:00
Hiram R. Chirino 449981be9d Working on https://issues.apache.org/activemq/browse/AMQ-669
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@389614 13f79535-47bb-0310-9956-ffa450edef68
2006-03-28 22:10:34 +00:00
James Strachan 8c20a11a43 tidied up the connection/producer/consumer/destination visualisation
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@389554 13f79535-47bb-0310-9956-ffa450edef68
2006-03-28 17:48:15 +00:00
Hiram R. Chirino 0797d088d3 https://issues.apache.org/activemq/browse/AMQ-660
adding support for MaxDB

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@389551 13f79535-47bb-0310-9956-ffa450edef68
2006-03-28 17:23:55 +00:00
James Strachan 24404740a1 moved the SSL transport into the main core module and switched to using our own TCP transport by default (as well as refactoring to make the [Server]SocketFactory objects pluggable
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@389536 13f79535-47bb-0310-9956-ffa450edef68
2006-03-28 16:29:41 +00:00
James Strachan 2a076d0710 added some test cases (that are not yet working) for reliable UDP
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@389533 13f79535-47bb-0310-9956-ffa450edef68
2006-03-28 16:19:23 +00:00
James Strachan d1a18f5787 added extra visualisation plugin; to render the broker, connections, sessions, consumers in a DOT graph
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@389519 13f79535-47bb-0310-9956-ffa450edef68
2006-03-28 15:27:55 +00:00
Hiram R. Chirino 28316bb0bb Fix for http://issues.apache.org/activemq/browse/AMQ-659
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@389258 13f79535-47bb-0310-9956-ffa450edef68
2006-03-27 20:29:56 +00:00
James Strachan 4ba19cad18 minor refactor to share code
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@389021 13f79535-47bb-0310-9956-ffa450edef68
2006-03-27 04:53:51 +00:00
James Strachan 5bed19f1c5 tidied up some cruft
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@389020 13f79535-47bb-0310-9956-ffa450edef68
2006-03-27 04:37:11 +00:00
James Strachan 694120cd29 made the destination map easier to navigate
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@389019 13f79535-47bb-0310-9956-ffa450edef68
2006-03-27 04:33:40 +00:00
James Strachan d84e0521ea added a visualisation plugin to render the current queue and topic hierarchies graphically
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@389018 13f79535-47bb-0310-9956-ffa450edef68
2006-03-27 04:33:08 +00:00
Hiram R. Chirino 90bab0fcf4 Fix for
https://issues.apache.org/activemq/browse/AMQ-661

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@389007 13f79535-47bb-0310-9956-ffa450edef68
2006-03-27 02:21:17 +00:00
Robert Davies a9c49a7f16 Fix for http://jira.activemq.org/jira/browse/AMQ-487
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@388714 13f79535-47bb-0310-9956-ffa450edef68
2006-03-25 06:55:33 +00:00
Hiram R. Chirino f451ad04bf - Switched the m2 builds to use maven-one-plugin so that the activeio jars can be used in the maven 1 build activemq is using.
- the m2 build now uses the same groupId that our m1 activemq build is using.  I know it's not the m2 way to name groups, we I'm willing to live with this until we are out of the incubator and using m2 to do builds by default.
- Ported activemq to use activeio 3.0-SNAPSHOT from activeio 2.1, since the 3.x stuff is in a new package space, it should not conflict with previous version (for example the version used in Geronimo).



git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@388677 13f79535-47bb-0310-9956-ffa450edef68
2006-03-24 23:41:23 +00:00
Hiram R. Chirino 26bb18ba8c Added a way to get the socket address that a transport server is accepting connection on. Needed by gbean modules.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@388202 13f79535-47bb-0310-9956-ffa450edef68
2006-03-23 16:37:45 +00:00
Hiram R. Chirino 5bd451b91c removed unused property.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@388190 13f79535-47bb-0310-9956-ffa450edef68
2006-03-23 15:23:28 +00:00
James Strachan 75bffcb008 applied patch from John Sissons
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@388176 13f79535-47bb-0310-9956-ffa450edef68
2006-03-23 14:15:51 +00:00
Hiram R. Chirino 61fef743e8 If multiple concurrent threads were creating vm://localhost connection, it was possible multiple "localhost" broker would be started.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@388082 13f79535-47bb-0310-9956-ffa450edef68
2006-03-23 07:24:28 +00:00
Hiram R. Chirino 47f2bb7cc2 Avoid starting a persistence adapter if the broker is stop()ed before once has been created.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@388081 13f79535-47bb-0310-9956-ffa450edef68
2006-03-23 07:23:33 +00:00
Hiram R. Chirino 6412d6526a Avoid NPE
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@388079 13f79535-47bb-0310-9956-ffa450edef68
2006-03-23 07:22:21 +00:00
Hiram R. Chirino ea7dd79062 Li, Fan <fanli@amazon.com> reported to the mailing list that the connector id was not being incremented.
fixed.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@387930 13f79535-47bb-0310-9956-ffa450edef68
2006-03-22 20:25:45 +00:00
Hiram R. Chirino e94ba16710 Updated m2 build to use latest geronimo spec jars
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@387924 13f79535-47bb-0310-9956-ffa450edef68
2006-03-22 19:52:39 +00:00
Hiram R. Chirino 4c96523c6a adding a log debugging statement so that if table creation fails we have some hopes of seeing what the statement looked like that failed.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@387908 13f79535-47bb-0310-9956-ffa450edef68
2006-03-22 18:22:30 +00:00
Hiram R. Chirino aecbd1c3f2 did a bunch of svn propset svn:eol-style native
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@387665 13f79535-47bb-0310-9956-ffa450edef68
2006-03-21 23:20:55 +00:00
Hiram R. Chirino 261b455078 these tests were failing on windows where File.delete fails if the file is still open.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@387663 13f79535-47bb-0310-9956-ffa450edef68
2006-03-21 23:14:22 +00:00
Hiram R. Chirino a255628557 clear the list after the sleep so that any left over messages are drained.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@387632 13f79535-47bb-0310-9956-ffa450edef68
2006-03-21 21:44:15 +00:00
Hiram R. Chirino 12cea50f15 removed debugging println
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@387609 13f79535-47bb-0310-9956-ffa450edef68
2006-03-21 19:59:21 +00:00
Robert Davies 739d12ac20 bad commit - removing files
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@387592 13f79535-47bb-0310-9956-ffa450edef68
2006-03-21 18:04:05 +00:00
Robert Davies d56eda03db dumping first cut of kaha in SVN
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@387586 13f79535-47bb-0310-9956-ffa450edef68
2006-03-21 17:21:33 +00:00
Hiram R. Chirino 94e8cf4922 no need to configure the maxInactivityDuration since it is controlled using a WireFormatInfo.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@387570 13f79535-47bb-0310-9956-ffa450edef68
2006-03-21 16:16:23 +00:00
Hiram R. Chirino ef0c0e1f87 http://jira.activemq.org/jira/browse/AMQ-643
The maxInactivityDuration is now negociated using the WireFormatInfo.  This makes it easier to configure connections since client and server configs do not HAVE to match up excactly.


git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@387566 13f79535-47bb-0310-9956-ffa450edef68
2006-03-21 16:12:31 +00:00
Hiram R. Chirino a5ee130bea Allow previous messages to drain before doing the real test. (makes the test more reliable)
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@387563 13f79535-47bb-0310-9956-ffa450edef68
2006-03-21 16:09:33 +00:00
Hiram R. Chirino 4757b273d1 removed the preLoadLimit logic since it was causing the RoundRobingDispatchPolicyTests to fail intermitently. The preLoadLimit was an additional prefetch limit, and when it kicked in,
it would cause the round robin distribution to stop sending round robin.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@387562 13f79535-47bb-0310-9956-ffa450edef68
2006-03-21 16:08:40 +00:00
Hiram R. Chirino 1b60ebbea5 Applied patch at: http://jira.activemq.org/jira/browse/AMQ-632
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@387561 13f79535-47bb-0310-9956-ffa450edef68
2006-03-21 16:07:56 +00:00
Hiram R. Chirino b1cd2b9ec2 flowControlSleepTime was not used.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@387559 13f79535-47bb-0310-9956-ffa450edef68
2006-03-21 16:06:57 +00:00
Hiram R. Chirino 7ae0081e7e ignore the KeepAlives
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@387555 13f79535-47bb-0310-9956-ffa450edef68
2006-03-21 15:55:06 +00:00
James Strachan cff515e024 removed some unnecessary cruft
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@387532 13f79535-47bb-0310-9956-ffa450edef68
2006-03-21 14:12:51 +00:00
James Strachan 0cc5d24dcb made more properties public; "closing", "closed" and "transportFailed"
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@387531 13f79535-47bb-0310-9956-ffa450edef68
2006-03-21 14:12:05 +00:00
Adrian T. Co 15101c7fbb - Fix message serialization problem using xstream.
- Added some more http test cases.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@387470 13f79535-47bb-0310-9956-ffa450edef68
2006-03-21 09:37:12 +00:00
Hiram R. Chirino cb3f774613 Doing a sleep inside the send loop makes TwoBrokerTopicSendReceiveLotsOfMessagesUsingTcpTest take forever!
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@387417 13f79535-47bb-0310-9956-ffa450edef68
2006-03-21 05:14:04 +00:00
James Strachan f3ef1a9a31 refactored LastPartialCommand so that it is-a PartialCommand so can contain data and should marshal just the same as the PartialCommand; this solves the double-datagram issue when closing a partial command stream
also refactored the reliable transport some more so that it is close to working; should have test cases working soon...

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@387385 13f79535-47bb-0310-9956-ffa450edef68
2006-03-21 02:49:00 +00:00
Adrian T. Co 27ec68d22d - Added checking for NPE
- Added newline in maven.xml

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@386960 13f79535-47bb-0310-9956-ffa450edef68
2006-03-19 12:48:32 +00:00
Darwin G. Flores b182afbe46 git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@386808 13f79535-47bb-0310-9956-ffa450edef68 2006-03-18 04:31:17 +00:00
Adrian T. Co 4f7235d964 - Setup keystores for ssl used by ConfigTest.java
- Prevented NullPointerException in MemoryPersistenceAdapter

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@386769 13f79535-47bb-0310-9956-ffa450edef68
2006-03-18 00:13:56 +00:00
Adrian T. Co 9920d70580 - Send the ConnectionInfo first before sending the BrokerInfo in the DemandForwardingBridge, so it would work in http.
- Enabled the TwoBrokerTopicSendReceiveUsingHttpTest.
- Added a sleep to the test to give jetty enough time to setup before sending messages.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@386738 13f79535-47bb-0310-9956-ffa450edef68
2006-03-17 22:09:11 +00:00
Hiram R. Chirino 257f16a0bb The default should be failover=false. We can't assume that normal configurations will use broker nodes that never fail.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@386670 13f79535-47bb-0310-9956-ffa450edef68
2006-03-17 16:43:21 +00:00
James Strachan c559a8093f fix for AMQ-600 to detect IOExceptions as being transport exceptions, not service exceptions (which are normally things like JMSException or security exceptions etc) and then disposing the connection eagerly - to free up the clientID so that the client can reconnect
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@386610 13f79535-47bb-0310-9956-ffa450edef68
2006-03-17 11:19:12 +00:00
James Strachan 2bc9a83508 patch for AMQ-600 to catch IOException caused by attempts to dispatch synchronously to a connection on a dead socket and treat them as a transport exception (rather than service exception), disposing the connection so that clientID's can be reused
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@386608 13f79535-47bb-0310-9956-ffa450edef68
2006-03-17 11:14:11 +00:00
Adrian T. Co 635e6e7445 - Perform the actual setup of the connectors when it is actually started.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@386603 13f79535-47bb-0310-9956-ffa450edef68
2006-03-17 10:38:02 +00:00
James Strachan a876eb3789 latest generated openwire
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@386589 13f79535-47bb-0310-9956-ffa450edef68
2006-03-17 09:19:33 +00:00
James Strachan cfbb3c852a fix for AMQ-627 to always catch and deal with interupted exceptions
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@386586 13f79535-47bb-0310-9956-ffa450edef68
2006-03-17 09:15:38 +00:00
James Strachan 15550b812a latest generated openwire
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@386585 13f79535-47bb-0310-9956-ffa450edef68
2006-03-17 09:15:15 +00:00
James Strachan 3d07b93074 enforce loop back mode false
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@386583 13f79535-47bb-0310-9956-ffa450edef68
2006-03-17 09:13:31 +00:00
James Strachan 0ae30b3e87 added a few more properties to the multicast transport
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@386581 13f79535-47bb-0310-9956-ffa450edef68
2006-03-17 09:10:23 +00:00
Hiram R. Chirino 47853d3584 Fix for http://jira.activemq.org/jira/browse/AMQ-639
The NetworkConnector was not removing the old bridge for the map of bridges that he was mantinaing,
so when the remote broker came back up, then the bridge was not restarted.

Also add a new ConnectionFilter interface which allows the broker to avoid establishing loopback connections.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@386507 13f79535-47bb-0310-9956-ffa450edef68
2006-03-17 02:24:29 +00:00
Hiram R. Chirino d77e665ed7 Deliver the events to the DiscoveryListener async to the mutlicast/heartbeating thread so that that if the
DiscoveryListener blocks for while (like if he is being debuged) then we don't erroniously assume that memebrs
int the group have timed out. 

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@386506 13f79535-47bb-0310-9956-ffa450edef68
2006-03-17 02:22:04 +00:00
Hiram R. Chirino 24235a99e4 limit the child when the parent is limited.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@386504 13f79535-47bb-0310-9956-ffa450edef68
2006-03-17 02:11:34 +00:00
James Strachan 2b1a0f0c94 updated to use the class name "BaseDataStructure" so that generated code mimicks the class structure of the Java code to avoid getting confused
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@386442 13f79535-47bb-0310-9956-ffa450edef68
2006-03-16 19:48:46 +00:00
James Strachan 05ea5d4795 added test case for closing just the session
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@386382 13f79535-47bb-0310-9956-ffa450edef68
2006-03-16 17:06:09 +00:00
Hiram R. Chirino baab4b209e Also set the dispatchAsync when using connection consumers (use in MDB dispatching).
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@386335 13f79535-47bb-0310-9956-ffa450edef68
2006-03-16 14:11:00 +00:00
Hiram R. Chirino 4e15e1b177 fixed spelling.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@386274 13f79535-47bb-0310-9956-ffa450edef68
2006-03-16 06:17:01 +00:00
Hiram R. Chirino 38f7b126d6 Made the peer test a little more reliable by using consumer advisory messages to know when the peers have fully connected in the cluster.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@386258 13f79535-47bb-0310-9956-ffa450edef68
2006-03-16 04:47:34 +00:00
James Strachan 70f9d61313 fixed bug which was exposed by the Stomp Ruby client. (We could really do with a maven integration build project that runs the C, C++, C# and Ruby code against a running broker)
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@386215 13f79535-47bb-0310-9956-ffa450edef68
2006-03-15 23:29:39 +00:00
James Strachan de74d7ac72 added a stomp connector to the little debug broker program
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@386209 13f79535-47bb-0310-9956-ffa450edef68
2006-03-15 23:19:02 +00:00
Hiram R. Chirino 36722d8774 Applied patch in http://jira.activemq.org/jira/browse/AMQ-633
Thanks Brian Diesenhaus!

Also exposed the memory limits and usage via JMX and allowed the limit to be configured via a destination policy.



git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@386199 13f79535-47bb-0310-9956-ffa450edef68
2006-03-15 22:45:38 +00:00
James Strachan 8d589ec6fa added a replay buffer to the ReliableTransport so that nodes with missing messages can re-request stuff
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@386198 13f79535-47bb-0310-9956-ffa450edef68
2006-03-15 22:43:40 +00:00
James Strachan 3dd6d8afcb cache around endpoints so that they are reused - so that networks using brokerIds & brokerInfos can store the state on the endpoint
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@386196 13f79535-47bb-0310-9956-ffa450edef68
2006-03-15 22:41:53 +00:00
Hiram R. Chirino 6a89f08c4f disable the use of range acks with network connectors since that could cause the broker to block waiting for messages to be consumed (in the case of big messages being sent).
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@386132 13f79535-47bb-0310-9956-ffa450edef68
2006-03-15 19:04:32 +00:00
Hiram R. Chirino 6994361f80 Get the connonical path so that we we debug, when know the explicit path to the data files.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@386129 13f79535-47bb-0310-9956-ffa450edef68
2006-03-15 18:54:34 +00:00
James Strachan 400b1fca09 refactor of the DemandForwardingBridge so that a multicast-based network can be created (or any other multiplexing transport can be used to create a netowrk)
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@386100 13f79535-47bb-0310-9956-ffa450edef68
2006-03-15 16:03:34 +00:00
James Strachan 1629774d27 added logging if we can't properly cast things when closing things down
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@386099 13f79535-47bb-0310-9956-ffa450edef68
2006-03-15 16:02:20 +00:00
Hiram R. Chirino 3c09f0cba5 Be more carefull about how long we wait for the test to timeout
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@386092 13f79535-47bb-0310-9956-ffa450edef68
2006-03-15 15:15:29 +00:00
James Strachan 9c19776c17 catch interupted exceptions
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@386076 13f79535-47bb-0310-9956-ffa450edef68
2006-03-15 14:14:29 +00:00
Adrian T. Co a2fc7a2dc0 - Fix error in stub connection to prevent HttpTransportBrokerTest to hang.
- Enabled test cases. (This is passing for me now, both in maven and in my IDE. Have to see how it does in the boxes.)
- Increase the logging level to error in HttpTransport. (Exceptions could be critical in that section. Better informed i guess.)
- Just a note: HttpsTransportBrokerTest takes around 13mins in my machine to run. (It could be too long for a test case. 137 test cases * 5 secs to setup jetty each time + actual processing time.)

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@386013 13f79535-47bb-0310-9956-ffa450edef68
2006-03-15 09:26:12 +00:00
James Strachan 687a45a516 minor refactor to allow composite demand forwarding bridge implementations
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@385861 13f79535-47bb-0310-9956-ffa450edef68
2006-03-14 19:27:41 +00:00
James Strachan 364337b9aa refactor of the UDP transport to enable the ReliableTransport by default
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@385826 13f79535-47bb-0310-9956-ffa450edef68
2006-03-14 16:34:34 +00:00
James Strachan 72b382d0bd fixed the UDP and multicast test cases by merging the ResponseCorrelator into the UDP transport implementation
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@385794 13f79535-47bb-0310-9956-ffa450edef68
2006-03-14 12:31:44 +00:00
James Strachan daf48bb297 added better exception
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@385792 13f79535-47bb-0310-9956-ffa450edef68
2006-03-14 11:57:59 +00:00
Adrian T. Co f471303cc5 - Modified the version of the mx4j dependency to use the predefined one.
- Excluded HttpsTransportBrokerTest.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@385695 13f79535-47bb-0310-9956-ffa450edef68
2006-03-13 23:15:53 +00:00
Hiram R. Chirino d11ec2baf6 have only the parent pom configure the surefire version used. Also enable the right tests on the activemq-core module.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@385691 13f79535-47bb-0310-9956-ffa450edef68
2006-03-13 22:59:08 +00:00
Hiram R. Chirino e614534e72 Added assertion to test that system properties can be used to configure broker settings.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@385690 13f79535-47bb-0310-9956-ffa450edef68
2006-03-13 22:56:45 +00:00
Hiram R. Chirino 281fd8ded0 Added a <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> to all activemq configuation files so that system properties can be used in the configuration of the broker.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@385689 13f79535-47bb-0310-9956-ffa450edef68
2006-03-13 22:55:24 +00:00
James Strachan 5739c6cdca refactor of the UDP transport so that it can work with multicast using a DatagramSocket/MulticastSocket directly in addition to using a DatagramChannel (which only seems to work with UDP)
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@385577 13f79535-47bb-0310-9956-ffa450edef68
2006-03-13 15:52:01 +00:00
James Strachan 0def1d4d40 refactor to allow the MBean createDurableSubscription() method to return the ObjectName of the newly created subscription
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@385575 13f79535-47bb-0310-9956-ffa450edef68
2006-03-13 15:41:55 +00:00
James Strachan ad5ad88996 moved the create/destroy durable subscriptions to the broker MBean to make it easier to use and not require a reference to the topic to destroy them
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@385561 13f79535-47bb-0310-9956-ffa450edef68
2006-03-13 14:29:48 +00:00
James Strachan 6ce0aaa0dc fixed possible NPE
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@385557 13f79535-47bb-0310-9956-ffa450edef68
2006-03-13 14:17:14 +00:00
James Strachan f2a0184a85 added javadoc
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@385510 13f79535-47bb-0310-9956-ffa450edef68
2006-03-13 11:05:04 +00:00
James Strachan 65fdf0762a updated the reliable transport to be able to deal with out of order messages within a certain range and discarding duplicates within a range
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@385480 13f79535-47bb-0310-9956-ffa450edef68
2006-03-13 09:52:15 +00:00
James Strachan e6954f1fd4 refactored the reliable transport into the reliable package and added a test case demonstrating the transport handling duplicate packets and dealing with reordering OK
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@385478 13f79535-47bb-0310-9956-ffa450edef68
2006-03-13 09:17:43 +00:00
James Strachan c8b8fdde4f updated timers to ensure that the test runs even on slow machines
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@385467 13f79535-47bb-0310-9956-ffa450edef68
2006-03-13 08:42:42 +00:00
Adrian T. Co db9a7097a1 - Remove 1.5 dependency
- Added activemq-optional to multi-project.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@385419 13f79535-47bb-0310-9956-ffa450edef68
2006-03-13 03:20:18 +00:00
Hiram R. Chirino e08fe99ec0 latest tweaks.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@385202 13f79535-47bb-0310-9956-ffa450edef68
2006-03-11 23:55:51 +00:00
Hiram R. Chirino 7fc12716f5 disabled test so the m2 build succeeds.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@385131 13f79535-47bb-0310-9956-ffa450edef68
2006-03-11 18:46:24 +00:00
James Strachan 95ab99cad5 switch to non-synchronized implementation of ByteArrayStreams
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@385091 13f79535-47bb-0310-9956-ffa450edef68
2006-03-11 15:22:05 +00:00
Hiram R. Chirino be50d8699c Applying patch http://jira.activemq.org/jira/secure/ManageAttachments.jspa?id=23767
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384957 13f79535-47bb-0310-9956-ffa450edef68
2006-03-10 23:52:45 +00:00
James Strachan fd2fa9da5c Refactored the PartialCommand to make it simpler and make LastPartialCommand not contain binary data
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384899 13f79535-47bb-0310-9956-ffa450edef68
2006-03-10 19:09:16 +00:00
James Strachan c2fc820c48 removed hacks in OpenWire to marshal the PartialCommand; we now use normal OpenWire marshalling instead. Also the LastPartialCommand now has no byte[] data in it; making the UDP marshalling code even easier. The PartialCommand literally only has a datastructure type (byte), a commandId (int) and a byte[] now. Ideally OpenWire could detect there is no need for BooleanStreams with this type.
Also added a test case for ReliableTransort

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384893 13f79535-47bb-0310-9956-ffa450edef68
2006-03-10 19:05:47 +00:00
Robert Davies c2c3cc20c0 Added request(Command. timeout) to transport
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384854 13f79535-47bb-0310-9956-ffa450edef68
2006-03-10 17:04:23 +00:00
Robert Davies 5fe0a4ca8a Added request(Command. timeout) to transport and added a timeout on
close from ActiveMQConnection

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384853 13f79535-47bb-0310-9956-ffa450edef68
2006-03-10 17:03:31 +00:00
James Strachan f51ac13f85 a little bit of spring cleaning to remove some of the cruft
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384837 13f79535-47bb-0310-9956-ffa450edef68
2006-03-10 16:12:47 +00:00
James Strachan 8704338288 refactored the UDP transport to push most of the code and logic back into the transport layer itself.
* Command how has transient from & to properties which can be used with transports like UDP/multicast to indicate which endpoint (typically broker) actually sent the commands
* used int for commandId 
* support for PartialCommand support; allowing large commands (such as big messages) to be split up into smaller chunks
* added a CommandJoiner for joining partial commands together into complete commands
* ReliableTransport which re-orders and can re-request missed commands


git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384826 13f79535-47bb-0310-9956-ffa450edef68
2006-03-10 15:53:21 +00:00
James Strachan df26287181 minor refactorings to make it easier to derive from
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384755 13f79535-47bb-0310-9956-ffa450edef68
2006-03-10 10:21:07 +00:00
Robert Davies c5f96e1db5 added some state to avoid npe when starting the connectorServer after stop has been called
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384738 13f79535-47bb-0310-9956-ffa450edef68
2006-03-10 09:11:56 +00:00
Adrian T. Co 5e8f85df32 Move MarshallingWithCachingTest from core module to soaktest module.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384690 13f79535-47bb-0310-9956-ffa450edef68
2006-03-10 03:05:38 +00:00
James Strachan 2f1dcea144 added test cases for UDP fragmentation
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384640 13f79535-47bb-0310-9956-ffa450edef68
2006-03-09 23:08:57 +00:00
James Strachan 3d7f76719f fix bug in fragmentation
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384638 13f79535-47bb-0310-9956-ffa450edef68
2006-03-09 22:57:13 +00:00
Hiram R. Chirino 7b69145159 Fix a 1.5 API dependency the slipped in.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384634 13f79535-47bb-0310-9956-ffa450edef68
2006-03-09 22:44:16 +00:00
Hiram R. Chirino fd5ce05c1d Appling patch from Nathan Mittler. Thanks Nathan! http://jira.activemq.org/jira/browse/AMQ-620
Improves c++ openwire support on linux



git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384616 13f79535-47bb-0310-9956-ffa450edef68
2006-03-09 21:11:16 +00:00
James Strachan 4446d55d30 added a working UDP server with test cases
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384603 13f79535-47bb-0310-9956-ffa450edef68
2006-03-09 20:26:47 +00:00
James Strachan 4f446eb025 initial spike of UDP server transport with some test cases (some of which are commented out as they are not quite working yet)
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384569 13f79535-47bb-0310-9956-ffa450edef68
2006-03-09 18:06:32 +00:00
James Strachan 22bb1bdd41 added helper method
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384568 13f79535-47bb-0310-9956-ffa450edef68
2006-03-09 18:02:47 +00:00
Robert Davies 6c0df67be6 tidied up subscription objectNames
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384492 13f79535-47bb-0310-9956-ffa450edef68
2006-03-09 11:22:26 +00:00
James Strachan 5371cf5e64 minor refactor of a property and exposed the selector as an MBean attribute. the selector can actually be updated in real time via JMX for non-durable topic subscriptions for AMQ-625
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384486 13f79535-47bb-0310-9956-ffa450edef68
2006-03-09 10:49:37 +00:00
James Strachan b86da466e6 disabled some failing test cases until we can fix 'em
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384479 13f79535-47bb-0310-9956-ffa450edef68
2006-03-09 10:11:43 +00:00
James Strachan 346cdc5744 added test for copy() method
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384459 13f79535-47bb-0310-9956-ffa450edef68
2006-03-09 08:25:03 +00:00
Hiram R. Chirino 46ad8c2d71 Enabled CLS compliance again and fixed some of the comment positioning.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384457 13f79535-47bb-0310-9956-ffa450edef68
2006-03-09 08:19:01 +00:00
James Strachan cedc2fb891 added an implementation of ActiveMQXAConnectionFactory for AMQ-624
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384454 13f79535-47bb-0310-9956-ffa450edef68
2006-03-09 07:42:26 +00:00
Hiram R. Chirino c40f989966 Refactored the .NET client so that all the JMS references are NMS. Figured Sun would not be happy if we called this JMS.
also tweeked the m2 poms a little




git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384452 13f79535-47bb-0310-9956-ffa450edef68
2006-03-09 07:11:37 +00:00
Hiram R. Chirino c4e99fe48b - Fix NPE due to JMX problem
- Made the maven setting a little more eclipse freindly.



git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384438 13f79535-47bb-0310-9956-ffa450edef68
2006-03-09 05:41:08 +00:00
Hiram R. Chirino 6583ef1821 I wish I could have commited this in smaller chunks
- Added support for the openwire loose encoding to the .NET port
- Fixed the InactivityMonitor, it was timing out conections too often and testcase for it would fail intermitently
- Improved the wire format option negociation phase.  
   - We now gaurd to sending the WireformatInfo, so it's only sent once even if the start method is called multiple times.  
   - We now wait for the WireFormatInfo to be sent before reconfiguring the WireFormat with the new negociated options
   - Option negociation is now simpler to understand:
     - The WireFormatInfo is allways sent with all options turned off
     - Once WireFormatInfo's are exchanged, we enable the options on the WireFormat that both sides enabled.
 



git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384390 13f79535-47bb-0310-9956-ffa450edef68
2006-03-09 00:41:39 +00:00
Robert Davies cbd5960e5a shorten subscription name
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384297 13f79535-47bb-0310-9956-ffa450edef68
2006-03-08 18:16:33 +00:00
James Strachan 6c0fae01de added working test case for the use of Broker, Queue, Topic MBeans
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384274 13f79535-47bb-0310-9956-ffa450edef68
2006-03-08 17:25:56 +00:00
James Strachan 138d9cfffa added MBean unit test case
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384256 13f79535-47bb-0310-9956-ffa450edef68
2006-03-08 16:27:25 +00:00
Hiram R. Chirino 5d9d499e66 Fix so that we can get the messages.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384255 13f79535-47bb-0310-9956-ffa450edef68
2006-03-08 16:27:16 +00:00
James Strachan 2cd143782a added a ReplayCommand to OpenWire for re-requesting dropped datagrams/commands and regenerated the openwire classes
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384231 13f79535-47bb-0310-9956-ffa450edef68
2006-03-08 15:15:11 +00:00
James Strachan 08f4639d5e added spike of a UDP server together with applying the transport refactorings to the UDP transport
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384225 13f79535-47bb-0310-9956-ffa450edef68
2006-03-08 14:44:35 +00:00
James Strachan 11c37a7be5 added fix for NPE when adding durable subscribers
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384223 13f79535-47bb-0310-9956-ffa450edef68
2006-03-08 14:36:35 +00:00
James Strachan 436fe42778 minor refactor to use "stopped" and "stopping" as properties on ServiceSupport and the transport classes. Also made the TransportListener getter visible and avoided the need for protected variables in the various TransportFilter implementations (due to inlining, often getter methods are faster in hotspot than access to protected fields, plus it simplifies the code & makes it less brittle)
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384220 13f79535-47bb-0310-9956-ffa450edef68
2006-03-08 14:10:27 +00:00
James Strachan 11be076ac9 refactor to move the useful code for dealing with start/stop lifecycles and the start, closed, closing properties into the base ServiceSupport class
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384208 13f79535-47bb-0310-9956-ffa450edef68
2006-03-08 13:09:17 +00:00
James Strachan 8568d6ee05 minor refactor to make it easier to override starting
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384193 13f79535-47bb-0310-9956-ffa450edef68
2006-03-08 12:09:49 +00:00
James Strachan 534ea690ff allow the transport to be closed before we try and send remove commands to it without generating an exception
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384189 13f79535-47bb-0310-9956-ffa450edef68
2006-03-08 11:47:09 +00:00
James Strachan dba3ea8d0e enable JMX by default
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384187 13f79535-47bb-0310-9956-ffa450edef68
2006-03-08 11:44:45 +00:00
James Strachan 8d36b4c751 patch test case to explicitly disable JMX
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384186 13f79535-47bb-0310-9956-ffa450edef68
2006-03-08 11:44:28 +00:00
James Strachan d47ce01a85 deal with mbeans being already unregistered gracefully
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384185 13f79535-47bb-0310-9956-ffa450edef68
2006-03-08 11:44:06 +00:00
James Strachan 8776a4154e added helper method to create non-persistent output streams together with added more javadoc
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384173 13f79535-47bb-0310-9956-ffa450edef68
2006-03-08 10:14:44 +00:00
Adrian T. Co 5628c2d94b Use the backport library to fix the compile error in Java 1.4.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384162 13f79535-47bb-0310-9956-ffa450edef68
2006-03-08 09:15:08 +00:00
Hiram R. Chirino ead505da98 Fixed transport testcase so that it does not fail anymore. tcp transport was being stopped and then oneway was being called on it, and it was throwing an unexpected illegalstate exception witched to ioexception and all was better.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384001 13f79535-47bb-0310-9956-ffa450edef68
2006-03-07 20:33:02 +00:00
James Strachan 05b81ba8be Added test case for UDP
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@383984 13f79535-47bb-0310-9956-ffa450edef68
2006-03-07 19:52:50 +00:00
James Strachan 187f884b58 added test case demonstrating UDP transport working
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@383981 13f79535-47bb-0310-9956-ffa450edef68
2006-03-07 19:49:23 +00:00
James Strachan f8e1c0ebe5 added helper methods for NIO/AIO/UDP based transports
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@383980 13f79535-47bb-0310-9956-ffa450edef68
2006-03-07 19:48:02 +00:00
Hiram R. Chirino b2ad8fa833 Support naming all the connectors so that JMX object names are easier to view.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@383972 13f79535-47bb-0310-9956-ffa450edef68
2006-03-07 19:25:05 +00:00
Hiram R. Chirino c977f7ddfc support destination options on a stream consumer.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@383971 13f79535-47bb-0310-9956-ffa450edef68
2006-03-07 19:24:15 +00:00
Hiram R. Chirino 5ff3487b2f renamed matched to pending.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@383969 13f79535-47bb-0310-9956-ffa450edef68
2006-03-07 19:18:28 +00:00
Hiram R. Chirino 3b0377cfaf Test case and fix for http://jira.activemq.org/jira/browse/AMQ-618
Robert Newson, great job finding and putting together a test case for this.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@383957 13f79535-47bb-0310-9956-ffa450edef68
2006-03-07 18:59:41 +00:00