You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ds...@apache.org on 2013/06/04 11:35:04 UTC
svn commit: r1489359 -
/cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/
Author: dsosnoski
Date: Tue Jun 4 09:35:03 2013
New Revision: 1489359
URL: http://svn.apache.org/r1489359
Log:
Changes for WS-RMP 1.1 support
Modified:
cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractClientPersistenceTest.java
cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractServerPersistenceTest.java
cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutMessageTest.java
cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionGZIPTest.java
cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionQueueTest.java
cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RobustServiceAtMostOnceTest.java
cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
Modified: cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractClientPersistenceTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractClientPersistenceTest.java?rev=1489359&r1=1489358&r2=1489359&view=diff
==============================================================================
--- cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractClientPersistenceTest.java (original)
+++ cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractClientPersistenceTest.java Tue Jun 4 09:35:03 2013
@@ -95,8 +95,8 @@ public abstract class AbstractClientPers
bus.getOutFaultInterceptors().add(logOut);
bus.getOutFaultInterceptors().add(logOut);
- bus.getExtension(RMManager.class).getRMAssertion().getBaseRetransmissionInterval()
- .setMilliseconds(new Long(60000));
+ bus.getExtension(RMManager.class).getConfiguration()
+ .setBaseRetransmissionInterval(new Long(60000));
GreeterImpl implementor = new GreeterImpl();
String address = "http://localhost:" + port + "/SoapContext/GreeterPort";
@@ -161,8 +161,7 @@ public abstract class AbstractClientPers
void populateStore() throws Exception {
- bus.getExtension(RMManager.class).getRMAssertion().getBaseRetransmissionInterval()
- .setMilliseconds(new Long(60000));
+ bus.getExtension(RMManager.class).getConfiguration().setBaseRetransmissionInterval(new Long(60000));
bus.getOutInterceptors().add(new MessageLossSimulator());
greeter.greetMeOneWay("one");
@@ -229,8 +228,7 @@ public abstract class AbstractClientPers
void populateStoreAfterRestart() throws Exception {
- bus.getExtension(RMManager.class).getRMAssertion().getBaseRetransmissionInterval()
- .setMilliseconds(new Long(60000));
+ bus.getExtension(RMManager.class).getConfiguration().setBaseRetransmissionInterval(new Long(60000));
greeter.greetMeOneWay("five");
Modified: cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractServerPersistenceTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractServerPersistenceTest.java?rev=1489359&r1=1489358&r2=1489359&view=diff
==============================================================================
--- cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractServerPersistenceTest.java (original)
+++ cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractServerPersistenceTest.java Tue Jun 4 09:35:03 2013
@@ -139,8 +139,8 @@ public abstract class AbstractServerPers
BusFactory.setDefaultBus(greeterBus);
// avoid early client resends
- greeterBus.getExtension(RMManager.class).getRMAssertion().getBaseRetransmissionInterval()
- .setMilliseconds(new Long(60000));
+ greeterBus.getExtension(RMManager.class).getConfiguration()
+ .setBaseRetransmissionInterval(new Long(60000));
GreeterService gs = new GreeterService();
Greeter greeter = gs.getGreeterPort();
updateAddressPort(greeter, getPort());
Modified: cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutMessageTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutMessageTest.java?rev=1489359&r1=1489358&r2=1489359&view=diff
==============================================================================
--- cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutMessageTest.java (original)
+++ cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutMessageTest.java Tue Jun 4 09:35:03 2013
@@ -108,7 +108,7 @@ public class CachedOutMessageTest extend
MessageLossSimulator mls = new MessageLossSimulator();
bus.getOutInterceptors().add(mls);
RMManager manager = bus.getExtension(RMManager.class);
- manager.getRMAssertion().getBaseRetransmissionInterval().setMilliseconds(new Long(2000));
+ manager.getConfiguration().setBaseRetransmissionInterval(new Long(2000));
bus.getOutFaultInterceptors().add(out);
Modified: cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java?rev=1489359&r1=1489358&r2=1489359&view=diff
==============================================================================
--- cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java (original)
+++ cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java Tue Jun 4 09:35:03 2013
@@ -101,7 +101,7 @@ public class DeliveryAssuranceOnewayTest
greeterBus.getOutInterceptors().add(new MessageLossSimulator());
RMManager manager = greeterBus.getExtension(RMManager.class);
- manager.getRMAssertion().getBaseRetransmissionInterval().setMilliseconds(new Long(2000));
+ manager.getConfiguration().setBaseRetransmissionInterval(new Long(2000));
String[] callArgs = new String[] {"one", "two", "three", "four"};
for (int i = 0; i < callArgs.length; i++) {
greeter.greetMeOneWay(callArgs[i]);
@@ -140,7 +140,7 @@ public class DeliveryAssuranceOnewayTest
greeterBus.getOutInterceptors().add(new MessageLossSimulator());
RMManager manager = greeterBus.getExtension(RMManager.class);
- manager.getRMAssertion().getBaseRetransmissionInterval().setMilliseconds(new Long(2000));
+ manager.getConfiguration().setBaseRetransmissionInterval(new Long(2000));
String[] callArgs = new String[] {"one", "two", "three", "four"};
for (int i = 0; i < callArgs.length; i++) {
greeter.greetMeOneWay(callArgs[i]);
@@ -174,7 +174,7 @@ public class DeliveryAssuranceOnewayTest
greeterBus.getOutInterceptors().add(new MessageLossSimulator());
RMManager manager = greeterBus.getExtension(RMManager.class);
- manager.getRMAssertion().getBaseRetransmissionInterval().setMilliseconds(new Long(2000));
+ manager.getConfiguration().setBaseRetransmissionInterval(new Long(2000));
String[] callArgs = new String[] {"one", "two", "three", "four"};
for (int i = 0; i < callArgs.length; i++) {
greeter.greetMeOneWay(callArgs[i]);
@@ -213,7 +213,7 @@ public class DeliveryAssuranceOnewayTest
greeterBus.getOutInterceptors().add(new MessageLossSimulator());
RMManager manager = greeterBus.getExtension(RMManager.class);
- manager.getRMAssertion().getBaseRetransmissionInterval().setMilliseconds(new Long(2000));
+ manager.getConfiguration().setBaseRetransmissionInterval(new Long(2000));
String[] callArgs = new String[] {"one", "two", "three", "four"};
for (int i = 0; i < callArgs.length; i++) {
greeter.greetMeOneWay(callArgs[i]);
@@ -245,7 +245,7 @@ public class DeliveryAssuranceOnewayTest
greeterBus.getOutInterceptors().add(new MessageLossSimulator());
RMManager manager = greeterBus.getExtension(RMManager.class);
- manager.getRMAssertion().getBaseRetransmissionInterval().setMilliseconds(new Long(2000));
+ manager.getConfiguration().setBaseRetransmissionInterval(new Long(2000));
String[] callArgs = new String[] {"one", "two", "three", "four"};
for (int i = 0; i < callArgs.length; i++) {
greeter.greetMeOneWay(callArgs[i]);
@@ -278,7 +278,7 @@ public class DeliveryAssuranceOnewayTest
greeterBus.getOutInterceptors().add(new MessageLossSimulator());
RMManager manager = greeterBus.getExtension(RMManager.class);
- manager.getRMAssertion().getBaseRetransmissionInterval().setMilliseconds(new Long(2000));
+ manager.getConfiguration().setBaseRetransmissionInterval(new Long(2000));
String[] callArgs = new String[] {"one", "two", "three", "four"};
for (int i = 0; i < callArgs.length; i++) {
greeter.greetMeOneWay(callArgs[i]);
Modified: cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionGZIPTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionGZIPTest.java?rev=1489359&r1=1489358&r2=1489359&view=diff
==============================================================================
--- cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionGZIPTest.java (original)
+++ cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionGZIPTest.java Tue Jun 4 09:35:03 2013
@@ -107,8 +107,7 @@ public class RetransmissionGZIPTest exte
bus.getInFaultInterceptors().add(in);
LoggingOutInterceptor out = new LoggingOutInterceptor();
bus.getOutInterceptors().add(out);
- bus.getExtension(RMManager.class).getRMAssertion().getBaseRetransmissionInterval()
- .setMilliseconds(new Long(4000));
+ bus.getExtension(RMManager.class).getConfiguration().setBaseRetransmissionInterval(new Long(4000));
// an interceptor to simulate a transmission error
MessageLossSimulator loser = new MessageLossSimulator();
Modified: cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionQueueTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionQueueTest.java?rev=1489359&r1=1489358&r2=1489359&view=diff
==============================================================================
--- cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionQueueTest.java (original)
+++ cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionQueueTest.java Tue Jun 4 09:35:03 2013
@@ -100,8 +100,7 @@ public class RetransmissionQueueTest ext
bus.getInFaultInterceptors().add(in);
LoggingOutInterceptor out = new LoggingOutInterceptor();
bus.getOutInterceptors().add(out);
- bus.getExtension(RMManager.class).getRMAssertion().getBaseRetransmissionInterval()
- .setMilliseconds(new Long(4000));
+ bus.getExtension(RMManager.class).getConfiguration().setBaseRetransmissionInterval(new Long(4000));
// an interceptor to simulate a transmission error
MessageLossSimulator loser = new MessageLossSimulator();
Modified: cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RobustServiceAtMostOnceTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RobustServiceAtMostOnceTest.java?rev=1489359&r1=1489358&r2=1489359&view=diff
==============================================================================
--- cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RobustServiceAtMostOnceTest.java (original)
+++ cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RobustServiceAtMostOnceTest.java Tue Jun 4 09:35:03 2013
@@ -59,8 +59,7 @@ public class RobustServiceAtMostOnceTest
Bus bus = bf.createBus("/org/apache/cxf/systest/ws/rm/atmostonce.xml");
BusFactory.setDefaultBus(bus);
setBus(bus);
- bus.getExtension(RMManager.class).getRMAssertion().getAcknowledgementInterval()
- .setMilliseconds(0L);
+ bus.getExtension(RMManager.class).getConfiguration().setAcknowledgementInterval(new Long(0));
// add some intentional processing delay at inbound
SlowProcessingSimulator sps = new SlowProcessingSimulator();
@@ -95,8 +94,7 @@ public class RobustServiceAtMostOnceTest
bus = bf.createBus("/org/apache/cxf/systest/ws/rm/seqlength1.xml");
// set the client retry interval much shorter than the slow processing delay
RMManager manager = bus.getExtension(RMManager.class);
- manager.getRMAssertion().getBaseRetransmissionInterval()
- .setMilliseconds(3000L);
+ manager.getConfiguration().setBaseRetransmissionInterval(new Long(3000));
BusFactory.setDefaultBus(bus);
GreeterService gs = new GreeterService();
Modified: cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java?rev=1489359&r1=1489358&r2=1489359&view=diff
==============================================================================
--- cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java (original)
+++ cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java Tue Jun 4 09:35:03 2013
@@ -755,7 +755,7 @@ public class SequenceTest extends Abstra
}
greeterBus.getOutInterceptors().add(new MessageNumberInterceptor());
RMManager manager = greeterBus.getExtension(RMManager.class);
- manager.getRMAssertion().getBaseRetransmissionInterval().setMilliseconds(new Long(2000));
+ manager.getConfiguration().setBaseRetransmissionInterval(new Long(2000));
greeter.greetMe("one");
try {
@@ -822,7 +822,7 @@ public class SequenceTest extends Abstra
}
greeterBus.getOutInterceptors().add(new SequenceIdInterceptor());
RMManager manager = greeterBus.getExtension(RMManager.class);
- manager.getRMAssertion().getBaseRetransmissionInterval().setMilliseconds(new Long(2000));
+ manager.getConfiguration().setBaseRetransmissionInterval(new Long(2000));
try {
greeter.greetMe("one");
@@ -921,7 +921,7 @@ public class SequenceTest extends Abstra
greeterBus.getOutInterceptors().add(new MessageLossSimulator());
RMManager manager = greeterBus.getExtension(RMManager.class);
- manager.getRMAssertion().getBaseRetransmissionInterval().setMilliseconds(new Long(2000));
+ manager.getConfiguration().setBaseRetransmissionInterval(new Long(2000));
greeter.greetMeOneWay("one");
greeter.greetMeOneWay("two");
@@ -982,7 +982,7 @@ public class SequenceTest extends Abstra
greeterBus.getOutInterceptors().add(new MessageLossSimulator());
RMManager manager = greeterBus.getExtension(RMManager.class);
- manager.getRMAssertion().getBaseRetransmissionInterval().setMilliseconds(new Long(2000));
+ manager.getConfiguration().setBaseRetransmissionInterval(new Long(2000));
greeter.greetMe("one");
greeter.greetMe("two");
@@ -1276,8 +1276,8 @@ public class SequenceTest extends Abstra
}
}
// avoid client side resends
- greeterBus.getExtension(RMManager.class).getRMAssertion().getBaseRetransmissionInterval()
- .setMilliseconds(new Long(60000));
+ greeterBus.getExtension(RMManager.class).getConfiguration()
+ .setBaseRetransmissionInterval(new Long(60000));
greeter.greetMe("one");
greeter.greetMe("two");