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/10/03 14:39:57 UTC
svn commit: r1393463 - in /cxf/trunk:
services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/
services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/
services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/...
Author: coheigea
Date: Wed Oct 3 12:39:57 2012
New Revision: 1393463
URL: http://svn.apache.org/viewvc?rev=1393463&view=rev
Log:
Cleanup of sleeps in security tests.
Modified:
cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java
cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java
cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java
cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java
cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewTest.java
cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/server/Server.java
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/AuthorizedServer.java
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/AuthorizedServer2.java
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/Server.java
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11.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/Server12.java
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server12Restricted.java
Modified: cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java?rev=1393463&r1=1393462&r2=1393463&view=diff
==============================================================================
--- cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java (original)
+++ cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java Wed Oct 3 12:39:57 2012
@@ -223,7 +223,7 @@ public class RenewSamlUnitTest extends o
WSConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", callbackHandler, 50, true, true
);
// Sleep to expire the token
- Thread.sleep(1000);
+ Thread.sleep(100);
Document doc = samlToken.getOwnerDocument();
samlToken = (Element)doc.appendChild(samlToken);
@@ -317,7 +317,7 @@ public class RenewSamlUnitTest extends o
WSConstants.WSS_SAML2_TOKEN_TYPE, crypto, "mystskey", callbackHandler, 50, true, true
);
// Sleep to expire the token
- Thread.sleep(1000);
+ Thread.sleep(100);
Document doc = samlToken.getOwnerDocument();
samlToken = (Element)doc.appendChild(samlToken);
@@ -406,7 +406,7 @@ public class RenewSamlUnitTest extends o
WSConstants.WSS_SAML2_TOKEN_TYPE, crypto, "mystskey", callbackHandler, 50, true, true
);
// Sleep to expire the token
- Thread.sleep(1000);
+ Thread.sleep(100);
Document doc = samlToken.getOwnerDocument();
samlToken = (Element)doc.appendChild(samlToken);
Modified: cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java?rev=1393463&r1=1393462&r2=1393463&view=diff
==============================================================================
--- cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java (original)
+++ cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java Wed Oct 3 12:39:57 2012
@@ -100,7 +100,7 @@ public class SAMLTokenRenewerLifetimeTes
WSConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", callbackHandler, 50, true, true
);
// Sleep to expire the token
- Thread.sleep(1000);
+ Thread.sleep(100);
ReceivedToken renewTarget = new ReceivedToken(samlToken);
renewTarget.setState(STATE.VALID);
@@ -140,7 +140,7 @@ public class SAMLTokenRenewerLifetimeTes
WSConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", callbackHandler, 50, true, true
);
// Sleep to expire the token
- Thread.sleep(1000);
+ Thread.sleep(100);
ReceivedToken renewTarget = new ReceivedToken(samlToken);
renewTarget.setState(STATE.VALID);
@@ -192,7 +192,7 @@ public class SAMLTokenRenewerLifetimeTes
WSConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", callbackHandler, 50, true, true
);
// Sleep to expire the token
- Thread.sleep(1000);
+ Thread.sleep(100);
ReceivedToken renewTarget = new ReceivedToken(samlToken);
renewTarget.setState(STATE.VALID);
@@ -243,7 +243,7 @@ public class SAMLTokenRenewerLifetimeTes
WSConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", callbackHandler, 50, true, true
);
// Sleep to expire the token
- Thread.sleep(1000);
+ Thread.sleep(100);
ReceivedToken renewTarget = new ReceivedToken(samlToken);
renewTarget.setState(STATE.VALID);
@@ -299,7 +299,7 @@ public class SAMLTokenRenewerLifetimeTes
WSConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", callbackHandler, 50, true, true
);
// Sleep to expire the token
- Thread.sleep(1000);
+ Thread.sleep(100);
ReceivedToken renewTarget = new ReceivedToken(samlToken);
renewTarget.setState(STATE.VALID);
Modified: cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java?rev=1393463&r1=1393462&r2=1393463&view=diff
==============================================================================
--- cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java (original)
+++ cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java Wed Oct 3 12:39:57 2012
@@ -92,7 +92,7 @@ public class SAMLTokenRenewerRealmTest e
Element samlToken = createSAMLAssertion(providerParameters, "A", 50, true, true);
// Sleep to expire the token
- Thread.sleep(1000);
+ Thread.sleep(100);
Document doc = samlToken.getOwnerDocument();
samlToken = (Element)doc.appendChild(samlToken);
@@ -165,7 +165,7 @@ public class SAMLTokenRenewerRealmTest e
Element samlToken = createSAMLAssertion(providerParameters, "B", 50, true, true);
// Sleep to expire the token
- Thread.sleep(1000);
+ Thread.sleep(100);
Document doc = samlToken.getOwnerDocument();
samlToken = (Element)doc.appendChild(samlToken);
Modified: cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java?rev=1393463&r1=1393462&r2=1393463&view=diff
==============================================================================
--- cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java (original)
+++ cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java Wed Oct 3 12:39:57 2012
@@ -206,7 +206,7 @@ public class SAMLTokenRenewerTest extend
Document doc = samlToken.getOwnerDocument();
samlToken = (Element)doc.appendChild(samlToken);
// Sleep to expire the token
- Thread.sleep(1000);
+ Thread.sleep(100);
// Validate the Assertion
TokenValidator samlTokenValidator = new SAMLTokenValidator();
@@ -282,7 +282,7 @@ public class SAMLTokenRenewerTest extend
Document doc = samlToken.getOwnerDocument();
samlToken = (Element)doc.appendChild(samlToken);
// Sleep to expire the token
- Thread.sleep(1000);
+ Thread.sleep(100);
// Validate the Assertion
TokenValidator samlTokenValidator = new SAMLTokenValidator();
@@ -359,7 +359,7 @@ public class SAMLTokenRenewerTest extend
Document doc = samlToken.getOwnerDocument();
samlToken = (Element)doc.appendChild(samlToken);
// Sleep to expire the token
- Thread.sleep(1000);
+ Thread.sleep(100);
// Validate the Assertion
TokenValidator samlTokenValidator = new SAMLTokenValidator();
@@ -418,7 +418,7 @@ public class SAMLTokenRenewerTest extend
Document doc = samlToken.getOwnerDocument();
samlToken = (Element)doc.appendChild(samlToken);
// Sleep to expire the token
- Thread.sleep(2000);
+ Thread.sleep(1500);
// Validate the Assertion
TokenValidator samlTokenValidator = new SAMLTokenValidator();
Modified: cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewTest.java?rev=1393463&r1=1393462&r2=1393463&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewTest.java (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewTest.java Wed Oct 3 12:39:57 2012
@@ -74,8 +74,7 @@ public class SAMLRenewTest extends Abstr
}
@org.junit.Test
- public void testRenewExpiredSAML1Token() throws Exception {
-
+ public void testRenewExpiredTokens() throws Exception {
SpringBusFactory bf = new SpringBusFactory();
URL busFile = SAMLRenewTest.class.getResource("cxf-client.xml");
@@ -85,95 +84,50 @@ public class SAMLRenewTest extends Abstr
URL wsdl = SAMLRenewTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
- QName portQName = new QName(NAMESPACE, "DoubleItTransportSaml1Port");
- DoubleItPortType transportPort =
- service.getPort(portQName, DoubleItPortType.class);
- updateAddressPort(transportPort, PORT);
- // Make initial successful invocation
- doubleIt(transportPort, 25);
+ QName saml1PortQName = new QName(NAMESPACE, "DoubleItTransportSaml1Port");
+ DoubleItPortType saml1Port =
+ service.getPort(saml1PortQName, DoubleItPortType.class);
+ updateAddressPort(saml1Port, PORT);
+
+ QName saml1BearerPortQName = new QName(NAMESPACE, "DoubleItTransportSaml1BearerPort");
+ DoubleItPortType saml1BearerPort =
+ service.getPort(saml1BearerPortQName, DoubleItPortType.class);
+ updateAddressPort(saml1BearerPort, PORT);
+
+ QName saml2PortQName = new QName(NAMESPACE, "DoubleItTransportSaml2Port");
+ DoubleItPortType saml2Port =
+ service.getPort(saml2PortQName, DoubleItPortType.class);
+ updateAddressPort(saml2Port, PORT);
+
+ // Make initial successful invocation(s)
+ doubleIt(saml1Port, 25);
+ doubleIt(saml1BearerPort, 30);
+ doubleIt(saml2Port, 35);
- // Now sleep to expire the token
+ // Now sleep to expire the token(s)
Thread.sleep(8 * 1000);
- BindingProvider p = (BindingProvider)transportPort;
- STSClient stsClient = (STSClient)p.getRequestContext().get(SecurityConstants.STS_CLIENT);
- stsClient.setTtl(300);
-
// The IssuedTokenInterceptorProvider should renew the token
- doubleIt(transportPort, 30);
-
- bus.shutdown(true);
- }
-
- @org.junit.Test
- public void testRenewExpiredSAML1BearerToken() throws Exception {
-
- SpringBusFactory bf = new SpringBusFactory();
- URL busFile = SAMLRenewTest.class.getResource("cxf-client.xml");
-
- Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
-
- URL wsdl = SAMLRenewTest.class.getResource("DoubleIt.wsdl");
- Service service = Service.create(wsdl, SERVICE_QNAME);
- QName portQName = new QName(NAMESPACE, "DoubleItTransportSaml1BearerPort");
- DoubleItPortType transportPort =
- service.getPort(portQName, DoubleItPortType.class);
- updateAddressPort(transportPort, PORT);
-
- // Make initial successful invocation
- doubleIt(transportPort, 25);
-
- // Now sleep to expire the token
- Thread.sleep(8 * 1000);
-
- BindingProvider p = (BindingProvider)transportPort;
+ BindingProvider p = (BindingProvider)saml1Port;
STSClient stsClient = (STSClient)p.getRequestContext().get(SecurityConstants.STS_CLIENT);
stsClient.setTtl(300);
+ doubleIt(saml1Port, 25);
try {
// The IssuedTokenInterceptorProvider should renew the token - but it should fail on
// lack of Proof-of-Possession
- doubleIt(transportPort, 30);
+ doubleIt(saml1BearerPort, 30);
fail("Expected failure on no Proof-of-Possession");
} catch (Exception ex) {
// expected
}
- bus.shutdown(true);
- }
-
- @org.junit.Test
- public void testRenewExpiredSAML2Token() throws Exception {
-
- SpringBusFactory bf = new SpringBusFactory();
- URL busFile = SAMLRenewTest.class.getResource("cxf-client.xml");
-
- Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
-
- URL wsdl = SAMLRenewTest.class.getResource("DoubleIt.wsdl");
- Service service = Service.create(wsdl, SERVICE_QNAME);
- QName portQName = new QName(NAMESPACE, "DoubleItTransportSaml2Port");
- DoubleItPortType transportPort =
- service.getPort(portQName, DoubleItPortType.class);
- updateAddressPort(transportPort, PORT);
-
- // Make initial successful invocation
- doubleIt(transportPort, 25);
-
- // Now sleep to expire the token
- Thread.sleep(8 * 1000);
-
- BindingProvider p = (BindingProvider)transportPort;
- STSClient stsClient = (STSClient)p.getRequestContext().get(SecurityConstants.STS_CLIENT);
- stsClient.setTtl(300);
-
// The IssuedTokenInterceptorProvider should renew the token
- doubleIt(transportPort, 30);
+ p = (BindingProvider)saml2Port;
+ stsClient = (STSClient)p.getRequestContext().get(SecurityConstants.STS_CLIENT);
+ stsClient.setTtl(300);
+ doubleIt(saml2Port, 35);
bus.shutdown(true);
}
Modified: cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java?rev=1393463&r1=1393462&r2=1393463&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java Wed Oct 3 12:39:57 2012
@@ -70,10 +70,10 @@ public class SAMLRenewUnitTest extends A
// Request the token
SecurityToken token =
- requestSecurityToken(bus, wsdlLocation, WSConstants.WSS_SAML_TOKEN_TYPE, 5, true);
+ requestSecurityToken(bus, wsdlLocation, WSConstants.WSS_SAML_TOKEN_TYPE, 2, true);
assertNotNull(token);
// Sleep to expire the token
- Thread.sleep(5000);
+ Thread.sleep(2100);
// Renew the token
SecurityToken renewedToken = renewSecurityToken(bus, wsdlLocation, token, false);
@@ -107,10 +107,10 @@ public class SAMLRenewUnitTest extends A
// Request the token
SecurityToken token =
- requestSecurityToken(bus, wsdlLocation, WSConstants.WSS_SAML2_TOKEN_TYPE, 5, true);
+ requestSecurityToken(bus, wsdlLocation, WSConstants.WSS_SAML2_TOKEN_TYPE, 2, true);
assertNotNull(token);
// Sleep to expire the token
- Thread.sleep(5000);
+ Thread.sleep(2100);
// Renew the token
SecurityToken renewedToken = renewSecurityToken(bus, wsdlLocation, token, false);
@@ -144,10 +144,10 @@ public class SAMLRenewUnitTest extends A
// Request the token
SecurityToken token =
- requestSecurityToken(bus, wsdlLocation, WSConstants.WSS_SAML2_TOKEN_TYPE, 5, false);
+ requestSecurityToken(bus, wsdlLocation, WSConstants.WSS_SAML2_TOKEN_TYPE, 2, false);
assertNotNull(token);
// Sleep to expire the token
- Thread.sleep(5000);
+ Thread.sleep(2100);
// Renew the token - this will fail as we didn't send a Renewing @OK attribute
try {
@@ -206,10 +206,10 @@ public class SAMLRenewUnitTest extends A
// Request the token
SecurityToken token =
- requestSecurityToken(bus, wsdlLocation, WSConstants.WSS_SAML2_TOKEN_TYPE, 5, true);
+ requestSecurityToken(bus, wsdlLocation, WSConstants.WSS_SAML2_TOKEN_TYPE, 2, true);
assertNotNull(token);
// Sleep to expire the token
- Thread.sleep(5000);
+ Thread.sleep(2100);
// Renew the token
token.setIssuerAddress("http://www.apache.org");
Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/server/Server.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/server/Server.java?rev=1393463&r1=1393462&r2=1393463&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/server/Server.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/server/Server.java Wed Oct 3 12:39:57 2012
@@ -116,17 +116,6 @@ public class Server extends AbstractBusT
ep.publish(url);
}
- public static void main(String args[]) throws Exception {
- new SpringBusFactory().createBus("org/apache/cxf/systest/ws/wssc/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/wssc",
serviceName = "PingService",
portName = "SecureConversation_MutualCertificate10SignEncrypt_IPingService",
Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/AuthorizedServer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/AuthorizedServer.java?rev=1393463&r1=1393462&r2=1393463&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/AuthorizedServer.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/AuthorizedServer.java Wed Oct 3 12:39:57 2012
@@ -39,14 +39,5 @@ public class AuthorizedServer extends Ab
setBus(busLocal);
}
- public static void main(String args[]) throws Exception {
- new AuthorizedServer();
- new SpringBusFactory().createBus(configFileName);
- System.out.println("Server ready...");
-
- Thread.sleep(60 * 60 * 1000);
- System.out.println("Server exiting");
- System.exit(0);
- }
}
Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/AuthorizedServer2.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/AuthorizedServer2.java?rev=1393463&r1=1393462&r2=1393463&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/AuthorizedServer2.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/AuthorizedServer2.java Wed Oct 3 12:39:57 2012
@@ -39,14 +39,5 @@ public class AuthorizedServer2 extends A
setBus(busLocal);
}
- public static void main(String args[]) throws Exception {
- new AuthorizedServer2();
- new SpringBusFactory().createBus(configFileName);
- System.out.println("Server ready...");
-
- Thread.sleep(60 * 60 * 1000);
- System.out.println("Server exiting");
- System.exit(0);
- }
}
Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/Server.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/Server.java?rev=1393463&r1=1393462&r2=1393463&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/Server.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/Server.java Wed Oct 3 12:39:57 2012
@@ -50,13 +50,5 @@ public class Server extends AbstractBusT
setBus(busLocal);
}
- public static void main(String args[]) throws Exception {
- new Server().run();
- System.out.println("Server ready...");
-
- Thread.sleep(60 * 60 * 1000);
- System.out.println("Server exiting");
- System.exit(0);
- }
}
Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11.java?rev=1393463&r1=1393462&r2=1393463&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11.java Wed Oct 3 12:39:57 2012
@@ -41,13 +41,4 @@ public class Server11 extends AbstractSe
super.run();
}
- public static void main(String args[]) throws Exception {
- new Server11("http://localhost:" + PORT).run();
- System.out.println("Server ready...");
-
- Thread.sleep(60 * 60 * 10000);
- System.out.println("Server exiting");
- System.exit(0);
- }
-
}
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=1393463&r1=1393462&r2=1393463&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 Wed Oct 3 12:39:57 2012
@@ -46,14 +46,4 @@ public class Server11Restricted extends
}
}
- 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);
- }
-
}
Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server12.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server12.java?rev=1393463&r1=1393462&r2=1393463&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server12.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server12.java Wed Oct 3 12:39:57 2012
@@ -41,13 +41,4 @@ public class Server12 extends AbstractSe
super.run();
}
- public static void main(String args[]) throws Exception {
- new Server12("http://localhost:" + PORT).run();
- System.out.println("Server ready...");
-
- Thread.sleep(60 * 60 * 10000);
- System.out.println("Server exiting");
- System.exit(0);
- }
-
}
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=1393463&r1=1393462&r2=1393463&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 Wed Oct 3 12:39:57 2012
@@ -46,14 +46,4 @@ public class Server12Restricted extends
}
}
- 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);
- }
-
}