cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1336281 - in /cxf/branches/2.5.x-fixes/systests: ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/ ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/ ws-security-examples/src/test...
Date Wed, 09 May 2012 16:21:13 GMT
Author: coheigea
Date: Wed May  9 16:21:11 2012
New Revision: 1336281

URL: http://svn.apache.org/viewvc?rev=1336281&view=rev
Log:
Explicitly shutting down buses in the WS-Security system tests

Removed:
    cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/WSSecTest.java~
Modified:
    cxf/branches/2.5.x-fixes/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java
    cxf/branches/2.5.x-fixes/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationTest.java
    cxf/branches/2.5.x-fixes/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenTest.java
    cxf/branches/2.5.x-fixes/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509TokenTest.java
    cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java
    cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/KerberosTokenTest.java
    cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java
    cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java
    cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
    cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java
    cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/WSSecTest.java
    cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/spnego/SpnegoTokenTest.java
    cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenDerivedTest.java
    cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java
    cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java
    cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java
    cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationLegacyTest.java
    cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationTest.java
    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
    cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java

Modified: cxf/branches/2.5.x-fixes/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java?rev=1336281&r1=1336280&r2=1336281&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java Wed May  9 16:21:11 2012
@@ -67,8 +67,9 @@ public class SamlTokenTest extends Abstr
     }
     
     @org.junit.AfterClass
