cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1304168 - in /cxf/trunk: systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/ systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/ systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ systests/jaxws/src/test/java/or...
Date Fri, 23 Mar 2012 02:44:19 GMT
Author: dkulp
Date: Fri Mar 23 02:44:18 2012
New Revision: 1304168

URL: http://svn.apache.org/viewvc?rev=1304168&view=rev
Log:
Minor cleanup on jaxes systests.  Avoid some unneeded forking.

Modified:
    cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
    cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerWithHugeResponseTest.java
    cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerWithMalformedResponseTest.java
    cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchXMLClientServerTest.java
    cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/Server.java
    cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/AddNumbersImpl.java
    cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java
    cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationUsingAddNumbersTest.java
    cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/LoggingHandler.java
    cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SpringConfiguredAutoRewriteSoapAddressTest.java
    cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SpringConfiguredNoAutoRewriteSoapAddressTest.java
    cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestSOAPHandler.java
    cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/AnyClientServerTest.java
    cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterBaseNoWsdlTest.java
    cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterBaseTest.java
    cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
    cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMixedStyleTest.java
    cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitDefatulAnnoTest.java
    cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitTest.java
    cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java
    cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxwsExecutorTest.java
    cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java
    cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationClientServerTest.java
    cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/httpget/JavaFirstHttpGetTest.java
    cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/AbstractSourcePayloadProvider.java
    cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWDOMSourcePayloadXMLBindingProvider.java
    cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderXMLClientServerTest.java
    cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/RPCLitGreeterImpl.java
    cxf/trunk/testutils/src/main/java/org/apache/hello_world_xml_http/mixed/GreeterImpl.java

Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java?rev=1304168&r1=1304167&r2=1304168&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
(original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
Fri Mar 23 02:44:18 2012
@@ -60,8 +60,6 @@ import org.apache.cxf.binding.soap.saaj.
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.helpers.XMLUtils;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
 import org.apache.cxf.jaxws.DispatchImpl;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
@@ -88,13 +86,14 @@ public class DispatchClientServerTest ex
     private static String greeterPort = TestUtil.getPortNumber(DispatchClientServerTest.class);

     
     public static class Server extends AbstractBusTestServerBase {        
-
+        Endpoint ep;
+        
         protected void run() {
             Object implementor = new GreeterImpl();
             String address = "http://localhost:"
                 + TestUtil.getPortNumber(DispatchClientServerTest.class)
                 + "/SOAPDispatchService/SoapDispatchPort";
-            Endpoint ep = Endpoint.create(SOAPBinding.SOAP11HTTP_BINDING, implementor);
+            ep = Endpoint.create(SOAPBinding.SOAP11HTTP_BINDING, implementor);
             
             Map<String, Object> properties = new HashMap<String, Object>();
             Map<String, String> nsMap = new HashMap<String, String>();
@@ -105,6 +104,10 @@ public class DispatchClientServerTest ex
             ep.setProperties(properties);
             ep.publish(address);
         }
+        @Override
+        public void tearDown() {
+            ep.stop();
+        }
 
         public static void main(String[] args) {
             try {
@@ -121,13 +124,8 @@ public class DispatchClientServerTest ex
 
     @BeforeClass
     public static void startServers() throws Exception {
-        assertTrue("server did not launch correctly", launchServer(Server.class));
-    }
-    
-    @org.junit.Before
-    public void setUp() {
-        BusFactory.getDefaultBus().getOutInterceptors().add(new LoggingOutInterceptor());
-        BusFactory.getDefaultBus().getInInterceptors().add(new LoggingInInterceptor());
+        createStaticBus();
+        assertTrue("server did not launch correctly", launchServer(Server.class, true));
     }
     
     private void waitForFuture(Future<?> fd) throws Exception {
@@ -582,12 +580,10 @@ public class DispatchClientServerTest ex
 
     @Test
     public void testJAXBObjectPAYLOADWithFeature() throws Exception {
-        bus = BusFactory.getDefaultBus(false);
-        bus.shutdown(true);
-        
         this.configFileName = "org/apache/cxf/systest/dispatch/client-config.xml";
         SpringBusFactory bf = (SpringBusFactory)SpringBusFactory.newInstance();
         bus = bf.createBus(configFileName, false);
+        BusFactory.setThreadDefaultBus(bus);
         
         URL wsdl = getClass().getResource("/wsdl/hello_world.wsdl");
         assertNotNull(wsdl);
@@ -624,7 +620,7 @@ public class DispatchClientServerTest ex
 
         assertEquals("Feature based interceptors has to be added to out chain.", 
                      1, TestDispatchFeature.getOutInterceptorCount());
-
+        bus.shutdown(true);
     }
     
     @Test

Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerWithHugeResponseTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerWithHugeResponseTest.java?rev=1304168&r1=1304167&r2=1304168&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerWithHugeResponseTest.java
(original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerWithHugeResponseTest.java
Fri Mar 23 02:44:18 2012
@@ -35,7 +35,6 @@ import javax.xml.ws.Response;
 import javax.xml.ws.Service;
 
 
-import org.apache.cxf.BusFactory;
 import org.apache.cxf.interceptor.LoggingInInterceptor;
 import org.apache.cxf.interceptor.LoggingOutInterceptor;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
@@ -43,6 +42,8 @@ import org.apache.cxf.testutil.common.Ab
 import org.apache.cxf.testutil.common.TestUtil;
 import org.apache.hello_world_soap_http.GreeterImpl;
 import org.apache.hello_world_soap_http.SOAPService;
+
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -57,16 +58,20 @@ public class DispatchClientServerWithHug
         TestUtil.getPortNumber(DispatchClientServerWithHugeResponseTest.class); 
     
     public static class Server extends AbstractBusTestServerBase {        
-
+        Endpoint ep;
+        
         protected void run() {
             Object implementor = new GreeterImpl();
             String address = "http://localhost:"
                 + TestUtil.getPortNumber(DispatchClientServerWithHugeResponseTest.class)
                 + "/SOAPDispatchService/SoapDispatchPort";
-            Endpoint.publish(address, implementor);
+            ep = Endpoint.publish(address, implementor);
 
         }
-
+        @Override
+        public void tearDown() {
+            ep.stop();
+        }
         public static void main(String[] args) {
             try {
                 Server s = new Server();
@@ -82,24 +87,30 @@ public class DispatchClientServerWithHug
 
     @BeforeClass
     public static void startServers() throws Exception {
-        assertTrue("server did not launch correctly", launchServer(Server.class));
+        //must be out of process so the system properties aren't in effect
+        assertTrue("server did not launch correctly", launchServer(Server.class, false));
     }
     
     @org.junit.Before
-    public void setUp() {
+    public void setUp() throws Exception {
         System.setProperty("org.apache.cxf.staxutils.innerElementLevelThreshold", "12");
         System.setProperty("org.apache.cxf.staxutils.innerElementCountThreshold", "12");
-        BusFactory.getDefaultBus().getOutInterceptors().add(new LoggingOutInterceptor());
-        BusFactory.getDefaultBus().getInInterceptors().add(new LoggingInInterceptor());
+        createBus();
+        getBus().getOutInterceptors().add(new LoggingOutInterceptor());
+        getBus().getInInterceptors().add(new LoggingInInterceptor());
     }
     
+    @AfterClass
+    public static void cleanup() throws Exception {
+        System.clearProperty("org.apache.cxf.staxutils.innerElementLevelThreshold");
+        System.clearProperty("org.apache.cxf.staxutils.innerElementCountThreshold");
+    }
     
-   
     @Test
     public void testStackOverflowErrorForSOAPMessageWithHugeResponse() throws Exception {
         HugeResponseInterceptor hugeResponseInterceptor = 
             new HugeResponseInterceptor(ResponseInterceptorType.overflow);
-        BusFactory.getDefaultBus().getInInterceptors().add(hugeResponseInterceptor);
+        getBus().getInInterceptors().add(hugeResponseInterceptor);
         URL wsdl = getClass().getResource("/wsdl/hello_world.wsdl");
         assertNotNull(wsdl);
 
@@ -127,7 +138,7 @@ public class DispatchClientServerWithHug
         } catch (Throwable e) {
             assertTrue(e.getCause() instanceof StackOverflowError);
         } finally {
-            BusFactory.getDefaultBus().getInInterceptors().remove(hugeResponseInterceptor);
+            getBus().getInInterceptors().remove(hugeResponseInterceptor);
         }
         
     }
@@ -136,7 +147,7 @@ public class DispatchClientServerWithHug
     public void testThresholdfForSOAPMessageWithHugeResponse() throws Exception {
         HugeResponseInterceptor hugeResponseInterceptor = 
             new HugeResponseInterceptor(ResponseInterceptorType.ElementLevelThreshold);
-        BusFactory.getDefaultBus().getInInterceptors().add(hugeResponseInterceptor);
+        getBus().getInInterceptors().add(hugeResponseInterceptor);
         URL wsdl = getClass().getResource("/wsdl/hello_world.wsdl");
         assertNotNull(wsdl);
 
@@ -164,7 +175,7 @@ public class DispatchClientServerWithHug
         } catch (Throwable e) {
             assertTrue(e.getCause().getMessage().startsWith("reach the innerElementLevelThreshold"));
         } finally {
-            BusFactory.getDefaultBus().getInInterceptors().remove(hugeResponseInterceptor);
+            getBus().getInInterceptors().remove(hugeResponseInterceptor);
         }
         
     }
@@ -173,7 +184,7 @@ public class DispatchClientServerWithHug
     public void testElementCountThresholdfForSOAPMessageWithHugeResponse() throws Exception
{
         HugeResponseInterceptor hugeResponseInterceptor = 
             new HugeResponseInterceptor(ResponseInterceptorType.ElementCountThreshold);
-        BusFactory.getDefaultBus().getInInterceptors().add(hugeResponseInterceptor);
+        getBus().getInInterceptors().add(hugeResponseInterceptor);
         URL wsdl = getClass().getResource("/wsdl/hello_world.wsdl");
         assertNotNull(wsdl);
 
@@ -202,7 +213,7 @@ public class DispatchClientServerWithHug
         } catch (Throwable e) {
             assertTrue(e.getCause().getMessage().startsWith("reach the innerElementCountThreshold"));
         } finally {
-            BusFactory.getDefaultBus().getInInterceptors().remove(hugeResponseInterceptor);
+            getBus().getInInterceptors().remove(hugeResponseInterceptor);
         }
         
     }

Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerWithMalformedResponseTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerWithMalformedResponseTest.java?rev=1304168&r1=1304167&r2=1304168&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerWithMalformedResponseTest.java
(original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerWithMalformedResponseTest.java
Fri Mar 23 02:44:18 2012
@@ -58,14 +58,17 @@ public class DispatchClientServerWithMal
     private int asyncHandlerInvokedCount;
     
     public static class Server extends AbstractBusTestServerBase {        
-
+        Endpoint ep;
         protected void run() {
             Object implementor = new GreeterImpl();
             String address = "http://localhost:"
                 + TestUtil.getPortNumber(DispatchClientServerWithMalformedResponseTest.class)
                 + "/SOAPDispatchService/SoapDispatchPort";
-            Endpoint.publish(address, implementor);
-
+            ep = Endpoint.publish(address, implementor);
+        }
+        @Override
+        public void tearDown() {
+            ep.stop();
         }
 
         public static void main(String[] args) {
@@ -83,7 +86,7 @@ public class DispatchClientServerWithMal
 
     @BeforeClass
     public static void startServers() throws Exception {
-        assertTrue("server did not launch correctly", launchServer(Server.class));
+        assertTrue("server did not launch correctly", launchServer(Server.class, true));
     }
     
     @org.junit.Before

Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchXMLClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchXMLClientServerTest.java?rev=1304168&r1=1304167&r2=1304168&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchXMLClientServerTest.java
(original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchXMLClientServerTest.java
Fri Mar 23 02:44:18 2012
@@ -55,7 +55,7 @@ public class DispatchXMLClientServerTest
     @BeforeClass
     public static void startServers() throws Exception {
         
-        assertTrue("server did not launch correctly", launchServer(Server.class));
+        assertTrue("server did not launch correctly", launchServer(Server.class, true));
     }
 
     @Test

Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/Server.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/Server.java?rev=1304168&r1=1304167&r2=1304168&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/Server.java (original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/Server.java Fri
Mar 23 02:44:18 2012
@@ -28,13 +28,18 @@ import org.apache.hello_world_xml_http.w
 
 
 public class Server extends AbstractBusTestServerBase {        
-
+    Endpoint ep;
+    
     protected void run() {
         Object implementor = new GreeterImpl();
         String address = "http://localhost:"
             + TestUtil.getPortNumber(DispatchXMLClientServerTest.class)
             + "/XMLService/XMLDispatchPort";
-        Endpoint.publish(address, implementor);
+        ep = Endpoint.publish(address, implementor);
+    }
+    @Override
+    public void tearDown() {
+        ep.stop();
     }
 
     public static void main(String[] args) {

Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/AddNumbersImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/AddNumbersImpl.java?rev=1304168&r1=1304167&r2=1304168&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/AddNumbersImpl.java
(original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/AddNumbersImpl.java
Fri Mar 23 02:44:18 2012
@@ -42,7 +42,7 @@ public class AddNumbersImpl implements A
      *             if any of the numbers to be added is negative.
      */
     public int addNumbers(int number1, int number2) throws AddNumbersFault {
-        System.out.println("addNumbers called....., number1: " + number1 + " number2: " +
number2);
+        //System.out.println("addNumbers called....., number1: " + number1 + " number2: "
+ number2);
         return number1 * number2;
     }
 

Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java?rev=1304168&r1=1304167&r2=1304168&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java
(original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java
Fri Mar 23 02:44:18 2012
@@ -79,7 +79,7 @@ public class DispatchHandlerInvocationTe
 
     @BeforeClass
     public static void startServers() throws Exception {
-        assertTrue("server did not launch correctly", launchServer(HandlerServer.class));
+        assertTrue("server did not launch correctly", launchServer(HandlerServer.class, true));
     }
 
     @Test

Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationUsingAddNumbersTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationUsingAddNumbersTest.java?rev=1304168&r1=1304167&r2=1304168&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationUsingAddNumbersTest.java
(original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationUsingAddNumbersTest.java
Fri Mar 23 02:44:18 2012
@@ -58,7 +58,7 @@ public class HandlerInvocationUsingAddNu
 
     @BeforeClass
     public static void startServers() throws Exception {
-        assertTrue("server did not launch correctly", launchServer(HandlerServer.class));
+        assertTrue("server did not launch correctly", launchServer(HandlerServer.class, true));
     }
 
     @Test

Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/LoggingHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/LoggingHandler.java?rev=1304168&r1=1304167&r2=1304168&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/LoggingHandler.java
(original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/LoggingHandler.java
Fri Mar 23 02:44:18 2012
@@ -18,6 +18,7 @@
  */
 package org.apache.cxf.systest.handlers;
 
+import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import java.util.Set;
 
@@ -36,7 +37,8 @@ public class LoggingHandler implements S
     private PrintStream out;
 
     public LoggingHandler() {
-        setLogStream(System.out);
+        //setLogStream(System.out);
+        setLogStream(new PrintStream(new ByteArrayOutputStream()));
     }
 
     protected final void setLogStream(PrintStream ps) {

Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SpringConfiguredAutoRewriteSoapAddressTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SpringConfiguredAutoRewriteSoapAddressTest.java?rev=1304168&r1=1304167&r2=1304168&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SpringConfiguredAutoRewriteSoapAddressTest.java
(original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SpringConfiguredAutoRewriteSoapAddressTest.java
Fri Mar 23 02:44:18 2012
@@ -39,10 +39,6 @@ public class SpringConfiguredAutoRewrite
 
     @Test
     public void testWsdlAddress() throws Exception {
-        System.err.println("portNumber: " + port);
-        System.err.println(getApplicationContext().getBean("cxfHandlerTestEndpoint").
-                                                                   getClass().toString());
-
         AddNumbers addNumbers = getApplicationContext().getBean("cxfHandlerTestClientEndpoint",
                                                                    AddNumbers.class);
 

Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SpringConfiguredNoAutoRewriteSoapAddressTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SpringConfiguredNoAutoRewriteSoapAddressTest.java?rev=1304168&r1=1304167&r2=1304168&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SpringConfiguredNoAutoRewriteSoapAddressTest.java
(original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SpringConfiguredNoAutoRewriteSoapAddressTest.java
Fri Mar 23 02:44:18 2012
@@ -40,10 +40,6 @@ public class SpringConfiguredNoAutoRewri
 
     @Test
     public void testWsdlAddress() throws Exception {
-        System.err.println("portNumber: " + port);
-        System.err.println(getApplicationContext().getBean("cxfHandlerTestEndpoint").
-                                                                   getClass().toString());
-
         AddNumbers addNumbers = getApplicationContext().getBean("cxfHandlerTestClientEndpoint",
                                                                    AddNumbers.class);
 

Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestSOAPHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestSOAPHandler.java?rev=1304168&r1=1304167&r2=1304168&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestSOAPHandler.java
(original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestSOAPHandler.java
Fri Mar 23 02:44:18 2012
@@ -19,7 +19,6 @@
 package org.apache.cxf.systest.handlers;
 
 
-import java.io.IOException;
 import java.util.Set;
 import java.util.StringTokenizer;
 
@@ -164,12 +163,6 @@ public class  TestSOAPHandler extends Te
 
             try {
                 SOAPMessage msg = ctx.getMessage();
-                try {
-                    msg.writeTo(System.out);
-                } catch (IOException e) {
-                    // TODO Auto-generated catch block
-                    e.printStackTrace();
-                }
                 String fs = msg.getSOAPPart().getEnvelope().getBody().getFault().getFaultString();
                 if ("soapHandler4HandleFaultThrowsRunException".equals(fs)) {
                     throw new RuntimeException("soapHandler4 HandleFault throws RuntimeException");

Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/AnyClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/AnyClientServerTest.java?rev=1304168&r1=1304167&r2=1304168&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/AnyClientServerTest.java
(original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/AnyClientServerTest.java
Fri Mar 23 02:44:18 2012
@@ -73,7 +73,7 @@ public final class AnyClientServerTest e
 
     @BeforeClass
     public static void startServers() throws Exception {
-        assertTrue("server did not launch correctly", launchServer(MyServer.class));
+        assertTrue("server did not launch correctly", launchServer(MyServer.class, true));
     }
 
     @Test

Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterBaseNoWsdlTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterBaseNoWsdlTest.java?rev=1304168&r1=1304167&r2=1304168&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterBaseNoWsdlTest.java
(original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterBaseNoWsdlTest.java
Fri Mar 23 02:44:18 2012
@@ -34,7 +34,7 @@ public class ClientServerGreeterBaseNoWs
     @BeforeClass
     public static void startServers() throws Exception {
         assertTrue("server did not launch correctly",
-                   launchServer(ServerGreeterBaseNoWsdl.class));
+                   launchServer(ServerGreeterBaseNoWsdl.class, true));
     }
     
     @Test    

Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterBaseTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterBaseTest.java?rev=1304168&r1=1304167&r2=1304168&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterBaseTest.java
(original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterBaseTest.java
Fri Mar 23 02:44:18 2012
@@ -34,7 +34,7 @@ public class ClientServerGreeterBaseTest
     @BeforeClass
     public static void startServers() throws Exception {
         assertTrue("server did not launch correctly",
-                   launchServer(ServerGreeterBase.class));
+                   launchServer(ServerGreeterBase.class, true));
     }
     
     @Test

Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java?rev=1304168&r1=1304167&r2=1304168&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
(original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
Fri Mar 23 02:44:18 2012
@@ -86,7 +86,7 @@ public class ClientServerMiscTest extend
 
     @BeforeClass
     public static void startServers() throws Exception {
-        assertTrue("server did not launch correctly", launchServer(ServerMisc.class));
+        assertTrue("server did not launch correctly", launchServer(ServerMisc.class, true));
     }
     @Test
     public void testCXF3170() throws Exception {

Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMixedStyleTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMixedStyleTest.java?rev=1304168&r1=1304167&r2=1304168&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMixedStyleTest.java
(original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMixedStyleTest.java
Fri Mar 23 02:44:18 2012
@@ -44,7 +44,7 @@ public class ClientServerMixedStyleTest 
 
     @BeforeClass
     public static void startServers() throws Exception {
-        assertTrue("server did not launch correctly", launchServer(ServerMixedStyle.class));
+        assertTrue("server did not launch correctly", launchServer(ServerMixedStyle.class,
true));
     }
     
     @Test

Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitDefatulAnnoTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitDefatulAnnoTest.java?rev=1304168&r1=1304167&r2=1304168&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitDefatulAnnoTest.java
(original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitDefatulAnnoTest.java
Fri Mar 23 02:44:18 2012
@@ -53,7 +53,7 @@ public class ClientServerRPCLitDefatulAn
 
     @BeforeClass
     public static void startServers() throws Exception {
-        assertTrue("server did not launch correctly", launchServer(Server.class));
+        assertTrue("server did not launch correctly", launchServer(Server.class, true));
     }
 
     @Test

Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitTest.java?rev=1304168&r1=1304167&r2=1304168&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitTest.java
(original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitTest.java
Fri Mar 23 02:44:18 2012
@@ -96,7 +96,7 @@ public class ClientServerRPCLitTest exte
    
     @BeforeClass
     public static void startServers() throws Exception {
-        assertTrue("server did not launch correctly", launchServer(Server.class));
+        assertTrue("server did not launch correctly", launchServer(Server.class, true));
     }
     
     @Test

Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java?rev=1304168&r1=1304167&r2=1304168&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java
(original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java
Fri Mar 23 02:44:18 2012
@@ -80,7 +80,7 @@ public class ClientServerXMLTest extends
 
     @BeforeClass
     public static void startServers() throws Exception {
-        assertTrue("server did not launch correctly", launchServer(ServerXMLBinding.class));
+        assertTrue("server did not launch correctly", launchServer(ServerXMLBinding.class,
true));
     }
 
     @Test

Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxwsExecutorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxwsExecutorTest.java?rev=1304168&r1=1304167&r2=1304168&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxwsExecutorTest.java
(original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxwsExecutorTest.java
Fri Mar 23 02:44:18 2012
@@ -72,7 +72,7 @@ public class JaxwsExecutorTest  extends 
 
     @BeforeClass
     public static void startServers() throws Exception {
-        assertTrue("server did not launch correctly", launchServer(Server.class));
+        assertTrue("server did not launch correctly", launchServer(Server.class, true));
     }
          
     @Test

Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java?rev=1304168&r1=1304167&r2=1304168&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java
(original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java
Fri Mar 23 02:44:18 2012
@@ -68,7 +68,7 @@ public class LocatorClientServerTest ext
 
     @BeforeClass
     public static void startServers() throws Exception {
-        assertTrue("server did not launch correctly", launchServer(MyServer.class));
+        assertTrue("server did not launch correctly", launchServer(MyServer.class, true));
     }
 
     @Test

Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationClientServerTest.java?rev=1304168&r1=1304167&r2=1304168&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationClientServerTest.java
(original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationClientServerTest.java
Fri Mar 23 02:44:18 2012
@@ -80,7 +80,7 @@ public class SchemaValidationClientServe
    
     @BeforeClass
     public static void startServers() throws Exception {
-        assertTrue("server did not launch correctly", launchServer(Server.class));
+        assertTrue("server did not launch correctly", launchServer(Server.class, true));
     }
     
    

Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/httpget/JavaFirstHttpGetTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/httpget/JavaFirstHttpGetTest.java?rev=1304168&r1=1304167&r2=1304168&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/httpget/JavaFirstHttpGetTest.java
(original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/httpget/JavaFirstHttpGetTest.java
Fri Mar 23 02:44:18 2012
@@ -68,7 +68,7 @@ public class JavaFirstHttpGetTest extend
     
     @BeforeClass
     public static void startServers() throws Exception {
-        assertTrue("server did not launch correctly", launchServer(Server.class));
+        assertTrue("server did not launch correctly", launchServer(Server.class, true));
     }
     
     @Test

Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/AbstractSourcePayloadProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/AbstractSourcePayloadProvider.java?rev=1304168&r1=1304167&r2=1304168&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/AbstractSourcePayloadProvider.java
(original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/AbstractSourcePayloadProvider.java
Fri Mar 23 02:44:18 2012
@@ -71,7 +71,6 @@ public abstract class AbstractSourcePayl
         }
         
         try {
-            System.out.println(request.getClass().getName());
             if (request instanceof StaxSource) {
                 StaxSource ss = (StaxSource)request;
                 if (ss.getXMLStreamReader().getEventType() == -1) {
@@ -79,7 +78,6 @@ public abstract class AbstractSourcePayl
                 }
             }
             String input = getSourceAsString(request);
-            System.out.println(input);  
             
             if (input.indexOf("ServerLogicalHandler") >= 0) {
                 return map(request.getClass());

Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWDOMSourcePayloadXMLBindingProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWDOMSourcePayloadXMLBindingProvider.java?rev=1304168&r1=1304167&r2=1304168&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWDOMSourcePayloadXMLBindingProvider.java
(original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWDOMSourcePayloadXMLBindingProvider.java
Fri Mar 23 02:44:18 2012
@@ -35,7 +35,6 @@ import javax.xml.ws.handler.MessageConte
 
 import org.w3c.dom.Document;
 
-import org.apache.cxf.helpers.DOMUtils;
 
 //The following wsdl file is used.
 //wsdlLocation = "/trunk/testutils/src/main/resources/wsdl/hello_world_rpc_lit.wsdl"
@@ -74,7 +73,6 @@ public class HWDOMSourcePayloadXMLBindin
                     "resources/XML_GreetMeDocLiteralResp.xml");
 
             document = builder.parse(greetMeResponse);
-            DOMUtils.writeXml(document, System.out);
             response = new DOMSource(document.getDocumentElement());
         } catch (Exception e) {
             e.printStackTrace();

Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderXMLClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderXMLClientServerTest.java?rev=1304168&r1=1304167&r2=1304168&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderXMLClientServerTest.java
(original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderXMLClientServerTest.java
Fri Mar 23 02:44:18 2012
@@ -49,7 +49,7 @@ public class ProviderXMLClientServerTest
     @BeforeClass
     public static void startServers() throws Exception {
         assertTrue("server did not launch correctly",
-                launchServer(XMLServer.class));
+                launchServer(XMLServer.class, true));
     }
 
     @Test

Modified: cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/RPCLitGreeterImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/RPCLitGreeterImpl.java?rev=1304168&r1=1304167&r2=1304168&view=diff
==============================================================================
--- cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/RPCLitGreeterImpl.java
(original)
+++ cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/RPCLitGreeterImpl.java
Fri Mar 23 02:44:18 2012
@@ -35,20 +35,20 @@ public class RPCLitGreeterImpl implement
     
 
     public String greetMe(String me) {
-        System.out.println("Executing operation greetMe");
-        System.out.println("Message received: " + me + "\n");
+        //System.out.println("Executing operation greetMe");
+        //System.out.println("Message received: " + me + "\n");
         return "Hello " + me;
     }
 
     public String sayHi() {
-        System.out.println("Executing operation sayHi" + "\n");
+        //System.out.println("Executing operation sayHi" + "\n");
         return "Bonjour";
     }
 
     public MyComplexStruct sendReceiveData(MyComplexStruct in) {
-        System.out.println("Executing operation sendReceiveData");
-        System.out.println("Received struct with values :\nElement-1 : " + in.getElem1()
+ "\nElement-2 : "
-                           + in.getElem2() + "\nElement-3 : " + in.getElem3() + "\n");
+        //System.out.println("Executing operation sendReceiveData");
+        //System.out.println("Received struct with values :\nElement-1 : " + in.getElem1()
+ "\nElement-2 : "
+        //                   + in.getElem2() + "\nElement-3 : " + in.getElem3() + "\n");
         if ("invalid".equals(in.getElem2())) {
             in.setElem2(null);
         }
@@ -56,8 +56,8 @@ public class RPCLitGreeterImpl implement
     }
 
     public String greetUs(String you, String me) {
-        System.out.println("Executing operation greetUs");
-        System.out.println("Message received: you are " + you + " I'm " + me + "\n");
+        //System.out.println("Executing operation greetUs");
+        //System.out.println("Message received: you are " + you + " I'm " + me + "\n");
         return "Hello " + you + " and " + me;
     }
 

Modified: cxf/trunk/testutils/src/main/java/org/apache/hello_world_xml_http/mixed/GreeterImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/testutils/src/main/java/org/apache/hello_world_xml_http/mixed/GreeterImpl.java?rev=1304168&r1=1304167&r2=1304168&view=diff
==============================================================================
--- cxf/trunk/testutils/src/main/java/org/apache/hello_world_xml_http/mixed/GreeterImpl.java
(original)
+++ cxf/trunk/testutils/src/main/java/org/apache/hello_world_xml_http/mixed/GreeterImpl.java
Fri Mar 23 02:44:18 2012
@@ -34,17 +34,13 @@ import org.apache.hello_world_xml_http.m
 public class GreeterImpl implements Greeter {
 
     public String greetMe(String me) {
-        System.out.println("Executing operation greetMe\n");
         return "Hello " + me;
     }
 
     public void greetMeOneWay(String me) {
-        System.out.println("Executing operation greetMeOneWay\n");
-        System.out.println("Hello there " + me);
     }
 
     public SayHiResponse sayHi1(SayHi in) {
-        System.out.println("Executing operation sayHi1\n");
         SayHiResponse response = new SayHiResponse();
         response.setResponseType("Bonjour");
         return response;



Mime
View raw message