cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r598121 - in /incubator/cxf/branches/2.0.x-fixes: ./ distribution/src/main/release/samples/java_first_jaxws/wsdl/ parent/ rt/core/src/main/java/org/apache/cxf/test/ rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/...
Date Mon, 26 Nov 2007 04:23:56 GMT
Author: ningjiang
Date: Sun Nov 25 20:23:55 2007
New Revision: 598121

URL: http://svn.apache.org/viewvc?rev=598121&view=rev
Log:
Merged revisions 597547-597565,597567-597576,597579-597687,597689-597704,597706-597707,597709-597753,597755-597759,597761-597779,597781-597786,597788-597905,597907-598027,598032-598043,598045-598050,598052-598061,598063-598070,598072-598097,598100-598105,598107-598109
via svnmerge from 
https://svn.apache.org/repos/asf/incubator/cxf/trunk

........
  r597547 | ningjiang | 2007-11-23 13:07:40 +0800 (Fri, 23 Nov 2007) | 1 line
  
  CXF-1217 turn off the DontClosePort, and upgraded Jetty to 6.1.6
........
  r597561 | ningjiang | 2007-11-23 13:35:00 +0800 (Fri, 23 Nov 2007) | 1 line
  
  Switched Jetty's version from 6.1.6 to 6.1.6rc1 to get the CC build pass, and will switch
back when the Jetty 6.1.6 is available for CC
........
  r598104 | ningjiang | 2007-11-26 09:32:57 +0800 (Mon, 26 Nov 2007) | 1 line
  
  Added cxf-servlet.xml in java_first_jaxws sample and took Glen's advice of changing keepalive
to preKeepalive
........
  r598109 | ningjiang | 2007-11-26 10:22:10 +0800 (Mon, 26 Nov 2007) | 1 line
  
  CXF-1217 changed to use Jetty 6.1.6 release version
........

Added:
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/java_first_jaxws/wsdl/
      - copied from r598104, incubator/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/wsdl/
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/java_first_jaxws/wsdl/cxf-servlet.xml
      - copied unchanged from r598104, incubator/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/wsdl/cxf-servlet.xml
    incubator/cxf/branches/2.0.x-fixes/systests/src/test/resources/cxf.xml
      - copied unchanged from r597561, incubator/cxf/trunk/systests/src/test/resources/cxf.xml
Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    incubator/cxf/branches/2.0.x-fixes/parent/pom.xml
    incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/test/TestUtilities.java
    incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
    incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties
    incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/bus/BusShutdownTest.java
    incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
    incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/interceptor/InterceptorFaultTest.java
    incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java
    incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/mtom/MtomPolicyTest.java
    incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java
    incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java

Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: incubator/cxf/branches/2.0.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/parent/pom.xml?rev=598121&r1=598120&r2=598121&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/parent/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/parent/pom.xml Sun Nov 25 20:23:55 2007
@@ -47,7 +47,7 @@
         <jaxb.impl.version>2.0.5</jaxb.impl.version>
         <jaxb.xjc.version>2.0</jaxb.xjc.version>
         <jaxws.version>2.0</jaxws.version>
-        <jetty.version>6.1.5</jetty.version>
+        <jetty.version>6.1.6</jetty.version>
         <saaj.version>1.3</saaj.version>
         <saaj.impl.version>1.3</saaj.impl.version>
         <spring.version>2.0.6</spring.version>
@@ -241,7 +241,7 @@
                                 connection, on some Linux's, the socket remains consumed
until
                                 some timeout occurs.   That may cause some tests to timeout/hang.
-->
                                 <name>org.apache.cxf.transports.http_jetty.DontClosePort</name>
-                                <value>true</value>
+                                <value>false</value>
                             </property>
                         </systemProperties>
                     </configuration>
@@ -983,11 +983,11 @@
                                     <value>${spring.validation.mode}</value>
                                 </property>
                                 <property>
-                                  <!-- If we close the port after a client in the same
JVM has oppened a keep-alive
-                                   connection, on some Linux's, the socket remains consumed
until
-                                   some timeout occurs.   That may cause some tests to timeout/hang.
-->
-                                   <name>org.apache.cxf.transports.http_jetty.DontClosePort</name>
-                                   <value>true</value>
+                                   <!-- If we close the port after a client in the same
JVM has oppened a keep-alive
+                                    connection, on some Linux's, the socket remains consumed
until
+                                    some timeout occurs.   That may cause some tests to timeout/hang.
-->
+                                    <name>org.apache.cxf.transports.http_jetty.DontClosePort</name>
+                                    <value>false</value>
                                 </property>                                 
                             </systemProperties>
                         </configuration>