-    public static void cleanup() {
+    public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
+        stopAllServers();
     }
 
     /**
@@ -92,6 +93,8 @@ public class SamlTokenTest extends Abstr
         updateAddressPort(samlPort, PORT);
         
         samlPort.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     /**
@@ -115,6 +118,8 @@ public class SamlTokenTest extends Abstr
         updateAddressPort(samlPort, PORT2);
         
         samlPort.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     /**
@@ -138,6 +143,8 @@ public class SamlTokenTest extends Abstr
         updateAddressPort(samlPort, PORT2);
         
         samlPort.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     /**
@@ -161,6 +168,8 @@ public class SamlTokenTest extends Abstr
         updateAddressPort(samlPort, PORT);
         
         samlPort.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     /**
@@ -184,6 +193,8 @@ public class SamlTokenTest extends Abstr
         updateAddressPort(samlPort, PORT);
         
         samlPort.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     
@@ -208,6 +219,8 @@ public class SamlTokenTest extends Abstr
         updateAddressPort(samlPort, PORT);
         
         samlPort.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     /**
@@ -231,6 +244,8 @@ public class SamlTokenTest extends Abstr
         updateAddressPort(samlPort, PORT2);
         
         samlPort.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     /**
@@ -254,6 +269,8 @@ public class SamlTokenTest extends Abstr
         updateAddressPort(samlPort, PORT2);
         
         samlPort.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     /**
@@ -277,6 +294,8 @@ public class SamlTokenTest extends Abstr
         updateAddressPort(samlPort, PORT);
         
         samlPort.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     /**
@@ -301,6 +320,8 @@ public class SamlTokenTest extends Abstr
         updateSTSPort((BindingProvider)samlPort, STS_PORT);
         
         samlPort.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     private static void updateSTSPort(BindingProvider p, String port) {

Modified: cxf/branches/2.5.x-fixes/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationTest.java?rev=1336281&r1=1336280&r2=1336281&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationTest.java Wed May  9 16:21:11 2012
@@ -55,8 +55,9 @@ public class SecureConversationTest exte
     }
 
     @org.junit.AfterClass
-    public static void cleanup() {
+    public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
+        stopAllServers();
     }
     
     /**
@@ -81,6 +82,8 @@ public class SecureConversationTest exte
         updateAddressPort(samlPort, PORT);
         
         samlPort.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
 }

Modified: cxf/branches/2.5.x-fixes/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenTest.java?rev=1336281&r1=1336280&r2=1336281&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenTest.java Wed May  9 16:21:11 2012
@@ -56,8 +56,9 @@ public class UsernameTokenTest extends A
     }
     
     @org.junit.AfterClass
-    public static void cleanup() {
+    public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
+        stopAllServers();
     }
 
     /**
@@ -81,6 +82,8 @@ public class UsernameTokenTest extends A
         updateAddressPort(utPort, PORT);
         
         utPort.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     /**
@@ -104,6 +107,8 @@ public class UsernameTokenTest extends A
         updateAddressPort(utPort, PORT);
         
         utPort.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     /**
@@ -127,6 +132,8 @@ public class UsernameTokenTest extends A
         updateAddressPort(utPort, PORT);
         
         utPort.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     /**
@@ -150,6 +157,8 @@ public class UsernameTokenTest extends A
         updateAddressPort(utPort, PORT2);
         
         utPort.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     /**
@@ -173,6 +182,8 @@ public class UsernameTokenTest extends A
         updateAddressPort(utPort, PORT);
         
         utPort.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     /**
@@ -196,6 +207,8 @@ public class UsernameTokenTest extends A
         updateAddressPort(utPort, PORT);
         
         utPort.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     /**
@@ -219,5 +232,7 @@ public class UsernameTokenTest extends A
         updateAddressPort(utPort, PORT);
         
         utPort.doubleIt(25);
+        
+        bus.shutdown(true);
     }
 }

Modified: cxf/branches/2.5.x-fixes/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509TokenTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509TokenTest.java?rev=1336281&r1=1336280&r2=1336281&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509TokenTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509TokenTest.java Wed May  9 16:21:11 2012
@@ -55,8 +55,9 @@ public class X509TokenTest extends Abstr
     }
     
     @org.junit.AfterClass
-    public static void cleanup() {
+    public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
+        stopAllServers();
     }
 
     /**
@@ -80,6 +81,8 @@ public class X509TokenTest extends Abstr
         updateAddressPort(x509Port, PORT);
         
         x509Port.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     /**
@@ -103,6 +106,8 @@ public class X509TokenTest extends Abstr
         updateAddressPort(x509Port, PORT);
         
         x509Port.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     /**
@@ -126,6 +131,8 @@ public class X509TokenTest extends Abstr
         updateAddressPort(x509Port, PORT);
         
         x509Port.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     /**
@@ -149,6 +156,8 @@ public class X509TokenTest extends Abstr
         updateAddressPort(x509Port, PORT);
         
         x509Port.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     

Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java?rev=1336281&r1=1336280&r2=1336281&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java Wed May  9 16:21:11 2012
@@ -59,10 +59,11 @@ public class GCMTest extends AbstractBus
     }
     
     @org.junit.AfterClass
-    public static void cleanup() {
+    public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
+        stopAllServers();
     }
-
+    
     @org.junit.Test
     public void testAESGCM128() throws Exception {
         if (!unrestrictedPoliciesInstalled) {
@@ -83,6 +84,8 @@ public class GCMTest extends AbstractBus
                 service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(gcmPort, PORT);
         gcmPort.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -105,6 +108,8 @@ public class GCMTest extends AbstractBus
                 service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(gcmPort, PORT);
         gcmPort.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -127,6 +132,8 @@ public class GCMTest extends AbstractBus
                 service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(gcmPort, PORT);
         gcmPort.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     private boolean checkUnrestrictedPoliciesInstalled() {

Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/KerberosTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/KerberosTokenTest.java?rev=1336281&r1=1336280&r2=1336281&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/KerberosTokenTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/KerberosTokenTest.java Wed May  9 16:21:11 2012
@@ -70,8 +70,9 @@ public class KerberosTokenTest extends A
     }
     
     @org.junit.AfterClass
-    public static void cleanup() {
+    public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
+        stopAllServers();
     }
 
     @org.junit.Test
@@ -94,6 +95,8 @@ public class KerberosTokenTest extends A
         updateAddressPort(kerberosPort, PORT2);
         int result = kerberosPort.doubleIt(25);
         assertTrue(result == 50);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -121,6 +124,8 @@ public class KerberosTokenTest extends A
         
         int result = kerberosPort.doubleIt(25);
         assertTrue(result == 50);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -148,6 +153,8 @@ public class KerberosTokenTest extends A
         
         int result = kerberosPort.doubleIt(25);
         assertTrue(result == 50);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -175,6 +182,8 @@ public class KerberosTokenTest extends A
         
         int result = kerberosPort.doubleIt(25);
         assertTrue(result == 50);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -197,6 +206,8 @@ public class KerberosTokenTest extends A
         updateAddressPort(kerberosPort, PORT2);
         int result = kerberosPort.doubleIt(25);
         assertTrue(result == 50);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -219,6 +230,8 @@ public class KerberosTokenTest extends A
         updateAddressPort(kerberosPort, PORT);
         int result = kerberosPort.doubleIt(25);
         assertTrue(result == 50);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -241,6 +254,8 @@ public class KerberosTokenTest extends A
         updateAddressPort(kerberosPort, PORT);
         int result = kerberosPort.doubleIt(25);
         assertTrue(result == 50);
+        
+        bus.shutdown(true);
     }
     
     
@@ -264,6 +279,8 @@ public class KerberosTokenTest extends A
         updateAddressPort(kerberosPort, PORT);
         int result = kerberosPort.doubleIt(25);
         assertTrue(result == 50);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -291,6 +308,8 @@ public class KerberosTokenTest extends A
         
         int result = kerberosPort.doubleIt(25);
         assertTrue(result == 50);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -318,6 +337,8 @@ public class KerberosTokenTest extends A
         
         int result = kerberosPort.doubleIt(25);
         assertTrue(result == 50);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -345,6 +366,8 @@ public class KerberosTokenTest extends A
         
         int result = kerberosPort.doubleIt(25);
         assertTrue(result == 50);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -372,6 +395,8 @@ public class KerberosTokenTest extends A
         
         int result = kerberosPort.doubleIt(25);
         assertTrue(result == 50);
+        
+        bus.shutdown(true);
     }
     
     

Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java?rev=1336281&r1=1336280&r2=1336281&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java Wed May  9 16:21:11 2012
@@ -56,8 +56,9 @@ public class PolicyAlternativeTest exten
     }
     
     @org.junit.AfterClass
-    public static void cleanup() {
+    public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
+        stopAllServers();
     }
     
     /**
@@ -81,6 +82,8 @@ public class PolicyAlternativeTest exten
         updateAddressPort(utPort, PORT2);
         
         utPort.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     /**
@@ -109,6 +112,8 @@ public class PolicyAlternativeTest exten
         } catch (javax.xml.ws.soap.SOAPFaultException ex) {
             // expected
         }
+        
+        bus.shutdown(true);
     }
     
     /**
@@ -132,6 +137,8 @@ public class PolicyAlternativeTest exten
         updateAddressPort(utPort, PORT2);
         
         utPort.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
 }

Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java?rev=1336281&r1=1336280&r2=1336281&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java Wed May  9 16:21:11 2012
@@ -63,8 +63,9 @@ public class SamlTokenTest extends Abstr
     }
     
     @org.junit.AfterClass
-    public static void cleanup() {
+    public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
+        stopAllServers();
     }
 
     @org.junit.Test
@@ -106,6 +107,8 @@ public class SamlTokenTest extends Abstr
         );
         int result = saml1Port.doubleIt(25);
         assertTrue(result == 50);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -163,6 +166,8 @@ public class SamlTokenTest extends Abstr
         } catch (javax.xml.ws.soap.SOAPFaultException ex) {
             assertTrue(ex.getMessage().contains("SAML token security failure"));
         }
+        
+        bus.shutdown(true);
     }
     
     /**
@@ -200,6 +205,8 @@ public class SamlTokenTest extends Abstr
         } catch (javax.xml.ws.soap.SOAPFaultException ex) {
             assertTrue(ex.getMessage().contains("Assertion fails sender-vouches requirements"));
         }
+        
+        bus.shutdown(true);
     }
 
     @org.junit.Test
@@ -245,6 +252,8 @@ public class SamlTokenTest extends Abstr
         );
         int result = saml2Port.doubleIt(25);
         assertTrue(result == 50);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -269,6 +278,8 @@ public class SamlTokenTest extends Abstr
         );
         int result = saml1Port.doubleIt(25);
         assertTrue(result == 50);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -298,6 +309,8 @@ public class SamlTokenTest extends Abstr
         );
         int result = saml2Port.doubleIt(25);
         assertTrue(result == 50);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -325,6 +338,8 @@ public class SamlTokenTest extends Abstr
         );
         int result = saml2Port.doubleIt(25);
         assertTrue(result == 50);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -352,6 +367,8 @@ public class SamlTokenTest extends Abstr
 
         int result = saml2Port.doubleIt(25);
         assertTrue(result == 50);
+        
+        bus.shutdown(true);
     }
 
     @org.junit.Test
@@ -380,6 +397,8 @@ public class SamlTokenTest extends Abstr
         );
         int result = saml2Port.doubleIt(25);
         assertTrue(result == 50);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -410,6 +429,8 @@ public class SamlTokenTest extends Abstr
         );
         int result = saml2Port.doubleIt(25);
         assertTrue(result == 50);
+        
+        bus.shutdown(true);
     }
     
     
@@ -438,6 +459,8 @@ public class SamlTokenTest extends Abstr
 
         int result = saml2Port.doubleIt(25);
         assertTrue(result == 50);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -464,6 +487,8 @@ public class SamlTokenTest extends Abstr
             String error = "The received token does not match the token inclusion requirement";
             assertTrue(ex.getMessage().contains(error));
         }
+        
+        bus.shutdown(true);
     }
     
     

Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java?rev=1336281&r1=1336280&r2=1336281&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java Wed May  9 16:21:11 2012
@@ -198,8 +198,10 @@ public class SecurityPolicyTest extends 
     }
     
     @org.junit.AfterClass
-    public static void cleanup() {
+    public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
+        getStaticBus().shutdown(true);
+        stopAllServers();
     }
     
     private static void setCryptoProperties(EndpointInfo ei, String sigProps, String encProps) {
@@ -301,6 +303,8 @@ public class SecurityPolicyTest extends 
                 throw ex;
             }
         }
+        
+        bus.shutdown(true);
     }
     
     @Test
@@ -344,6 +348,7 @@ public class SecurityPolicyTest extends 
             assertTrue(ex.getMessage().contains("policy alternatives"));
         }
         
+        bus.shutdown(true);
     }
     
     @Test
@@ -382,6 +387,8 @@ public class SecurityPolicyTest extends 
         XPathUtils xp = new XPathUtils(ns);
         Object o = xp.getValue("//ns2:DoubleItResponse/doubledNumber", nd, XPathConstants.STRING);
         assertEquals(XMLUtils.toString(nd), "50", o);
+        
+        bus.shutdown(true);
     }
     
     @WebServiceProvider(targetNamespace = "http://www.example.org/contract/DoubleIt", 
@@ -441,6 +448,8 @@ public class SecurityPolicyTest extends 
         ((BindingProvider)pt).getRequestContext().put(SecurityConstants.ENCRYPT_PROPERTIES, 
                                                       getClass().getResource("bob.properties"));
         assertEquals(10, pt.doubleIt(5));
+        
+        bus.shutdown(true);
     }
 
     @Test
@@ -467,6 +476,8 @@ public class SecurityPolicyTest extends 
         ((BindingProvider)pt).getRequestContext().put(SecurityConstants.ENCRYPT_PROPERTIES, 
                                                       getClass().getResource("alice.properties"));
         assertEquals(10, pt.doubleIt(5));
+        
+        bus.shutdown(true);
     }
     
     @Test
@@ -496,6 +507,8 @@ public class SecurityPolicyTest extends 
         DoubleIt di = new DoubleIt();
         di.setNumberToDouble(5);
         assertEquals(10, pt.doubleIt(di, 1).getDoubledNumber());
+        
+        bus.shutdown(true);
     }
     
     @Test
@@ -536,6 +549,8 @@ public class SecurityPolicyTest extends 
                        || errorMessage.contains("Certificate revocation")
                        || errorMessage.contains("Error during certificate path validation"));
         }
+        
+        bus.shutdown(true);
     }
     
     @Test
@@ -584,5 +599,6 @@ public class SecurityPolicyTest extends 
                        || errorMessage.contains("Error during certificate path validation"));
         }
 
+        bus.shutdown(true);
     }
 }

Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java?rev=1336281&r1=1336280&r2=1336281&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java Wed May  9 16:21:11 2012
@@ -105,8 +105,9 @@ public class WSSecurityClientTest extend
     }
     
     @org.junit.AfterClass
-    public static void cleanup() {
+    public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
+        stopAllServers();
     }
     
     @Test

Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/WSSecTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/WSSecTest.java?rev=1336281&r1=1336280&r2=1336281&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/WSSecTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/WSSecTest.java Wed May  9 16:21:11 2012
@@ -26,6 +26,7 @@ import javax.xml.ws.Service;
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.systest.ws.common.SecurityTestUtil;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -37,6 +38,12 @@ public class WSSecTest extends AbstractB
     public static void startServers() throws Exception {
         assertTrue("Server failed to launch", launchServer(Server.class));
     }
+    
+    @org.junit.AfterClass
+    public static void cleanup() throws Exception {
+        SecurityTestUtil.cleanup();
+        stopAllServers();
+    }
 
     @Test
     public void testClientServer() throws Exception {
@@ -53,6 +60,8 @@ public class WSSecTest extends AbstractB
         HelloWorld port = service.getPort(portName, HelloWorld.class);
         updateAddressPort(port, PORT);
         assertEquals("Hello CXF", port.sayHello("CXF"));
+        
+        bus.shutdown(true);
     }
 
 }

Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/spnego/SpnegoTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/spnego/SpnegoTokenTest.java?rev=1336281&r1=1336280&r2=1336281&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/spnego/SpnegoTokenTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/spnego/SpnegoTokenTest.java Wed May  9 16:21:11 2012
@@ -67,8 +67,9 @@ public class SpnegoTokenTest extends Abs
     }
     
     @org.junit.AfterClass
-    public static void cleanup() {
+    public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
+        stopAllServers();
     }
 
     @org.junit.Test
@@ -95,6 +96,8 @@ public class SpnegoTokenTest extends Abs
         
         int result = spnegoPort.doubleIt(25);
         assertTrue(result == 50);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -121,6 +124,8 @@ public class SpnegoTokenTest extends Abs
         
         int result = spnegoPort.doubleIt(25);
         assertTrue(result == 50);
+        
+        bus.shutdown(true);
     }
     
     

Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenDerivedTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenDerivedTest.java?rev=1336281&r1=1336280&r2=1336281&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenDerivedTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenDerivedTest.java Wed May  9 16:21:11 2012
@@ -55,8 +55,9 @@ public class UsernameTokenDerivedTest ex
     }
     
     @org.junit.AfterClass
-    public static void cleanup() {
+    public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
+        stopAllServers();
     }
 
     /**
@@ -81,6 +82,8 @@ public class UsernameTokenDerivedTest ex
         updateAddressPort(utPort, PORT);
         
         utPort.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     /**
@@ -105,6 +108,8 @@ public class UsernameTokenDerivedTest ex
         updateAddressPort(utPort, PORT);
         
         utPort.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     /**
@@ -129,6 +134,8 @@ public class UsernameTokenDerivedTest ex
         updateAddressPort(utPort, PORT);
         
         utPort.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     /**
@@ -153,6 +160,8 @@ public class UsernameTokenDerivedTest ex
         updateAddressPort(utPort, PORT2);
         
         utPort.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     /**
@@ -177,6 +186,8 @@ public class UsernameTokenDerivedTest ex
         updateAddressPort(utPort, PORT);
         
         utPort.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     /**
@@ -201,6 +212,8 @@ public class UsernameTokenDerivedTest ex
         updateAddressPort(utPort, PORT);
         
         utPort.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     /**
@@ -225,6 +238,8 @@ public class UsernameTokenDerivedTest ex
         updateAddressPort(utPort, PORT);
         
         utPort.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
 }

Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java?rev=1336281&r1=1336280&r2=1336281&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java Wed May  9 16:21:11 2012
@@ -54,8 +54,9 @@ public class UsernameTokenTest extends A
     }
     
     @org.junit.AfterClass
-    public static void cleanup() {
+    public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
+        stopAllServers();
     }
 
     @org.junit.Test
@@ -76,6 +77,8 @@ public class UsernameTokenTest extends A
         updateAddressPort(utPort, PORT);
         
         utPort.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -96,6 +99,8 @@ public class UsernameTokenTest extends A
         updateAddressPort(utPort, PORT);
         
         utPort.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -116,6 +121,8 @@ public class UsernameTokenTest extends A
         updateAddressPort(utPort, PORT);
         
         utPort.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -136,6 +143,8 @@ public class UsernameTokenTest extends A
         updateAddressPort(utPort, PORT);
         
         utPort.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -155,6 +164,8 @@ public class UsernameTokenTest extends A
                 service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(utPort, PORT);
         utPort.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -174,6 +185,8 @@ public class UsernameTokenTest extends A
                 service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(utPort, PORT);
         utPort.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -193,6 +206,8 @@ public class UsernameTokenTest extends A
                 service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(utPort, PORT);
         utPort.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -219,6 +234,8 @@ public class UsernameTokenTest extends A
             String error = "The received token does not match the token inclusion requirement";
             assertTrue(ex.getMessage().contains(error));
         }
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -254,6 +271,7 @@ public class UsernameTokenTest extends A
             assertTrue(ex.getMessage().contains(error));
         }
         
+        bus.shutdown(true);
     }
     
 }

Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java?rev=1336281&r1=1336280&r2=1336281&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java Wed May  9 16:21:11 2012
@@ -42,6 +42,7 @@ public class WSSCTest extends AbstractBu
        
     private static final String OUT = "CXF : ping";
     private static wssec.wssc.PingService svc;
+    private static Bus bus;
     
     @BeforeClass
     public static void startServers() throws Exception {
@@ -52,8 +53,7 @@ public class WSSCTest extends AbstractBu
             launchServer(Server.class, true)
         );
         
-        final Bus bus = 
-            new SpringBusFactory().createBus("org/apache/cxf/systest/ws/wssc/client/client.xml");
+        bus = new SpringBusFactory().createBus("org/apache/cxf/systest/ws/wssc/client/client.xml");
         BusFactory.setDefaultBus(bus);
         BusFactory.setThreadDefaultBus(bus);
         
@@ -61,8 +61,10 @@ public class WSSCTest extends AbstractBu
     }
     
     @org.junit.AfterClass
-    public static void cleanup() {
+    public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
+        bus.shutdown(true);
+        stopAllServers();
     }
     
     

Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java?rev=1336281&r1=1336280&r2=1336281&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java (original)
+++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java Wed May  9 16:21:11 2012
@@ -70,8 +70,9 @@ public class WSSecurity10Test extends Ab
     }
     
     @org.junit.AfterClass
-    public static void cleanup() {
+    public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
+        stopAllServers();
     }
 
     @Test
@@ -119,6 +120,8 @@ public class WSSecurity10Test extends Ab
             final String output = port.echo(INPUT);
             assertEquals(INPUT, output);
         }
+        
+        bus.shutdown(true);
     }
     
     private static URL getWsdlLocation(String portPrefix) {

Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationLegacyTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationLegacyTest.java?rev=1336281&r1=1336280&r2=1336281&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationLegacyTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationLegacyTest.java Wed May  9 16:21:11 2012
@@ -60,25 +60,30 @@ public class WSSecurity10UsernameAuthori
     }
 
     @org.junit.AfterClass
-    public static void cleanup() {
+    public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
+        stopAllServers();
     }
     
     @Test
     public void testClientServerComplexPolicyAuthorized() {
 
-        IPingService port = getComplexPolicyPort(
-            "org/apache/cxf/systest/ws/wssec10/client/client_restricted.xml");
+        String configName = "org/apache/cxf/systest/ws/wssec10/client/client_restricted.xml";
+        Bus bus = new SpringBusFactory().createBus(configName);
+        IPingService port = getComplexPolicyPort(bus);
         
         final String output = port.echo(INPUT);
         assertEquals(INPUT, output);
+        
+        bus.shutdown(true);
     }
     
     @Test
     public void testClientServerComplexPolicyUnauthorized() {
 
-        IPingService port = getComplexPolicyPort(
-            "org/apache/cxf/systest/ws/wssec10/client/client_restricted_unauthorized.xml");
+        String configName = "org/apache/cxf/systest/ws/wssec10/client/client_restricted_unauthorized.xml";
+        Bus bus = new SpringBusFactory().createBus(configName);
+        IPingService port = getComplexPolicyPort(bus);
         
         try {
             port.echo(INPUT);
@@ -86,11 +91,11 @@ public class WSSecurity10UsernameAuthori
         } catch (Exception ex) {
             assertEquals("Unauthorized", ex.getMessage());
         }
+        
+        bus.shutdown(true);
     }
     
-    private static IPingService getComplexPolicyPort(String configName) {
-        Bus bus = new SpringBusFactory().createBus(configName);
-        
+    private static IPingService getComplexPolicyPort(Bus bus) {
         BusFactory.setDefaultBus(bus);
         BusFactory.setThreadDefaultBus(bus);
         PingService svc = new PingService(getWsdlLocation("UserNameOverTransport"));

Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationTest.java?rev=1336281&r1=1336280&r2=1336281&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10UsernameAuthorizationTest.java Wed May  9 16:21:11 2012
@@ -60,25 +60,30 @@ public class WSSecurity10UsernameAuthori
     }
     
     @org.junit.AfterClass
-    public static void cleanup() {
+    public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
+        stopAllServers();
     }
 
     @Test
     public void testClientServerUTOnlyAuthorized() {
 
-        IPingService port = getUTOnlyPort(
-            "org/apache/cxf/systest/ws/wssec10/client/client_restricted.xml", false);
+        String configName = "org/apache/cxf/systest/ws/wssec10/client/client_restricted.xml";
+        Bus bus = new SpringBusFactory().createBus(configName);
+        IPingService port = getUTOnlyPort(bus, false);
         
         final String output = port.echo(INPUT);
         assertEquals(INPUT, output);
+        
+        bus.shutdown(true);
     }
     
     @Test
     public void testClientServerUTOnlyUnauthorized() {
 
-        IPingService port = getUTOnlyPort(
-            "org/apache/cxf/systest/ws/wssec10/client/client_restricted_unauthorized.xml", true);
+        String configName = "org/apache/cxf/systest/ws/wssec10/client/client_restricted_unauthorized.xml";
+        Bus bus = new SpringBusFactory().createBus(configName);
+        IPingService port = getUTOnlyPort(bus, true);
         
         try {
             port.echo(INPUT);
@@ -86,23 +91,29 @@ public class WSSecurity10UsernameAuthori
         } catch (Exception ex) {
             assertEquals("Unauthorized", ex.getMessage());
         }
+        
+        bus.shutdown(true);
     }
     
     @Test
     public void testClientServerComplexPolicyAuthorized() {
 
-        IPingService port = getComplexPolicyPort(
-            "org/apache/cxf/systest/ws/wssec10/client/client_restricted.xml");
+        String configName = "org/apache/cxf/systest/ws/wssec10/client/client_restricted.xml";
+        Bus bus = new SpringBusFactory().createBus(configName);
+        IPingService port = getComplexPolicyPort(bus);
         
         final String output = port.echo(INPUT);
         assertEquals(INPUT, output);
+        
+        bus.shutdown(true);
     }
     
     @Test
     public void testClientServerComplexPolicyUnauthorized() {
 
-        IPingService port = getComplexPolicyPort(
-            "org/apache/cxf/systest/ws/wssec10/client/client_restricted_unauthorized.xml");
+        String configName = "org/apache/cxf/systest/ws/wssec10/client/client_restricted_unauthorized.xml";
+        Bus bus = new SpringBusFactory().createBus(configName);
+        IPingService port = getComplexPolicyPort(bus);
         
         try {
             port.echo(INPUT);
@@ -110,10 +121,11 @@ public class WSSecurity10UsernameAuthori
         } catch (Exception ex) {
             assertEquals("Unauthorized", ex.getMessage());
         }
+        
+        bus.shutdown(true);
     }
     
-    private static IPingService getComplexPolicyPort(String configName) {
-        Bus bus = new SpringBusFactory().createBus(configName);
+    private static IPingService getComplexPolicyPort(Bus bus) {
         
         BusFactory.setDefaultBus(bus);
         BusFactory.setThreadDefaultBus(bus);
@@ -129,8 +141,7 @@ public class WSSecurity10UsernameAuthori
         return port;
     }
     
-    private static IPingService getUTOnlyPort(String configName, boolean hashed) {
-        Bus bus = new SpringBusFactory().createBus(configName);
+    private static IPingService getUTOnlyPort(Bus bus, boolean hashed) {
         
         BusFactory.setDefaultBus(bus);
         BusFactory.setThreadDefaultBus(bus);

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=1336281&r1=1336280&r2=1336281&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 16:21:11 2012
@@ -62,8 +62,9 @@ public class WSSecurity111Test extends W
     }
     
     @org.junit.AfterClass
-    public static void cleanup() {
+    public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
+        stopAllServers();
     }
 
     @Test

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=1336281&r1=1336280&r2=1336281&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 16:21:11 2012
@@ -63,8 +63,9 @@ public class WSSecurity112Test extends W
     }
     
     @org.junit.AfterClass
-    public static void cleanup() {
+    public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
+        stopAllServers();
     }
 
     @Test

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=1336281&r1=1336280&r2=1336281&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 16:21:11 2012
@@ -85,6 +85,8 @@ public class WSSecurity11Common extends 
             final String output = port.echo(INPUT);
             assertEquals(INPUT, output);
         }
+        
+        bus.shutdown(true);
     }
     
  

Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java?rev=1336281&r1=1336280&r2=1336281&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java Wed May  9 16:21:11 2012
@@ -63,8 +63,9 @@ public class X509TokenTest extends Abstr
     }
     
     @org.junit.AfterClass
-    public static void cleanup() {
+    public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
+        stopAllServers();
     }
 
     @org.junit.Test
@@ -87,6 +88,8 @@ public class X509TokenTest extends Abstr
                 service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(x509Port, PORT);
         x509Port.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -109,6 +112,8 @@ public class X509TokenTest extends Abstr
                 service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(x509Port, PORT);
         x509Port.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -131,6 +136,8 @@ public class X509TokenTest extends Abstr
                 service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(x509Port, PORT);
         x509Port.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -153,6 +160,8 @@ public class X509TokenTest extends Abstr
                 service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(x509Port, PORT);
         x509Port.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -175,6 +184,8 @@ public class X509TokenTest extends Abstr
                 service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(x509Port, PORT);
         x509Port.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -197,6 +208,8 @@ public class X509TokenTest extends Abstr
                 service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(x509Port, PORT);
         x509Port.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -219,6 +232,8 @@ public class X509TokenTest extends Abstr
                 service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(x509Port, PORT);
         x509Port.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -241,6 +256,8 @@ public class X509TokenTest extends Abstr
                 service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(x509Port, PORT2);
         x509Port.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -263,6 +280,8 @@ public class X509TokenTest extends Abstr
                 service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(x509Port, PORT2);
         x509Port.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -285,6 +304,8 @@ public class X509TokenTest extends Abstr
                 service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(x509Port, PORT2);
         x509Port.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -307,6 +328,8 @@ public class X509TokenTest extends Abstr
                 service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(x509Port, PORT2);
         x509Port.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -329,6 +352,8 @@ public class X509TokenTest extends Abstr
                 service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(x509Port, PORT);
         x509Port.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -351,6 +376,8 @@ public class X509TokenTest extends Abstr
                 service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(x509Port, PORT);
         x509Port.doubleIt(25);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -387,6 +414,8 @@ public class X509TokenTest extends Abstr
             String error = "A replay attack has been detected";
             assertTrue(ex.getMessage().contains(error));
         }
+        
+        bus.shutdown(true);
     }
     
     private boolean checkUnrestrictedPoliciesInstalled() {



Mime
View raw message