You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2013/07/25 12:27:33 UTC
svn commit: r1506874 - in
/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11:
./ server/
Author: coheigea
Date: Thu Jul 25 10:27:33 2013
New Revision: 1506874
URL: http://svn.apache.org/r1506874
Log:
More streaming WS-Security tests
Added:
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/StaxWSSecurity111Test.java
- copied, changed from r1506823, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity111Test.java
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/StaxWSSecurity112Test.java
- copied, changed from r1506823, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity112Test.java
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/StaxServer11.java
- copied, changed from r1506823, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11Restricted.java
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/StaxServer11Restricted.java
- copied, changed from r1506823, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11Restricted.java
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/StaxServer12.java
- copied, changed from r1506823, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11Restricted.java
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/StaxServer12Restricted.java
- copied, changed from r1506823, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11Restricted.java
Modified:
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity111Test.java
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity112Test.java
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity11Common.java
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/AbstractServer.java
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/AbstractServerRestricted.java
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11Restricted.java
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server12Restricted.java
Copied: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/StaxWSSecurity111Test.java (from r1506823, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity111Test.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/StaxWSSecurity111Test.java?p2=cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/StaxWSSecurity111Test.java&p1=cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity111Test.java&r1=1506823&r2=1506874&rev=1506874&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity111Test.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/StaxWSSecurity111Test.java Thu Jul 25 10:27:33 2013
@@ -22,8 +22,8 @@ package org.apache.cxf.systest.ws.wssec1
import java.io.IOException;
import org.apache.cxf.systest.ws.common.SecurityTestUtil;
-import org.apache.cxf.systest.ws.wssec11.server.Server11;
-import org.apache.cxf.systest.ws.wssec11.server.Server11Restricted;
+import org.apache.cxf.systest.ws.wssec11.server.StaxServer11;
+import org.apache.cxf.systest.ws.wssec11.server.StaxServer11Restricted;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -32,9 +32,9 @@ import org.junit.Test;
* This class runs the first half of the tests, as having all in
* the one class causes an out of memory problem in eclipse.
*
- * It tests both DOM + StAX clients against the DOM server.
+ * It tests both DOM + StAX clients against the StAX server.
*/
-public class WSSecurity111Test extends WSSecurity11Common {
+public class StaxWSSecurity111Test extends WSSecurity11Common {
private static boolean unrestrictedPoliciesInstalled;
static {
@@ -48,7 +48,7 @@ public class WSSecurity111Test extends W
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(Server11.class, true)
+ launchServer(StaxServer11.class, true)
);
} else {
if (WSSecurity11Common.isIBMJDK16()) {
@@ -60,7 +60,7 @@ public class WSSecurity111Test extends W
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(Server11Restricted.class, true)
+ launchServer(StaxServer11Restricted.class, true)
);
}
}
@@ -81,16 +81,16 @@ public class WSSecurity111Test extends W
String[] argv = new String[] {
"A",
"A-NoTimestamp",
- "AD",
+ // TODO See WSS-472 - "AD",
"A-ES",
- "AD-ES",
+ // TODO See WSS-472 - "AD-ES",
"UX",
"UX-NoTimestamp",
- "UXD",
+ // TODO See WSS-472 - "UXD",
"UX-SEES",
- "UXD-SEES",
+ // TODO See WSS-472 - "UXD-SEES",
};
- runClientServer(argv, unrestrictedPoliciesInstalled, false);
+ runClientServer(argv, unrestrictedPoliciesInstalled, false, true);
}
@Test
@@ -104,7 +104,7 @@ public class WSSecurity111Test extends W
"A",
"A-NoTimestamp",
// TODO Derived "AD",
- // TODO EncryptBeforeSigning not working "A-ES",
+ // TODO See WSS-468 EncryptBeforeSigning not working "A-ES",
// TODO Derived "AD-ES",
"UX",
"UX-NoTimestamp",
@@ -112,7 +112,7 @@ public class WSSecurity111Test extends W
"UX-SEES",
// TODO Derived "UXD-SEES",
};
- runClientServerStreaming(argv, unrestrictedPoliciesInstalled, false);
+ runClientServerStreaming(argv, unrestrictedPoliciesInstalled, false, true);
}
Copied: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/StaxWSSecurity112Test.java (from r1506823, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity112Test.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/StaxWSSecurity112Test.java?p2=cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/StaxWSSecurity112Test.java&p1=cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity112Test.java&r1=1506823&r2=1506874&rev=1506874&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity112Test.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/StaxWSSecurity112Test.java Thu Jul 25 10:27:33 2013
@@ -23,8 +23,8 @@ package org.apache.cxf.systest.ws.wssec1
import java.io.IOException;
import org.apache.cxf.systest.ws.common.SecurityTestUtil;
-import org.apache.cxf.systest.ws.wssec11.server.Server12;
-import org.apache.cxf.systest.ws.wssec11.server.Server12Restricted;
+import org.apache.cxf.systest.ws.wssec11.server.StaxServer12;
+import org.apache.cxf.systest.ws.wssec11.server.StaxServer12Restricted;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -32,8 +32,10 @@ import org.junit.Test;
/**
* This class runs the second half of the tests, as having all in
* the one class causes an out of memory problem in eclipse
+ *
+ * It tests DOM clients against the StAX server.
*/
-public class WSSecurity112Test extends WSSecurity11Common {
+public class StaxWSSecurity112Test extends WSSecurity11Common {
private static boolean unrestrictedPoliciesInstalled;
static {
@@ -47,7 +49,7 @@ public class WSSecurity112Test extends W
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(Server12.class, true)
+ launchServer(StaxServer12.class, true)
);
} else {
if (WSSecurity11Common.isIBMJDK16()) {
@@ -59,7 +61,7 @@ public class WSSecurity112Test extends W
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(Server12Restricted.class, true)
+ launchServer(StaxServer12Restricted.class, true)
);
}
}
@@ -86,20 +88,26 @@ public class WSSecurity112Test extends W
"X-AES128",
"X-AES256",
"X-TripleDES",
+ /*
+ * TODO See WSS-472
"XD",
"XD-ES",
"XD-SEES",
+ */
};
} else {
argv = new String[] {
"X",
"X-NoTimestamp",
+ /*
+ * TODO See WSS-472
"XD",
"XD-ES",
"XD-SEES",
+ */
};
}
- runClientServer(argv, unrestrictedPoliciesInstalled, true);
+ runClientServer(argv, unrestrictedPoliciesInstalled, true, true);
}
Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity111Test.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity111Test.java?rev=1506874&r1=1506873&r2=1506874&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity111Test.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity111Test.java Thu Jul 25 10:27:33 2013
@@ -90,7 +90,7 @@ public class WSSecurity111Test extends W
"UX-SEES",
"UXD-SEES",
};
- runClientServer(argv, unrestrictedPoliciesInstalled, false);
+ runClientServer(argv, unrestrictedPoliciesInstalled, false, false);
}
@Test
@@ -104,7 +104,7 @@ public class WSSecurity111Test extends W
"A",
"A-NoTimestamp",
// TODO Derived "AD",
- // TODO EncryptBeforeSigning not working "A-ES",
+ // TODO See WSS-468 EncryptBeforeSigning not working "A-ES",
// TODO Derived "AD-ES",
"UX",
"UX-NoTimestamp",
@@ -112,7 +112,7 @@ public class WSSecurity111Test extends W
"UX-SEES",
// TODO Derived "UXD-SEES",
};
- runClientServerStreaming(argv, unrestrictedPoliciesInstalled, false);
+ runClientServerStreaming(argv, unrestrictedPoliciesInstalled, false, false);
}
Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity112Test.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity112Test.java?rev=1506874&r1=1506873&r2=1506874&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity112Test.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity112Test.java Thu Jul 25 10:27:33 2013
@@ -99,7 +99,7 @@ public class WSSecurity112Test extends W
"XD-SEES",
};
}
- runClientServer(argv, unrestrictedPoliciesInstalled, true);
+ runClientServer(argv, unrestrictedPoliciesInstalled, true, false);
}
Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity11Common.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity11Common.java?rev=1506874&r1=1506873&r2=1506874&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity11Common.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity11Common.java Thu Jul 25 10:27:33 2013
@@ -32,6 +32,8 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.systest.ws.wssec11.server.Server11;
import org.apache.cxf.systest.ws.wssec11.server.Server12;
+import org.apache.cxf.systest.ws.wssec11.server.StaxServer11;
+import org.apache.cxf.systest.ws.wssec11.server.StaxServer12;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.ws.security.SecurityConstants;
@@ -47,7 +49,8 @@ public class WSSecurity11Common extends
private static final String INPUT = "foo";
public void runClientServer(
- String[] argv, boolean unrestrictedPoliciesInstalled, boolean wssecurity12
+ String[] argv, boolean unrestrictedPoliciesInstalled,
+ boolean wssecurity12, boolean streamingServer
) throws IOException {
Bus bus = null;
@@ -61,10 +64,18 @@ public class WSSecurity11Common extends
BusFactory.setThreadDefaultBus(bus);
String portNumber = null;
- if (wssecurity12) {
- portNumber = Server12.PORT;
+ if (streamingServer) {
+ if (wssecurity12) {
+ portNumber = StaxServer12.PORT;
+ } else {
+ portNumber = StaxServer11.PORT;
+ }
} else {
- portNumber = Server11.PORT;
+ if (wssecurity12) {
+ portNumber = Server12.PORT;
+ } else {
+ portNumber = Server11.PORT;
+ }
}
URL wsdlLocation = null;
@@ -91,7 +102,8 @@ public class WSSecurity11Common extends
}
public void runClientServerStreaming(
- String[] argv, boolean unrestrictedPoliciesInstalled, boolean wssecurity12
+ String[] argv, boolean unrestrictedPoliciesInstalled,
+ boolean wssecurity12, boolean streamingServer
) throws IOException {
Bus bus = null;
@@ -105,10 +117,18 @@ public class WSSecurity11Common extends
BusFactory.setThreadDefaultBus(bus);
String portNumber = null;
- if (wssecurity12) {
- portNumber = Server12.PORT;
+ if (streamingServer) {
+ if (wssecurity12) {
+ portNumber = StaxServer12.PORT;
+ } else {
+ portNumber = StaxServer11.PORT;
+ }
} else {
- portNumber = Server11.PORT;
+ if (wssecurity12) {
+ portNumber = Server12.PORT;
+ } else {
+ portNumber = Server11.PORT;
+ }
}
URL wsdlLocation = null;
Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/AbstractServer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/AbstractServer.java?rev=1506874&r1=1506873&r2=1506874&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/AbstractServer.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/AbstractServer.java Thu Jul 25 10:27:33 2013
@@ -27,9 +27,17 @@ import org.apache.cxf.ws.security.Securi
abstract class AbstractServer extends AbstractBusTestServerBase {
String baseUrl;
+ boolean streaming;
+
protected AbstractServer(String baseUrl) throws Exception {
this.baseUrl = baseUrl;
}
+
+ protected AbstractServer(String baseUrl, boolean streaming) throws Exception {
+ this.baseUrl = baseUrl;
+ this.streaming = streaming;
+ }
+
protected void run() {
doPublish(baseUrl + "/APingService", new APingService());
doPublish(baseUrl + "/A-NoTimestampPingService", new ANoTimestampPingService());
@@ -55,6 +63,9 @@ abstract class AbstractServer extends Ab
ep.getProperties().put(SecurityConstants.CALLBACK_HANDLER, new KeystorePasswordCallback());
ep.getProperties().put(SecurityConstants.ENCRYPT_PROPERTIES,
"bob.properties");
+ if (streaming) {
+ ep.getProperties().put(SecurityConstants.ENABLE_STREAMING_SECURITY, "true");
+ }
ep.publish(url);
}
Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/AbstractServerRestricted.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/AbstractServerRestricted.java?rev=1506874&r1=1506873&r2=1506874&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/AbstractServerRestricted.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/AbstractServerRestricted.java Thu Jul 25 10:27:33 2013
@@ -21,23 +21,24 @@ package org.apache.cxf.systest.ws.wssec1
import javax.jws.WebService;
import javax.xml.ws.Endpoint;
-import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactory;
-import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.systest.ws.common.KeystorePasswordCallback;
-import org.apache.cxf.systest.ws.wssec11.RestrictedAlgorithmSuiteLoader;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
import org.apache.cxf.ws.security.SecurityConstants;
abstract class AbstractServerRestricted extends AbstractBusTestServerBase {
+ String baseUrl;
+ boolean streaming;
protected AbstractServerRestricted(String baseUrl) throws Exception {
-
- Bus bus = new SpringBusFactory().createBus("org/apache/cxf/systest/ws/wssec11/server.xml");
- new RestrictedAlgorithmSuiteLoader(bus);
- BusFactory.setDefaultBus(bus);
- setBus(bus);
-
+ this.baseUrl = baseUrl;
+ }
+
+ protected AbstractServerRestricted(String baseUrl, boolean streaming) throws Exception {
+ this.baseUrl = baseUrl;
+ this.streaming = streaming;
+ }
+
+ protected void run() {
doPublish(baseUrl + "/APingService", new APingService());
doPublish(baseUrl + "/A-NoTimestampPingService", new ANoTimestampPingService());
doPublish(baseUrl + "/ADPingService", new ADPingService());
@@ -61,6 +62,9 @@ abstract class AbstractServerRestricted
Endpoint ep = Endpoint.create(obj);
ep.getProperties().put(SecurityConstants.CALLBACK_HANDLER, new KeystorePasswordCallback());
ep.getProperties().put(SecurityConstants.ENCRYPT_PROPERTIES, "restricted/bob.properties");
+ if (streaming) {
+ ep.getProperties().put(SecurityConstants.ENABLE_STREAMING_SECURITY, "true");
+ }
ep.publish(url);
}
Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11Restricted.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11Restricted.java?rev=1506874&r1=1506873&r2=1506874&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11Restricted.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11Restricted.java Thu Jul 25 10:27:33 2013
@@ -21,6 +21,7 @@ package org.apache.cxf.systest.ws.wssec1
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.systest.ws.wssec11.RestrictedAlgorithmSuiteLoader;
public class Server11Restricted extends AbstractServerRestricted {
static final String PORT = allocatePort(Server11.class);
@@ -36,14 +37,10 @@ public class Server11Restricted extends
protected void run() {
Bus busLocal = new SpringBusFactory().createBus(
"org/apache/cxf/systest/ws/wssec11/server.xml");
+ new RestrictedAlgorithmSuiteLoader(busLocal);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
-
- try {
- new Server11Restricted("http://localhost:" + PORT);
- } catch (Exception e) {
- e.printStackTrace();
- }
+ super.run();
}
}
Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server12Restricted.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server12Restricted.java?rev=1506874&r1=1506873&r2=1506874&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server12Restricted.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server12Restricted.java Thu Jul 25 10:27:33 2013
@@ -21,6 +21,7 @@ package org.apache.cxf.systest.ws.wssec1
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.systest.ws.wssec11.RestrictedAlgorithmSuiteLoader;
public class Server12Restricted extends AbstractServerRestricted {
static final String PORT = allocatePort(Server12.class);
@@ -36,14 +37,10 @@ public class Server12Restricted extends
protected void run() {
Bus busLocal = new SpringBusFactory().createBus(
"org/apache/cxf/systest/ws/wssec11/server.xml");
+ new RestrictedAlgorithmSuiteLoader(busLocal);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
-
- try {
- new Server12Restricted("http://localhost:" + PORT);
- } catch (Exception e) {
- e.printStackTrace();
- }
+ super.run();
}
}
Copied: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/StaxServer11.java (from r1506823, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11Restricted.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/StaxServer11.java?p2=cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/StaxServer11.java&p1=cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11Restricted.java&r1=1506823&r2=1506874&rev=1506874&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11Restricted.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/StaxServer11.java Thu Jul 25 10:27:33 2013
@@ -22,15 +22,15 @@ import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
-public class Server11Restricted extends AbstractServerRestricted {
- static final String PORT = allocatePort(Server11.class);
+public class StaxServer11 extends AbstractServer {
+ public static final String PORT = allocatePort(StaxServer11.class);
- public Server11Restricted() throws Exception {
- super("http://localhost:" + PORT);
+ public StaxServer11() throws Exception {
+ super("http://localhost:" + PORT, true);
}
- public Server11Restricted(String baseUrl) throws Exception {
- super(baseUrl);
+ public StaxServer11(String baseUrl) throws Exception {
+ super(baseUrl, true);
}
protected void run() {
@@ -38,12 +38,7 @@ public class Server11Restricted extends
"org/apache/cxf/systest/ws/wssec11/server.xml");
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
-
- try {
- new Server11Restricted("http://localhost:" + PORT);
- } catch (Exception e) {
- e.printStackTrace();
- }
+ super.run();
}
}
Copied: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/StaxServer11Restricted.java (from r1506823, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11Restricted.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/StaxServer11Restricted.java?p2=cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/StaxServer11Restricted.java&p1=cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11Restricted.java&r1=1506823&r2=1506874&rev=1506874&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11Restricted.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/StaxServer11Restricted.java Thu Jul 25 10:27:33 2013
@@ -21,29 +21,26 @@ package org.apache.cxf.systest.ws.wssec1
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.systest.ws.wssec11.RestrictedAlgorithmSuiteLoader;
-public class Server11Restricted extends AbstractServerRestricted {
- static final String PORT = allocatePort(Server11.class);
+public class StaxServer11Restricted extends AbstractServerRestricted {
+ static final String PORT = allocatePort(StaxServer11.class);
- public Server11Restricted() throws Exception {
- super("http://localhost:" + PORT);
+ public StaxServer11Restricted() throws Exception {
+ super("http://localhost:" + PORT, true);
}
- public Server11Restricted(String baseUrl) throws Exception {
- super(baseUrl);
+ public StaxServer11Restricted(String baseUrl) throws Exception {
+ super(baseUrl, true);
}
protected void run() {
Bus busLocal = new SpringBusFactory().createBus(
"org/apache/cxf/systest/ws/wssec11/server.xml");
+ new RestrictedAlgorithmSuiteLoader(busLocal);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
-
- try {
- new Server11Restricted("http://localhost:" + PORT);
- } catch (Exception e) {
- e.printStackTrace();
- }
+ super.run();
}
}
Copied: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/StaxServer12.java (from r1506823, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11Restricted.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/StaxServer12.java?p2=cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/StaxServer12.java&p1=cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11Restricted.java&r1=1506823&r2=1506874&rev=1506874&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11Restricted.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/StaxServer12.java Thu Jul 25 10:27:33 2013
@@ -22,15 +22,15 @@ import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
-public class Server11Restricted extends AbstractServerRestricted {
- static final String PORT = allocatePort(Server11.class);
+public class StaxServer12 extends AbstractServer {
+ public static final String PORT = allocatePort(StaxServer12.class);
- public Server11Restricted() throws Exception {
- super("http://localhost:" + PORT);
+ public StaxServer12() throws Exception {
+ super("http://localhost:" + PORT, true);
}
- public Server11Restricted(String baseUrl) throws Exception {
- super(baseUrl);
+ public StaxServer12(String baseUrl) throws Exception {
+ super(baseUrl, true);
}
protected void run() {
@@ -38,12 +38,7 @@ public class Server11Restricted extends
"org/apache/cxf/systest/ws/wssec11/server.xml");
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
-
- try {
- new Server11Restricted("http://localhost:" + PORT);
- } catch (Exception e) {
- e.printStackTrace();
- }
+ super.run();
}
}
Copied: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/StaxServer12Restricted.java (from r1506823, cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11Restricted.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/StaxServer12Restricted.java?p2=cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/StaxServer12Restricted.java&p1=cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11Restricted.java&r1=1506823&r2=1506874&rev=1506874&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11Restricted.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/StaxServer12Restricted.java Thu Jul 25 10:27:33 2013
@@ -21,29 +21,26 @@ package org.apache.cxf.systest.ws.wssec1
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.systest.ws.wssec11.RestrictedAlgorithmSuiteLoader;
-public class Server11Restricted extends AbstractServerRestricted {
- static final String PORT = allocatePort(Server11.class);
+public class StaxServer12Restricted extends AbstractServerRestricted {
+ static final String PORT = allocatePort(StaxServer12.class);
- public Server11Restricted() throws Exception {
- super("http://localhost:" + PORT);
+ public StaxServer12Restricted() throws Exception {
+ super("http://localhost:" + PORT, true);
}
- public Server11Restricted(String baseUrl) throws Exception {
- super(baseUrl);
+ public StaxServer12Restricted(String baseUrl) throws Exception {
+ super(baseUrl, true);
}
protected void run() {
Bus busLocal = new SpringBusFactory().createBus(
"org/apache/cxf/systest/ws/wssec11/server.xml");
+ new RestrictedAlgorithmSuiteLoader(busLocal);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
-
- try {
- new Server11Restricted("http://localhost:" + PORT);
- } catch (Exception e) {
- e.printStackTrace();
- }
+ super.run();
}
}