Author: dkulp
Date: Wed Aug 24 14:29:24 2011
New Revision: 1161122
URL: http://svn.apache.org/viewvc?rev=1161122&view=rev
Log:
Fix some tests that are leaving jetty dirs in /tmp
Modified:
cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsWsdlNsImpl.java
cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisServer.java
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestServer.java
Modified:
cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsWsdlNsImpl.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsWsdlNsImpl.java?rev=1161122&r1=1161121&r2=1161122&view=diff
==============================================================================
---
cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsWsdlNsImpl.java
(original)
+++
cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsWsdlNsImpl.java
Wed Aug 24 14:29:24 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/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisServer.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisServer.java?rev=1161122&r1=1161121&r2=1161122&view=diff
==============================================================================
---
cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisServer.java
(original)
+++
cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisServer.java
Wed Aug 24 14:29:24 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/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestServer.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestServer.java?rev=1161122&r1=1161121&r2=1161122&view=diff
==============================================================================
---
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestServer.java
(original)
+++
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestServer.java
Wed Aug 24 14:29:24 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();