Commit Graph

471 Commits

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