svn commit: r1230218 - in /cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing: AbstractGreeterImpl.java MAPTest.java

[dk...@apache.org]

Author: dkulp
Date: Wed Jan 11 20:07:26 2012
New Revision: 1230218

URL: http://svn.apache.org/viewvc?rev=1230218&view=rev
Log:
Move to in-process as it's randomly failing out of process and no idea
why yet.

Modified:
    cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/AbstractGreeterImpl.java
    cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTest.java

Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/AbstractGreeterImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/AbstractGreeterImpl.java?rev=1230218&r1=1230217&r2=1230218&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/AbstractGreeterImpl.java (original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/AbstractGreeterImpl.java Wed Jan 11 20:07:26 2012
@@ -51,22 +51,30 @@ public abstract class AbstractGreeterImp
      */
     @Resource
     private WebServiceContext context;
-
+    private boolean quiet = false;
     
     public AbstractGreeterImpl() {
     }
+    
+    public AbstractGreeterImpl(boolean q) {
+        quiet = q;
+    }
 
 
     public String greetMe(String me) {
-        System.out.println("\n\n*** GreetMe called with: " + me + "***\n\n");
+        if (!quiet) {
+            System.out.println("\n\n*** GreetMe called with: " + me + "***\n\n");
+        }
         verifyMAPs();
         return "Hello " + me;
     }
 
     public String greetMeLater(long delay) {
-        System.out.println("\n\n*** GreetMeLater called with: " + delay
+        if (!quiet) {
+            System.out.println("\n\n*** GreetMeLater called with: " + delay
                            + " at: " + new Date().toString()
                            + "***\n\n");
+        }
         if (delay > 0) {
             try {
                 Thread.sleep(delay);
@@ -79,7 +87,9 @@ public abstract class AbstractGreeterImp
     }
 
     public void greetMeOneWay(String requestType) {   
-        System.out.println("\n\n*** GreetMeOneWay called with: " + requestType + "***\n\n");
+        if (!quiet) {
+            System.out.println("\n\n*** GreetMeOneWay called with: " + requestType + "***\n\n");
+        }
         verifyMAPs();
     }
 

Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTest.java?rev=1230218&r1=1230217&r2=1230218&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTest.java (original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTest.java Wed Jan 11 20:07:26 2012
@@ -49,13 +49,9 @@ public class MAPTest extends MAPTestBase
 
     @BeforeClass
     public static void startServers() throws Exception {
-        // special case handling for WS-Addressing system test to avoid
-        // UUID related issue when server is run as separate process
-        // via maven on Win2k
-        boolean inProcess = "Windows 2000".equals(System.getProperty("os.name"));
         assertTrue("server did not launch correctly", 
                    launchServer(Server.class, null,
-                                new String[] {ADDRESS, GreeterImpl.class.getName()},  inProcess));
+                                new String[] {ADDRESS, GreeterImpl.class.getName()},  true));
     }
     @WebService(serviceName = "SOAPServiceAddressing", 
                 portName = "SoapPort", 
@@ -64,6 +60,10 @@ public class MAPTest extends MAPTestBase
                 wsdlLocation = "testutils/hello_world.wsdl")
     public static class GreeterImpl extends org.apache.cxf.systest.ws.addressing.AbstractGreeterImpl {
         
+        public GreeterImpl() {
+            super(true);
+        }
+        
     }
 }