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 2012/05/09 17:31:16 UTC
svn commit: r1336242 - in /cxf/branches/2.5.x-fixes/systests:
ws-security-examples/ ws-security/
ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/
ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/
Author: coheigea
Date: Wed May 9 15:31:15 2012
New Revision: 1336242
URL: http://svn.apache.org/viewvc?rev=1336242&view=rev
Log:
Change fork-mode from "pertest" to "once" for the WS-Security system tests. T
- This results in a very large speed up in the time it takes to run tests when nothing else is running. This is because SecureRandom was getting seeded "pertest" and pauses until it collects enough random data.
Added:
cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/AbstractServer.java
- copied, changed from r1336221, cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server.java
cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/AbstractServerRestricted.java
- copied, changed from r1336221, cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/ServerRestricted.java
cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11.java
cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11Restricted.java
cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server12.java
cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server12Restricted.java
Removed:
cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server.java
cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/ServerRestricted.java
Modified:
cxf/branches/2.5.x-fixes/systests/ws-security-examples/pom.xml
cxf/branches/2.5.x-fixes/systests/ws-security/pom.xml
cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity111Test.java
cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity112Test.java
cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity11Common.java
Modified: cxf/branches/2.5.x-fixes/systests/ws-security-examples/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security-examples/pom.xml?rev=1336242&r1=1336241&r2=1336242&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security-examples/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/systests/ws-security-examples/pom.xml Wed May 9 15:31:15 2012
@@ -202,9 +202,6 @@
</dependency>
</dependencies>
- <properties>
- <cxf.surefire.fork.mode>pertest</cxf.surefire.fork.mode>
- </properties>
<profiles>
<profile>
<id>jaxws22</id>
Modified: cxf/branches/2.5.x-fixes/systests/ws-security/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/pom.xml?rev=1336242&r1=1336241&r2=1336242&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/systests/ws-security/pom.xml Wed May 9 15:31:15 2012
@@ -199,9 +199,6 @@
</dependency>
</dependencies>
- <properties>
- <cxf.surefire.fork.mode>pertest</cxf.surefire.fork.mode>
- </properties>
<profiles>
<profile>
<id>jaxws22</id>
Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity111Test.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity111Test.java?rev=1336242&r1=1336241&r2=1336242&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity111Test.java (original)
+++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity111Test.java Wed May 9 15:31:15 2012
@@ -20,8 +20,8 @@
package org.apache.cxf.systest.ws.wssec11;
import org.apache.cxf.systest.ws.common.SecurityTestUtil;
-import org.apache.cxf.systest.ws.wssec11.server.Server;
-import org.apache.cxf.systest.ws.wssec11.server.ServerRestricted;
+import org.apache.cxf.systest.ws.wssec11.server.Server11;
+import org.apache.cxf.systest.ws.wssec11.server.Server11Restricted;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -44,7 +44,7 @@ public class WSSecurity111Test extends W
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(Server.class, true)
+ launchServer(Server11.class, true)
);
} else {
if (WSSecurity11Common.isIBMJDK16()) {
@@ -56,7 +56,7 @@ public class WSSecurity111Test extends W
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(ServerRestricted.class, true)
+ launchServer(Server11Restricted.class, true)
);
}
}
@@ -85,7 +85,7 @@ public class WSSecurity111Test extends W
"UX-SEES",
"UXD-SEES",
};
- runClientServer(argv, unrestrictedPoliciesInstalled);
+ runClientServer(argv, unrestrictedPoliciesInstalled, false);
}
Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity112Test.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity112Test.java?rev=1336242&r1=1336241&r2=1336242&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity112Test.java (original)
+++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity112Test.java Wed May 9 15:31:15 2012
@@ -21,8 +21,8 @@ package org.apache.cxf.systest.ws.wssec1
import org.apache.cxf.systest.ws.common.SecurityTestUtil;
-import org.apache.cxf.systest.ws.wssec11.server.Server;
-import org.apache.cxf.systest.ws.wssec11.server.ServerRestricted;
+import org.apache.cxf.systest.ws.wssec11.server.Server12;
+import org.apache.cxf.systest.ws.wssec11.server.Server12Restricted;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -45,7 +45,7 @@ public class WSSecurity112Test extends W
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(Server.class, true)
+ launchServer(Server12.class, true)
);
} else {
if (WSSecurity11Common.isIBMJDK16()) {
@@ -57,7 +57,7 @@ public class WSSecurity112Test extends W
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(ServerRestricted.class, true)
+ launchServer(Server12Restricted.class, true)
);
}
}
@@ -96,7 +96,7 @@ public class WSSecurity112Test extends W
"XD-SEES",
};
}
- runClientServer(argv, unrestrictedPoliciesInstalled);
+ runClientServer(argv, unrestrictedPoliciesInstalled, true);
}
Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity11Common.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity11Common.java?rev=1336242&r1=1336241&r2=1336242&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity11Common.java (original)
+++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity11Common.java Wed May 9 15:31:15 2012
@@ -31,7 +31,8 @@ import javax.xml.namespace.QName;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
-import org.apache.cxf.systest.ws.wssec11.server.Server;
+import org.apache.cxf.systest.ws.wssec11.server.Server11;
+import org.apache.cxf.systest.ws.wssec11.server.Server12;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
@@ -43,12 +44,12 @@ import wssec.wssec11.PingService11;
*
*/
public class WSSecurity11Common extends AbstractBusClientServerTestBase {
- static final String PORT = allocatePort(Server.class);
-
private static final String INPUT = "foo";
- public void runClientServer(String[] argv, boolean unrestrictedPoliciesInstalled) {
+ public void runClientServer(
+ String[] argv, boolean unrestrictedPoliciesInstalled, boolean wssecurity12
+ ) {
Bus bus = null;
if (unrestrictedPoliciesInstalled) {
@@ -59,10 +60,18 @@ public class WSSecurity11Common extends
}
BusFactory.setDefaultBus(bus);
BusFactory.setThreadDefaultBus(bus);
+
+ String portNumber = null;
+ if (wssecurity12) {
+ portNumber = Server12.PORT;
+ } else {
+ portNumber = Server11.PORT;
+ }
+
URL wsdlLocation = null;
for (String portPrefix : argv) {
PingService11 svc = null;
- wsdlLocation = getWsdlLocation(portPrefix);
+ wsdlLocation = getWsdlLocation(portPrefix, portNumber);
svc = new PingService11(wsdlLocation);
final IPingService port =
svc.getPort(
@@ -80,9 +89,9 @@ public class WSSecurity11Common extends
- private static URL getWsdlLocation(String portPrefix) {
+ private static URL getWsdlLocation(String portPrefix, String portNumber) {
try {
- return new URL("http://localhost:" + PORT + "/" + portPrefix + "PingService?wsdl");
+ return new URL("http://localhost:" + portNumber + "/" + portPrefix + "PingService?wsdl");
} catch (MalformedURLException mue) {
return null;
}
Copied: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/AbstractServer.java (from r1336221, cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server.java)
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/AbstractServer.java?p2=cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/AbstractServer.java&p1=cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server.java&r1=1336221&r2=1336242&rev=1336242&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server.java (original)
+++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/AbstractServer.java Wed May 9 15:31:15 2012
@@ -21,20 +21,12 @@ 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.testutil.common.AbstractBusTestServerBase;
import org.apache.cxf.ws.security.SecurityConstants;
-public class Server extends AbstractBusTestServerBase {
- static final String PORT = allocatePort(Server.class);
-
- public Server() throws Exception {
- this("http://localhost:" + PORT);
- }
+abstract class AbstractServer extends AbstractBusTestServerBase {
- protected Server(String baseUrl) throws Exception {
+ protected AbstractServer(String baseUrl) throws Exception {
doPublish(baseUrl + "/APingService", new APingService());
@@ -64,29 +56,6 @@ public class Server extends AbstractBusT
ep.publish(url);
}
- protected void run() {
- Bus busLocal = new SpringBusFactory().createBus(
- "org/apache/cxf/systest/ws/wssec11/server/server.xml");
- BusFactory.setDefaultBus(busLocal);
- setBus(busLocal);
-
- try {
- new Server("http://localhost:" + PORT);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- public static void main(String args[]) throws Exception {
- new SpringBusFactory().createBus("org/apache/cxf/systest/ws/wssec11/server/server.xml");
- new Server("http://localhost:" + PORT);
- System.out.println("Server ready...");
-
- Thread.sleep(60 * 60 * 10000);
- System.out.println("Server exiting");
- System.exit(0);
- }
-
@WebService(targetNamespace = "http://WSSec/wssec11",
serviceName = "PingService11",
portName = "A_IPingService",
Copied: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/AbstractServerRestricted.java (from r1336221, cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/ServerRestricted.java)
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/AbstractServerRestricted.java?p2=cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/AbstractServerRestricted.java&p1=cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/ServerRestricted.java&r1=1336221&r2=1336242&rev=1336242&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/ServerRestricted.java (original)
+++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/AbstractServerRestricted.java Wed May 9 15:31:15 2012
@@ -28,14 +28,9 @@ import org.apache.cxf.systest.ws.wssec11
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
import org.apache.cxf.ws.security.SecurityConstants;
-public class ServerRestricted extends AbstractBusTestServerBase {
- static final String PORT = allocatePort(Server.class);
-
- public ServerRestricted() throws Exception {
- this("http://localhost:" + PORT);
- }
+abstract class AbstractServerRestricted extends AbstractBusTestServerBase {
- protected ServerRestricted(String baseUrl) throws Exception {
+ protected AbstractServerRestricted(String baseUrl) throws Exception {
Bus bus = new SpringBusFactory().createBus("org/apache/cxf/systest/ws/wssec11/server/server.xml");
new RestrictedAlgorithmSuiteLoader(bus);
@@ -69,23 +64,6 @@ public class ServerRestricted extends Ab
ep.publish(url);
}
- protected void run() {
- try {
- new ServerRestricted("http://localhost:" + PORT);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- public static void main(String args[]) throws Exception {
- new ServerRestricted("http://localhost:" + PORT);
- System.out.println("Server ready...");
-
- Thread.sleep(60 * 60 * 10000);
- System.out.println("Server exiting");
- System.exit(0);
- }
-
@WebService(targetNamespace = "http://WSSec/wssec11",
serviceName = "PingService11",
portName = "A_IPingService",
Added: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11.java?rev=1336242&view=auto
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11.java (added)
+++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11.java Wed May 9 15:31:15 2012
@@ -0,0 +1,59 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.systest.ws.wssec11.server;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+
+public class Server11 extends AbstractServer {
+ public static final String PORT = allocatePort(Server11.class);
+
+ public Server11() throws Exception {
+ super("http://localhost:" + PORT);
+ }
+
+ public Server11(String baseUrl) throws Exception {
+ super(baseUrl);
+ }
+
+ protected void run() {
+ Bus busLocal = new SpringBusFactory().createBus(
+ "org/apache/cxf/systest/ws/wssec11/server/server.xml");
+ BusFactory.setDefaultBus(busLocal);
+ setBus(busLocal);
+
+ try {
+ new Server11("http://localhost:" + PORT);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ public static void main(String args[]) throws Exception {
+ new SpringBusFactory().createBus("org/apache/cxf/systest/ws/wssec11/server/server.xml");
+ new Server11("http://localhost:" + PORT);
+ System.out.println("Server ready...");
+
+ Thread.sleep(60 * 60 * 10000);
+ System.out.println("Server exiting");
+ System.exit(0);
+ }
+
+}
Added: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11Restricted.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11Restricted.java?rev=1336242&view=auto
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11Restricted.java (added)
+++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11Restricted.java Wed May 9 15:31:15 2012
@@ -0,0 +1,59 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.systest.ws.wssec11.server;
+
+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 Server11Restricted() throws Exception {
+ super("http://localhost:" + PORT);
+ }
+
+ public Server11Restricted(String baseUrl) throws Exception {
+ super(baseUrl);
+ }
+
+ protected void run() {
+ Bus busLocal = new SpringBusFactory().createBus(
+ "org/apache/cxf/systest/ws/wssec11/server/server.xml");
+ BusFactory.setDefaultBus(busLocal);
+ setBus(busLocal);
+
+ try {
+ new Server11Restricted("http://localhost:" + PORT);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ public static void main(String args[]) throws Exception {
+ new SpringBusFactory().createBus("org/apache/cxf/systest/ws/wssec11/server/server.xml");
+ new Server11Restricted("http://localhost:" + PORT);
+ System.out.println("Server ready...");
+
+ Thread.sleep(60 * 60 * 10000);
+ System.out.println("Server exiting");
+ System.exit(0);
+ }
+
+}
Added: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server12.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server12.java?rev=1336242&view=auto
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server12.java (added)
+++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server12.java Wed May 9 15:31:15 2012
@@ -0,0 +1,59 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.systest.ws.wssec11.server;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+
+public class Server12 extends AbstractServer {
+ public static final String PORT = allocatePort(Server12.class);
+
+ public Server12() throws Exception {
+ super("http://localhost:" + PORT);
+ }
+
+ public Server12(String baseUrl) throws Exception {
+ super(baseUrl);
+ }
+
+ protected void run() {
+ Bus busLocal = new SpringBusFactory().createBus(
+ "org/apache/cxf/systest/ws/wssec11/server/server.xml");
+ BusFactory.setDefaultBus(busLocal);
+ setBus(busLocal);
+
+ try {
+ new Server12("http://localhost:" + PORT);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ public static void main(String args[]) throws Exception {
+ new SpringBusFactory().createBus("org/apache/cxf/systest/ws/wssec11/server/server.xml");
+ new Server12("http://localhost:" + PORT);
+ System.out.println("Server ready...");
+
+ Thread.sleep(60 * 60 * 10000);
+ System.out.println("Server exiting");
+ System.exit(0);
+ }
+
+}
Added: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server12Restricted.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server12Restricted.java?rev=1336242&view=auto
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server12Restricted.java (added)
+++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server12Restricted.java Wed May 9 15:31:15 2012
@@ -0,0 +1,59 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.systest.ws.wssec11.server;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+
+public class Server12Restricted extends AbstractServerRestricted {
+ static final String PORT = allocatePort(Server12.class);
+
+ public Server12Restricted() throws Exception {
+ super("http://localhost:" + PORT);
+ }
+
+ public Server12Restricted(String baseUrl) throws Exception {
+ super(baseUrl);
+ }
+
+ protected void run() {
+ Bus busLocal = new SpringBusFactory().createBus(
+ "org/apache/cxf/systest/ws/wssec11/server/server.xml");
+ BusFactory.setDefaultBus(busLocal);
+ setBus(busLocal);
+
+ try {
+ new Server12Restricted("http://localhost:" + PORT);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ public static void main(String args[]) throws Exception {
+ new SpringBusFactory().createBus("org/apache/cxf/systest/ws/wssec11/server/server.xml");
+ new Server12Restricted("http://localhost:" + PORT);
+ System.out.println("Server ready...");
+
+ Thread.sleep(60 * 60 * 10000);
+ System.out.println("Server exiting");
+ System.exit(0);
+ }
+
+}