Commit Graph

493 Commits

Author SHA1 Message Date
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