You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/02/14 18:15:06 UTC
svn commit: r1070579 [2/2] - in /cxf/trunk:
distribution/src/main/release/samples/ws_rm/src/demo/ws_rm/common/
rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/
rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/
rt/ws/rm/src/main/java/org/apache/cxf/w...
Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java?rev=1070579&r1=1070578&r2=1070579&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java (original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java Mon Feb 14 17:15:05 2011
@@ -19,7 +19,6 @@
package org.apache.cxf.systest.ws.rm;
-import java.math.BigInteger;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
@@ -87,7 +86,7 @@ public class ClientPersistenceTest exten
bus.getOutFaultInterceptors().add(logOut);
bus.getExtension(RMManager.class).getRMAssertion().getBaseRetransmissionInterval()
- .setMilliseconds(new BigInteger("60000"));
+ .setMilliseconds(new Long(60000));
GreeterImpl implementor = new GreeterImpl();
String address = "http://localhost:" + PORT + "/SoapContext/GreeterPort";
@@ -171,7 +170,7 @@ public class ClientPersistenceTest exten
void populateStore() throws Exception {
bus.getExtension(RMManager.class).getRMAssertion().getBaseRetransmissionInterval()
- .setMilliseconds(new BigInteger("60000"));
+ .setMilliseconds(new Long(60000));
bus.getOutInterceptors().add(new MessageLossSimulator());
greeter.greetMeOneWay("one");
Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java?rev=1070579&r1=1070578&r2=1070579&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java (original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java Mon Feb 14 17:15:05 2011
@@ -20,7 +20,6 @@
package org.apache.cxf.systest.ws.rm;
import java.io.StringReader;
-import java.math.BigInteger;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -60,7 +59,6 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-
/**
* Tests the operation of InOrder delivery assurance for one-way messages to the server.
*/
@@ -103,7 +101,7 @@ public class DeliveryAssuranceOnewayTest
Thread.sleep(100);
}
-/* @Test
+ @Test
public void testAtLeastOnce() throws Exception {
testOnewayAtLeastOnce(null);
}
@@ -118,7 +116,7 @@ public class DeliveryAssuranceOnewayTest
greeterBus.getOutInterceptors().add(new MessageLossSimulator());
RMManager manager = greeterBus.getExtension(RMManager.class);
- manager.getRMAssertion().getBaseRetransmissionInterval().setMilliseconds(new BigInteger("2000"));
+ manager.getRMAssertion().getBaseRetransmissionInterval().setMilliseconds(new Long(2000));
String[] callArgs = new String[] {"one", "two", "three", "four"};
for (int i = 0; i < callArgs.length; i++) {
greeter.greetMeOneWay(callArgs[i]);
@@ -157,7 +155,7 @@ public class DeliveryAssuranceOnewayTest
greeterBus.getOutInterceptors().add(new MessageLossSimulator());
RMManager manager = greeterBus.getExtension(RMManager.class);
- manager.getRMAssertion().getBaseRetransmissionInterval().setMilliseconds(new BigInteger("2000"));
+ manager.getRMAssertion().getBaseRetransmissionInterval().setMilliseconds(new Long(2000));
String[] callArgs = new String[] {"one", "two", "three", "four"};
for (int i = 0; i < callArgs.length; i++) {
greeter.greetMeOneWay(callArgs[i]);
@@ -191,7 +189,7 @@ public class DeliveryAssuranceOnewayTest
greeterBus.getOutInterceptors().add(new MessageLossSimulator());
RMManager manager = greeterBus.getExtension(RMManager.class);
- manager.getRMAssertion().getBaseRetransmissionInterval().setMilliseconds(new BigInteger("2000"));
+ manager.getRMAssertion().getBaseRetransmissionInterval().setMilliseconds(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 +211,7 @@ public class DeliveryAssuranceOnewayTest
}
}
- }*/
+ }
@Test
public void testInOrder() throws Exception {
@@ -230,7 +228,7 @@ public class DeliveryAssuranceOnewayTest
greeterBus.getOutInterceptors().add(new MessageLossSimulator());
RMManager manager = greeterBus.getExtension(RMManager.class);
- manager.getRMAssertion().getBaseRetransmissionInterval().setMilliseconds(new BigInteger("2000"));
+ manager.getRMAssertion().getBaseRetransmissionInterval().setMilliseconds(new Long(2000));
String[] callArgs = new String[] {"one", "two", "three", "four"};
for (int i = 0; i < callArgs.length; i++) {
greeter.greetMeOneWay(callArgs[i]);
@@ -262,7 +260,7 @@ public class DeliveryAssuranceOnewayTest
greeterBus.getOutInterceptors().add(new MessageLossSimulator());
RMManager manager = greeterBus.getExtension(RMManager.class);
- manager.getRMAssertion().getBaseRetransmissionInterval().setMilliseconds(new BigInteger("2000"));
+ manager.getRMAssertion().getBaseRetransmissionInterval().setMilliseconds(new Long(2000));
String[] callArgs = new String[] {"one", "two", "three", "four"};
for (int i = 0; i < callArgs.length; i++) {
greeter.greetMeOneWay(callArgs[i]);
@@ -295,7 +293,7 @@ public class DeliveryAssuranceOnewayTest
greeterBus.getOutInterceptors().add(new MessageLossSimulator());
RMManager manager = greeterBus.getExtension(RMManager.class);
- manager.getRMAssertion().getBaseRetransmissionInterval().setMilliseconds(new BigInteger("2000"));
+ manager.getRMAssertion().getBaseRetransmissionInterval().setMilliseconds(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-specs/src/test/java/org/apache/cxf/systest/ws/rm/MessageLossSimulator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/MessageLossSimulator.java?rev=1070579&r1=1070578&r2=1070579&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/MessageLossSimulator.java (original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/MessageLossSimulator.java Mon Feb 14 17:15:05 2011
@@ -21,7 +21,6 @@ package org.apache.cxf.systest.ws.rm;
import java.io.IOException;
import java.io.OutputStream;
-import java.math.BigInteger;
import java.util.ListIterator;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -109,7 +108,7 @@ public class MessageLossSimulator extend
@Override
protected void onFirstWrite() throws IOException {
if (LOG.isLoggable(Level.FINE)) {
- BigInteger nr = RMContextUtils.retrieveRMProperties(outMessage, true)
+ Long nr = RMContextUtils.retrieveRMProperties(outMessage, true)
.getSequence().getMessageNumber();
LOG.fine("Losing message " + nr);
}
Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java?rev=1070579&r1=1070578&r2=1070579&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java (original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java Mon Feb 14 17:15:05 2011
@@ -21,7 +21,6 @@ package org.apache.cxf.systest.ws.rm;
import java.io.InputStream;
import java.io.StringWriter;
-import java.math.BigInteger;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -605,10 +604,9 @@ public class SequenceTest extends Abstra
init("org/apache/cxf/systest/ws/rm/seqlength10.xml", true);
RMManager manager = greeterBus.getExtension(RMManager.class);
- assertEquals("Unexpected maximum sequence length.", BigInteger.TEN,
+ assertEquals("Unexpected maximum sequence length.", 10,
manager.getSourcePolicy().getSequenceTerminationPolicy().getMaxLength());
- manager.getSourcePolicy().getSequenceTerminationPolicy().setMaxLength(
- new BigInteger("2"));
+ manager.getSourcePolicy().getSequenceTerminationPolicy().setMaxLength(new Long(2));
greeter.greetMe("one");
greeter.greetMe("two");
@@ -678,13 +676,13 @@ public class SequenceTest extends Abstra
public void handleMessage(Message m) {
RMProperties rmps = RMContextUtils.retrieveRMProperties(m, true);
if (null != rmps && null != rmps.getSequence()) {
- rmps.getSequence().setMessageNumber(BigInteger.ONE);
+ rmps.getSequence().setMessageNumber(new Long(1));
}
}
}
greeterBus.getOutInterceptors().add(new MessageNumberInterceptor());
RMManager manager = greeterBus.getExtension(RMManager.class);
- manager.getRMAssertion().getBaseRetransmissionInterval().setMilliseconds(new BigInteger("2000"));
+ manager.getRMAssertion().getBaseRetransmissionInterval().setMilliseconds(new Long(2000));
greeter.greetMe("one");
try {
@@ -750,7 +748,7 @@ public class SequenceTest extends Abstra
}
greeterBus.getOutInterceptors().add(new SequenceIdInterceptor());
RMManager manager = greeterBus.getExtension(RMManager.class);
- manager.getRMAssertion().getBaseRetransmissionInterval().setMilliseconds(new BigInteger("2000"));
+ manager.getRMAssertion().getBaseRetransmissionInterval().setMilliseconds(new Long(2000));
try {
greeter.greetMe("one");
@@ -845,7 +843,7 @@ public class SequenceTest extends Abstra
greeterBus.getOutInterceptors().add(new MessageLossSimulator());
RMManager manager = greeterBus.getExtension(RMManager.class);
- manager.getRMAssertion().getBaseRetransmissionInterval().setMilliseconds(new BigInteger("2000"));
+ manager.getRMAssertion().getBaseRetransmissionInterval().setMilliseconds(new Long(2000));
greeter.greetMeOneWay("one");
greeter.greetMeOneWay("two");
@@ -905,7 +903,7 @@ public class SequenceTest extends Abstra
greeterBus.getOutInterceptors().add(new MessageLossSimulator());
RMManager manager = greeterBus.getExtension(RMManager.class);
- manager.getRMAssertion().getBaseRetransmissionInterval().setMilliseconds(new BigInteger("2000"));
+ manager.getRMAssertion().getBaseRetransmissionInterval().setMilliseconds(new Long(2000));
greeter.greetMe("one");
greeter.greetMe("two");
@@ -1204,7 +1202,7 @@ public class SequenceTest extends Abstra
}
// avoid client side resends
greeterBus.getExtension(RMManager.class).getRMAssertion().getBaseRetransmissionInterval()
- .setMilliseconds(new BigInteger("60000"));
+ .setMilliseconds(new Long(60000));
greeter.greetMe("one");
greeter.greetMe("two");
Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java?rev=1070579&r1=1070578&r2=1070579&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java (original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java Mon Feb 14 17:15:05 2011
@@ -19,7 +19,6 @@
package org.apache.cxf.systest.ws.rm;
-import java.math.BigInteger;
import java.util.logging.Logger;
import javax.xml.ws.Response;
@@ -113,7 +112,7 @@ public class ServerPersistenceTest exten
// avoid early client resends
greeterBus.getExtension(RMManager.class).getRMAssertion().getBaseRetransmissionInterval()
- .setMilliseconds(new BigInteger("60000"));
+ .setMilliseconds(new Long(60000));
GreeterService gs = new GreeterService();
Greeter greeter = gs.getGreeterPort();
updateAddressPort(greeter, PORT);