cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1341669 - in /cxf/branches/2.5.x-fixes: ./ 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/jaxw...
Date Tue, 22 May 2012 22:45:18 GMT
Author: dkulp
Date: Tue May 22 22:45:17 2012
New Revision: 1341669

URL: http://svn.apache.org/viewvc?rev=1341669&view=rev
Log:
Merged revisions 1304168 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1304168 | dkulp | 2012-03-22 22:44:18 -0400 (Thu, 22 Mar 2012) | 1 line
  
  Minor cleanup on jaxes systests.  Avoid some unneeded forking.
........

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

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
    svn:mergeinfo = /cxf/trunk:1304168

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-blocked' - no diff available.

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

Modified: cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java?rev=1341669&r1=1341668&r2=1341669&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
(original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
Tue May 22 22:45:17 2012
@@ -60,8 +60,6 @@ import org.apache.cxf.BusFactory;
 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,14 +86,15 @@ public class DispatchClientServerTest ex
     private static String greeterPort = TestUtil.getPortNumber(DispatchClientServerTest.class);

     
     public static class Server extends AbstractBusTestServerBase {        
-
+        Endpoint ep;
+        
         protected void run() {
             setBus(BusFactory.getDefaultBus());
             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>();
@@ -108,6 +107,10 @@ public class DispatchClientServerTest ex
             BusFactory.setDefaultBus(null);
             BusFactory.setThreadDefaultBus(null);
         }
+        @Override
+        public void tearDown() {
+            ep.stop();
+        }
 
         public static void main(String[] args) {
             try {
@@ -124,14 +127,8 @@ public class DispatchClientServerTest ex
 
     @BeforeClass
     public static void startServers() throws Exception {
-        assertTrue("server did not launch correctly", launchServer(Server.class, true));
         createStaticBus();
-    }
-    
-    @org.junit.Before
-    public void setUp() {
-        BusFactory.getDefaultBus().getOutInterceptors().add(new LoggingOutInterceptor());
-        BusFactory.getDefaultBus().getInInterceptors().add(new LoggingInInterceptor());
+        assertTrue("server did not launch correctly", launchServer(Server.class, true));
     }
     
     private void waitForFuture(Future fd) throws Exception {
@@ -586,12 +583,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 bus = bf.createBus(configFileName, false);
+        BusFactory.setThreadDefaultBus(bus);
         
         URL wsdl = getClass().getResource("/wsdl/hello_world.wsdl");
         assertNotNull(wsdl);
@@ -628,7 +623,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/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerWithMalformedResponseTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerWithMalformedResponseTest.java?rev=1341669&r1=1341668&r2=1341669&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerWithMalformedResponseTest.java
(original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerWithMalformedResponseTest.java
Tue May 22 22:45:17 2012
@@ -58,15 +58,18 @@ public class DispatchClientServerWithMal
     private int asyncHandlerInvokedCount;
     
     public static class Server extends AbstractBusTestServerBase {        
-
+        Endpoint ep;
         protected void run() {
             setBus(BusFactory.getDefaultBus());
             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) {
@@ -84,7 +87,6 @@ public class DispatchClientServerWithMal
 
     @BeforeClass
     public static void startServers() throws Exception {
-        createStaticBus();
         assertTrue("server did not launch correctly", launchServer(Server.class, true));
     }
     

Modified: cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchXMLClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchXMLClientServerTest.java?rev=1341669&r1=1341668&r2=1341669&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchXMLClientServerTest.java
(original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchXMLClientServerTest.java
Tue May 22 22:45:17 2012
@@ -55,7 +55,7 @@ public class DispatchXMLClientServerTest
     @BeforeClass
     public static void startServers() throws Exception {
         createStaticBus();
-        assertTrue("server did not launch correctly", launchServer(Server.class));
+        assertTrue("server did not launch correctly", launchServer(Server.class, true));
     }
 
     @Test

Modified: cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/Server.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/Server.java?rev=1341669&r1=1341668&r2=1341669&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/Server.java
(original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/Server.java
Tue May 22 22:45:17 2012
@@ -29,14 +29,19 @@ import org.apache.hello_world_xml_http.w
 
 
 public class Server extends AbstractBusTestServerBase {        
-
+    Endpoint ep;
+    
     protected void run() {
         setBus(BusFactory.getDefaultBus());
         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/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/AddNumbersImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/AddNumbersImpl.java?rev=1341669&r1=1341668&r2=1341669&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/AddNumbersImpl.java
(original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/AddNumbersImpl.java
Tue May 22 22:45:17 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/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java?rev=1341669&r1=1341668&r2=1341669&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java
(original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java
Tue May 22 22:45:17 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/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationUsingAddNumbersTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationUsingAddNumbersTest.java?rev=1341669&r1=1341668&r2=1341669&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationUsingAddNumbersTest.java
(original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationUsingAddNumbersTest.java
Tue May 22 22:45:17 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/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/LoggingHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/LoggingHandler.java?rev=1341669&r1=1341668&r2=1341669&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/LoggingHandler.java
(original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/LoggingHandler.java
Tue May 22 22:45:17 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/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SpringConfiguredAutoRewriteSoapAddressTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SpringConfiguredAutoRewriteSoapAddressTest.java?rev=1341669&r1=1341668&r2=1341669&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SpringConfiguredAutoRewriteSoapAddressTest.java
(original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SpringConfiguredAutoRewriteSoapAddressTest.java
Tue May 22 22:45:17 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 = (AddNumbers)getApplicationContext().getBean("cxfHandlerTestClientEndpoint",
                                                                    AddNumbers.class);
 

Modified: cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SpringConfiguredNoAutoRewriteSoapAddressTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SpringConfiguredNoAutoRewriteSoapAddressTest.java?rev=1341669&r1=1341668&r2=1341669&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SpringConfiguredNoAutoRewriteSoapAddressTest.java
(original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SpringConfiguredNoAutoRewriteSoapAddressTest.java
Tue May 22 22:45:17 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 = (AddNumbers)getApplicationContext().getBean("cxfHandlerTestClientEndpoint",
                                                                    AddNumbers.class);
 

Modified: cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestSOAPHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestSOAPHandler.java?rev=1341669&r1=1341668&r2=1341669&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestSOAPHandler.java
(original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestSOAPHandler.java
Tue May 22 22:45:17 2012
@@ -162,8 +162,8 @@ public class  TestSOAPHandler extends Te
 
             try {
                 SOAPMessage msg = ctx.getMessage();
-                if ("soapHandler4HandleFaultThrowsRunException".equals(msg.getSOAPBody().getFault()
-                    .getFaultString())) {
+                String fs = msg.getSOAPPart().getEnvelope().getBody().getFault().getFaultString();
+                if ("soapHandler4HandleFaultThrowsRunException".equals(fs)) {
                     throw new RuntimeException("soapHandler4 HandleFault throws RuntimeException");
                 } else if ("soapHandler4HandleFaultThrowsSOAPFaultException".equals(msg.getSOAPBody()
                     .getFault().getFaultString())) {

Modified: cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/AnyClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/AnyClientServerTest.java?rev=1341669&r1=1341668&r2=1341669&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/AnyClientServerTest.java
(original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/AnyClientServerTest.java
Tue May 22 22:45:17 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/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterBaseNoWsdlTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterBaseNoWsdlTest.java?rev=1341669&r1=1341668&r2=1341669&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterBaseNoWsdlTest.java
(original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterBaseNoWsdlTest.java
Tue May 22 22:45:17 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/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterBaseTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterBaseTest.java?rev=1341669&r1=1341668&r2=1341669&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterBaseTest.java
(original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterBaseTest.java
Tue May 22 22:45:17 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/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java?rev=1341669&r1=1341668&r2=1341669&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
(original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
Tue May 22 22:45:17 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/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMixedStyleTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMixedStyleTest.java?rev=1341669&r1=1341668&r2=1341669&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMixedStyleTest.java
(original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMixedStyleTest.java
Tue May 22 22:45:17 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/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitDefatulAnnoTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitDefatulAnnoTest.java?rev=1341669&r1=1341668&r2=1341669&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitDefatulAnnoTest.java
(original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitDefatulAnnoTest.java
Tue May 22 22:45:17 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/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitTest.java?rev=1341669&r1=1341668&r2=1341669&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitTest.java
(original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitTest.java
Tue May 22 22:45:17 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/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java?rev=1341669&r1=1341668&r2=1341669&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java
(original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java
Tue May 22 22:45:17 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/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxwsExecutorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxwsExecutorTest.java?rev=1341669&r1=1341668&r2=1341669&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxwsExecutorTest.java
(original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxwsExecutorTest.java
Tue May 22 22:45:17 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/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java?rev=1341669&r1=1341668&r2=1341669&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java
(original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java
Tue May 22 22:45:17 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/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationClientServerTest.java?rev=1341669&r1=1341668&r2=1341669&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationClientServerTest.java
(original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationClientServerTest.java
Tue May 22 22:45:17 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/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/httpget/JavaFirstHttpGetTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/httpget/JavaFirstHttpGetTest.java?rev=1341669&r1=1341668&r2=1341669&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/httpget/JavaFirstHttpGetTest.java
(original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/httpget/JavaFirstHttpGetTest.java
Tue May 22 22:45:17 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/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/AbstractSourcePayloadProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/AbstractSourcePayloadProvider.java?rev=1341669&r1=1341668&r2=1341669&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/AbstractSourcePayloadProvider.java
(original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/AbstractSourcePayloadProvider.java
Tue May 22 22:45:17 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/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWDOMSourcePayloadXMLBindingProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWDOMSourcePayloadXMLBindingProvider.java?rev=1341669&r1=1341668&r2=1341669&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWDOMSourcePayloadXMLBindingProvider.java
(original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWDOMSourcePayloadXMLBindingProvider.java
Tue May 22 22:45:17 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/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderXMLClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderXMLClientServerTest.java?rev=1341669&r1=1341668&r2=1341669&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderXMLClientServerTest.java
(original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderXMLClientServerTest.java
Tue May 22 22:45:17 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/branches/2.5.x-fixes/testutils/src/main/java/org/apache/hello_world_soap_http/RPCLitGreeterImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/testutils/src/main/java/org/apache/hello_world_soap_http/RPCLitGreeterImpl.java?rev=1341669&r1=1341668&r2=1341669&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/testutils/src/main/java/org/apache/hello_world_soap_http/RPCLitGreeterImpl.java
(original)
+++ cxf/branches/2.5.x-fixes/testutils/src/main/java/org/apache/hello_world_soap_http/RPCLitGreeterImpl.java
Tue May 22 22:45:17 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/branches/2.5.x-fixes/testutils/src/main/java/org/apache/hello_world_xml_http/mixed/GreeterImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/testutils/src/main/java/org/apache/hello_world_xml_http/mixed/GreeterImpl.java?rev=1341669&r1=1341668&r2=1341669&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/testutils/src/main/java/org/apache/hello_world_xml_http/mixed/GreeterImpl.java
(original)
+++ cxf/branches/2.5.x-fixes/testutils/src/main/java/org/apache/hello_world_xml_http/mixed/GreeterImpl.java
Tue May 22 22:45:17 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