Modified: incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/test/TestUtilities.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/test/TestUtilities.java?rev=598121&r1=598120&r2=598121&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/test/TestUtilities.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/test/TestUtilities.java
Sun Nov 25 20:23:55 2007
@@ -62,9 +62,13 @@
  */
 public class TestUtilities {
     
+   
+    private static String preKeepAlive;
+    
     private static String basedirPath;
     protected Bus bus;
     protected Class<?> classpathAnchor;
+    
 
     /**
      * Namespaces for the XPath expressions.
@@ -81,6 +85,19 @@
         classpathAnchor = classpathReference;
     }
     
+    public static void setKeepAliveSystemProperty(boolean setAlive) {
+        preKeepAlive = System.getProperty("http.keepAlive");
+        System.setProperty("http.keepAlive", Boolean.toString(setAlive));
+    }
+    
+    public static void recoverKeepAliveSystemProperty() {
+        if (preKeepAlive != null) {
+            System.setProperty("http.keepAlive", preKeepAlive);
+        } else {
+            System.clearProperty("http.keepAlive");
+        }
+    }
+
     public void addDefaultNamespaces() {
         addNamespace("s", "http://schemas.xmlsoap.org/soap/envelope/");
         addNamespace("xsd", "http://www.w3.org/2001/XMLSchema");

Modified: incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java?rev=598121&r1=598120&r2=598121&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
Sun Nov 25 20:23:55 2007
@@ -20,9 +20,8 @@
 package org.apache.cxf.transport.http_jetty;
 
 import java.io.IOException;
-import java.net.ServerSocket;
 import java.net.URL;
-import java.nio.channels.ServerSocketChannel;
+
 import java.security.GeneralSecurityException;
 import java.util.List;
 import java.util.logging.Level;
@@ -40,7 +39,6 @@
 import org.mortbay.jetty.Connector;
 import org.mortbay.jetty.Handler;
 import org.mortbay.jetty.Server;
-import org.mortbay.jetty.bio.SocketConnector;
 import org.mortbay.jetty.handler.ContextHandler;
 import org.mortbay.jetty.handler.ContextHandlerCollection;
 import org.mortbay.jetty.handler.DefaultHandler;
@@ -284,11 +282,10 @@
             if (defaultHandler != null) {
                 server.addHandler(defaultHandler);
             }
-            try {
+            try {                
+                setReuseAddress(connector);
                 server.start();
-                if (isReuseAddress()) {
-                    setReuseAddress(connector);
-                }
+               
                 AbstractConnector aconn = (AbstractConnector) connector;
                 if (aconn.getThreadPool() instanceof BoundedThreadPool
                     && isSetThreadingParameters()) {
@@ -343,20 +340,11 @@
     }
     
     private void setReuseAddress(Connector conn) throws IOException {
-        if (conn.getConnection() == null) {
-            conn.open();  // it might not be opened.
-        }    
-        ServerSocket socket = null;
-        if (conn instanceof SelectChannelConnector) {
-            ServerSocketChannel channel = (ServerSocketChannel) conn.getConnection();
-            socket = channel.socket();
-        } else if (conn instanceof SocketConnector) {    
-            socket = (ServerSocket)conn.getConnection();
+        if (conn instanceof AbstractConnector) {
+            ((AbstractConnector)conn).setReuseAddress(isReuseAddress());
         } else {
-            LOG.info("UNKNOWN_CONNECTOR_MSG");
-            return;
-        }       
-        socket.setReuseAddress(true);        
+            LOG.log(Level.INFO, "UNKNOWN_CONNECTOR_MSG", new Object[] {conn});
+        }
     }
 
     /**

Modified: incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties?rev=598121&r1=598120&r2=598121&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties
(original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties
Sun Nov 25 20:23:55 2007
@@ -23,4 +23,4 @@
 REMOVE_HANDLER_FAILED_MSG = Could not remove cxf jetty handler from Jetty server: {0}
 CAN_NOT_FIND_HANDLER_MSG = Could not find the handler to remove for context url {0}
 FAILED_TO_SHUTDOWN_ENGINE_MSG = Failed to shutdown Jetty server: {0} because it is still
in use
-UNKNOWN_CONNECTOR_MSG = Unknown connector type, can't set the socket reuseAddress flag.
\ No newline at end of file
+UNKNOWN_CONNECTOR_MSG = Unknown connector type {0}, can't set the socket reuseAddress flag.

Modified: incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/bus/BusShutdownTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/bus/BusShutdownTest.java?rev=598121&r1=598120&r2=598121&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/bus/BusShutdownTest.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/bus/BusShutdownTest.java
Sun Nov 25 20:23:55 2007
@@ -28,41 +28,40 @@
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.test.TestUtilities;
 import org.apache.hello_world_soap_http.Greeter;
 import org.apache.hello_world_soap_http.GreeterImpl;
 import org.apache.hello_world_soap_http.SOAPService;
-import org.junit.After;
+
+import org.junit.AfterClass;
 import org.junit.Assert;
-import org.junit.Before;
+
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 public class BusShutdownTest extends Assert {
-    private String close;
-    
-    @Before 
-    public void setSystemProperties() {
-        close = System.getProperty("org.apache.cxf.transports.http_jetty.DontClosePort");
       
-        System.setProperty("org.apache.cxf.transports.http_jetty.DontClosePort", "false");
-        
+    @BeforeClass
+    public static void setKeepAliveProperty() {
+        TestUtilities.setKeepAliveSystemProperty(false);
     }
     
-    @After
-    public void resetSystemProperties() {
-        if (close != null) {
-            System.setProperty("org.apache.cxf.transports.http_jetty.DontClosePort", close);
-        }
+    @AfterClass
+    public static void cleanKeepAliveProperty() {
+        TestUtilities.recoverKeepAliveSystemProperty();
     }
     
+    
+    
     @Test
     public void testStartWorkShutdownWork() throws Exception {
         
         
         URL wsdlUrl = getClass().getResource("/wsdl/hello_world.wsdl");
         assertNotNull("wsdl resource was not found", wsdlUrl); 
-
-        String serverAddr = "http://localhost:9098/greeter/port";
+        // Since this test always fails in linux box, try to use other port
+        String serverAddr = "http://localhost:40000/greeter/port";
         makeTwoWayCallOnNewBus(wsdlUrl, serverAddr);
-        Thread.sleep(4000);
+        
         
         // verify sutdown cleans the slate and reverts to null state
         //

Modified: incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java?rev=598121&r1=598120&r2=598121&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
Sun Nov 25 20:23:55 2007
@@ -86,6 +86,7 @@
     
     public void setUpBus(boolean includeService) throws Exception {
         applicationContext = new GenericApplicationContext();
+        readBeans(new ClassPathResource("cxf.xml"));
         readBeans(new ClassPathResource("META-INF/cxf/cxf.xml"));
         readBeans(new ClassPathResource("META-INF/cxf/cxf-extension-soap.xml"));
         readBeans(new ClassPathResource("META-INF/cxf/cxf-extension-http.xml"));
@@ -158,9 +159,7 @@
         bus.shutdown(true);
         applicationContext.destroy();
         applicationContext.close();
-        //Waiting for the releasing of the socket
-        Thread.sleep(2000);
-        
+                
     }
     
     
@@ -221,9 +220,7 @@
         shutdownService();
         verifyNoServer(8808);
         verifyNoServer(8801);
-        // For some multicores linux box
-        // It will take more time to release the socket
-        Thread.sleep(4000);
+        
         
         setUpBus(true);
        

Modified: incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/interceptor/InterceptorFaultTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/interceptor/InterceptorFaultTest.java?rev=598121&r1=598120&r2=598121&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/interceptor/InterceptorFaultTest.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/interceptor/InterceptorFaultTest.java
Sun Nov 25 20:23:55 2007
@@ -48,12 +48,14 @@
 import org.apache.cxf.phase.Phase;
 import org.apache.cxf.phase.PhaseComparator;
 import org.apache.cxf.phase.PhaseManager;
+import org.apache.cxf.test.TestUtilities;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
 import org.apache.cxf.transport.http.HTTPConduit;
 import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
 import org.apache.cxf.ws.addressing.MAPAggregator;
 import org.junit.After;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -125,7 +127,13 @@
 
     @BeforeClass
     public static void startServers() throws Exception {
+        TestUtilities.setKeepAliveSystemProperty(false);
         assertTrue("server did not launch correctly", launchServer(Server.class, true));
+    }
+    
+    @AfterClass
+    public static void cleanup() {
+        TestUtilities.recoverKeepAliveSystemProperty();
     }
     
     @After

Modified: incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java?rev=598121&r1=598120&r2=598121&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java
Sun Nov 25 20:23:55 2007
@@ -42,7 +42,9 @@
 import org.apache.cxf.service.Service;
 import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
 import org.apache.cxf.service.model.EndpointInfo;
+import org.apache.cxf.test.TestUtilities;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -54,7 +56,13 @@
 
     @BeforeClass
     public static void startServers() throws Exception {
+        TestUtilities.setKeepAliveSystemProperty(false);
         assertTrue("server did not launch correctly", launchServer(Server.class));
+    }
+    
+    @AfterClass
+    public static void cleanup() {
+        TestUtilities.recoverKeepAliveSystemProperty();
     }
 
     /*

Modified: incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/mtom/MtomPolicyTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/mtom/MtomPolicyTest.java?rev=598121&r1=598120&r2=598121&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/mtom/MtomPolicyTest.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/mtom/MtomPolicyTest.java
Sun Nov 25 20:23:55 2007
@@ -42,6 +42,7 @@
 import org.apache.cxf.message.MessageImpl;
 import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.test.AbstractCXFTest;
+import org.apache.cxf.test.TestUtilities;
 import org.apache.cxf.transport.Conduit;
 import org.apache.cxf.transport.ConduitInitiator;
 import org.apache.cxf.transport.ConduitInitiatorManager;
@@ -49,10 +50,23 @@
 import org.apache.cxf.ws.policy.PolicyEngine;
 import org.apache.cxf.ws.policy.WSPolicyFeature;
 import org.apache.cxf.ws.policy.selector.FirstAlternativeSelector;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 public class MtomPolicyTest extends AbstractCXFTest {
+    
     String address = "http://localhost:9036/EchoService";
+    
+    @BeforeClass
+    public static void setKeepAliveProperty() {
+        TestUtilities.setKeepAliveSystemProperty(false);
+    }
+    
+    @AfterClass
+    public static void cleanKeepAliveProperty() {
+        TestUtilities.recoverKeepAliveSystemProperty();
+    }
     
     @Test
     public void testRequiredMtom() throws Exception {

Modified: incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java?rev=598121&r1=598120&r2=598121&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java
Sun Nov 25 20:23:55 2007
@@ -39,6 +39,7 @@
 import org.apache.cxf.message.MessageImpl;
 import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.test.AbstractCXFTest;
+import org.apache.cxf.test.TestUtilities;
 import org.apache.cxf.transport.Conduit;
 import org.apache.cxf.transport.ConduitInitiator;
 import org.apache.cxf.transport.ConduitInitiatorManager;
@@ -46,11 +47,24 @@
 import org.apache.cxf.transport.DestinationFactory;
 import org.apache.cxf.transport.DestinationFactoryManager;
 import org.apache.cxf.transport.MessageObserver;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 public class MtomServerTest extends AbstractCXFTest {
+   
     
     private static final String HTTP_ID = "http://schemas.xmlsoap.org/wsdl/http/";
+    
+    @BeforeClass
+    public static void setKeepAliveProperty() {
+        TestUtilities.setKeepAliveSystemProperty(false);
+    }
+    
+    @AfterClass
+    public static void cleanKeepAliveProperty() {
+        TestUtilities.recoverKeepAliveSystemProperty();
+    }
     
     @Test
     public void testMtomRequest() throws Exception {

Modified: incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java?rev=598121&r1=598120&r2=598121&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
Sun Nov 25 20:23:55 2007
@@ -49,6 +49,7 @@
 import org.apache.cxf.systest.ws.util.MessageFlow;
 import org.apache.cxf.systest.ws.util.MessageRecorder;
 import org.apache.cxf.systest.ws.util.OutMessageRecorder;
+import org.apache.cxf.test.TestUtilities;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.transport.http.HTTPConduit;
 import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
@@ -60,6 +61,7 @@
 import org.apache.cxf.ws.rm.RMProperties;
 import org.apache.cxf.ws.rm.soap.RMSoapInterceptor;
 import org.junit.After;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -120,7 +122,13 @@
 
     @BeforeClass
     public static void startServers() throws Exception {
+        TestUtilities.setKeepAliveSystemProperty(false);
         assertTrue("server did not launch correctly", launchServer(Server.class));
+    }
+    
+    @AfterClass
+    public static void cleanup() {
+        TestUtilities.recoverKeepAliveSystemProperty();
     }
             
     



Mime
View raw message