Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ResponseTest.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ResponseTest.java?rev=384826&r1=384825&r2=384826&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ResponseTest.java (original) +++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ResponseTest.java Fri Mar 10 07:53:21 2006 @@ -33,7 +33,7 @@ * under src/gram/script and then use maven openwire:generate to regenerate * this file. * - * @version $Revision$ + * @version $Revision: $ */ public class ResponseTest extends BaseCommandTestSupport { @@ -50,7 +50,7 @@ protected void populateObject(Object object) throws Exception { super.populateObject(object); Response info = (Response) object; - info.setCorrelationId((short) 1); + info.setCorrelationId(1); } }
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/SessionIdTest.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/SessionIdTest.java?rev=384826&r1=384825&r2=384826&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/SessionIdTest.java (original) +++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/SessionIdTest.java Fri Mar 10 07:53:21 2006 @@ -33,7 +33,7 @@ * under src/gram/script and then use maven openwire:generate to regenerate * this file. * - * @version $Revision$ + * @version $Revision: $ */ public class SessionIdTest extends DataFileGeneratorTestSupport { Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/SessionInfoTest.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/SessionInfoTest.java?rev=384826&r1=384825&r2=384826&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/SessionInfoTest.java (original) +++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/SessionInfoTest.java Fri Mar 10 07:53:21 2006 @@ -33,7 +33,7 @@ * under src/gram/script and then use maven openwire:generate to regenerate * this file. * - * @version $Revision$ + * @version $Revision: $ */ public class SessionInfoTest extends BaseCommandTestSupport { Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ShutdownInfoTest.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ShutdownInfoTest.java?rev=384826&r1=384825&r2=384826&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ShutdownInfoTest.java (original) +++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ShutdownInfoTest.java Fri Mar 10 07:53:21 2006 @@ -33,7 +33,7 @@ * under src/gram/script and then use maven openwire:generate to regenerate * this file. * - * @version $Revision$ + * @version $Revision: $ */ public class ShutdownInfoTest extends BaseCommandTestSupport { Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/SubscriptionInfoTest.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/SubscriptionInfoTest.java?rev=384826&r1=384825&r2=384826&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/SubscriptionInfoTest.java (original) +++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/SubscriptionInfoTest.java Fri Mar 10 07:53:21 2006 @@ -33,7 +33,7 @@ * under src/gram/script and then use maven openwire:generate to regenerate * this file. * - * @version $Revision$ + * @version $Revision: $ */ public class SubscriptionInfoTest extends DataFileGeneratorTestSupport { Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/TransactionIdTestSupport.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/TransactionIdTestSupport.java?rev=384826&r1=384825&r2=384826&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/TransactionIdTestSupport.java (original) +++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/TransactionIdTestSupport.java Fri Mar 10 07:53:21 2006 @@ -33,7 +33,7 @@ * under src/gram/script and then use maven openwire:generate to regenerate * this file. * - * @version $Revision$ + * @version $Revision: $ */ public abstract class TransactionIdTestSupport extends DataFileGeneratorTestSupport { Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/TransactionInfoTest.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/TransactionInfoTest.java?rev=384826&r1=384825&r2=384826&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/TransactionInfoTest.java (original) +++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/TransactionInfoTest.java Fri Mar 10 07:53:21 2006 @@ -33,7 +33,7 @@ * under src/gram/script and then use maven openwire:generate to regenerate * this file. * - * @version $Revision$ + * @version $Revision: $ */ public class TransactionInfoTest extends BaseCommandTestSupport { Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/WireFormatInfoTest.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/WireFormatInfoTest.java?rev=384826&r1=384825&r2=384826&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/WireFormatInfoTest.java (original) +++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/WireFormatInfoTest.java Fri Mar 10 07:53:21 2006 @@ -33,7 +33,7 @@ * under src/gram/script and then use maven openwire:generate to regenerate * this file. * - * @version $Revision$ + * @version $Revision: $ */ public class WireFormatInfoTest extends DataFileGeneratorTestSupport { Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/XATransactionIdTest.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/XATransactionIdTest.java?rev=384826&r1=384825&r2=384826&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/XATransactionIdTest.java (original) +++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/XATransactionIdTest.java Fri Mar 10 07:53:21 2006 @@ -33,7 +33,7 @@ * under src/gram/script and then use maven openwire:generate to regenerate * this file. * - * @version $Revision$ + * @version $Revision: $ */ public class XATransactionIdTest extends TransactionIdTestSupport { Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/udp/UdpTestSupport.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/udp/UdpTestSupport.java?rev=384826&r1=384825&r2=384826&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/udp/UdpTestSupport.java (original) +++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/udp/UdpTestSupport.java Fri Mar 10 07:53:21 2006 @@ -218,7 +218,7 @@ synchronized (lock) { answer = receivedCommand; if (answer == null) { - lock.wait(10000); + lock.wait(5000); } answer = receivedCommand; } Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/udp/UdpTransportTest.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/udp/UdpTransportTest.java?rev=384826&r1=384825&r2=384826&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/udp/UdpTransportTest.java (original) +++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/udp/UdpTransportTest.java Fri Mar 10 07:53:21 2006 @@ -17,8 +17,8 @@ package org.apache.activemq.transport.udp; import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.transport.CommandJoiner; import org.apache.activemq.transport.Transport; -import org.apache.activemq.transport.TransportFactory; import java.net.URI; @@ -30,22 +30,24 @@ protected int consumerPort = 8830; protected String producerURI = "udp://localhost:" + consumerPort; - //protected String producerURI = "udp://localhost:8830"; - //protected String consumerURI = "udp://localhost:8831?port=8830"; protected Transport createProducer() throws Exception { System.out.println("Producer using URI: " + producerURI); - // The WireFormatNegotiator means we can only connect to servers - return new UdpTransport(createWireFormat(), new URI(producerURI)); + // we are not using the TransportFactory as this assumes that + // UDP transports talk to a server using a WireFormat Negotiation step + // rather than talking directly to each other - //return TransportFactory.connect(new URI(producerURI)); + OpenWireFormat wireFormat = createWireFormat(); + UdpTransport transport = new UdpTransport(wireFormat, new URI(producerURI)); + return new CommandJoiner(transport, wireFormat); } protected Transport createConsumer() throws Exception { System.out.println("Consumer on port: " + consumerPort); - return new UdpTransport(createWireFormat(), consumerPort); - //return TransportFactory.connect(new URI(consumerURI)); + OpenWireFormat wireFormat = createWireFormat(); + UdpTransport transport = new UdpTransport(wireFormat, consumerPort); + return new CommandJoiner(transport, wireFormat); } protected OpenWireFormat createWireFormat() {
