cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1161124 - in /cxf/branches/2.4.x-fixes: ./ systests/databinding/src/test/java/org/apache/cxf/systest/aegis/ systests/transports/src/test/java/org/apache/cxf/systest/http/auth/
Date Wed, 24 Aug 2011 14:31:45 GMT
Author: dkulp
Date: Wed Aug 24 14:31:45 2011
New Revision: 1161124

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

........
  r1161122 | dkulp | 2011-08-24 10:29:24 -0400 (Wed, 24 Aug 2011) | 1 line
  
  Fix some tests that are leaving jetty dirs in /tmp
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsWsdlNsImpl.java
    cxf/branches/2.4.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisServer.java
    cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestServer.java

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

Modified: cxf/branches/2.4.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsWsdlNsImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsWsdlNsImpl.java?rev=1161124&r1=1161123&r2=1161124&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsWsdlNsImpl.java
(original)
+++ cxf/branches/2.4.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsWsdlNsImpl.java
Wed Aug 24 14:31:45 2011
@@ -31,7 +31,7 @@ public class AegisJaxWsWsdlNsImpl implem
     
 
     public void updateVO(VO vo) {
-        System.out.println(vo.getStr());
+        //System.out.println(vo.getStr());
     }
 
     

Modified: cxf/branches/2.4.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisServer.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisServer.java?rev=1161124&r1=1161123&r2=1161124&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisServer.java
(original)
+++ cxf/branches/2.4.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisServer.java
Wed Aug 24 14:31:45 2011
@@ -65,18 +65,16 @@ public class AegisServer extends Abstrac
         } catch (Exception e) {
             e.printStackTrace();
         }
-        
       
     }
-
-    public boolean stopInProcess() throws Exception {
-        boolean ret = super.stopInProcess();
+    public void tearDown() throws Exception {
         if (server != null) {
             server.stop();
+            server.destroy();
+            server = null;
         }
-        return ret;
-    }    
-    
+    }
+
     public static void main(String args[]) {
         try {
             AegisServer s = new AegisServer();

Modified: cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestServer.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestServer.java?rev=1161124&r1=1161123&r2=1161124&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestServer.java
(original)
+++ cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestServer.java
Wed Aug 24 14:31:45 2011
@@ -81,7 +81,13 @@ public class DigestServer extends Abstra
             e.printStackTrace();
         }     
     }
-    
+    public void tearDown() throws Exception {
+        if (server != null) {
+            server.stop();
+            server.destroy();
+            server = null;
+        }
+    }
     public static void main(String args[]) {
         try {
             DigestServer s = new DigestServer();



Mime
View raw message