cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1231267 - in /cxf/branches/2.5.x-fixes: ./ systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/AbstractGreeterImpl.java systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTest.java
Date Fri, 13 Jan 2012 19:39:20 GMT
Author: dkulp
Date: Fri Jan 13 19:39:20 2012
New Revision: 1231267

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

........
  r1230218 | dkulp | 2012-01-11 15:07:26 -0500 (Wed, 11 Jan 2012) | 2 lines
  
  Move to in-process as it's randomly failing out of process and no idea
  why yet.
........

Modified:
    cxf/branches/2.5.x-fixes/   (props changed)
    cxf/branches/2.5.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/AbstractGreeterImpl.java
    cxf/branches/2.5.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTest.java

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jan 13 19:39:20 2012
@@ -1 +1 @@
-/cxf/trunk:1-1227739,1227823,1228209,1228228,1228230-1228231,1228268,1228277,1228359,1228770,1228850,1229348,1229476,1229663,1229965,1230800
+/cxf/trunk:1-1227739,1227823,1228209,1228228,1228230-1228231,1228268,1228277,1228359,1228770,1228850,1229348,1229476,1229663,1229965,1230218,1230800

Modified: cxf/branches/2.5.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/AbstractGreeterImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/AbstractGreeterImpl.java?rev=1231267&r1=1231266&r2=1231267&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/AbstractGreeterImpl.java
(original)
+++ cxf/branches/2.5.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/AbstractGreeterImpl.java
Fri Jan 13 19:39:20 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/branches/2.5.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTest.java?rev=1231267&r1=1231266&r2=1231267&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTest.java
(original)
+++ cxf/branches/2.5.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTest.java
Fri Jan 13 19:39:20 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);
+        }
+        
     }
 }
 



Mime
View raw message