cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r584995 - /incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
Date Tue, 16 Oct 2007 01:46:58 GMT
Author: dkulp
Date: Mon Oct 15 18:46:53 2007
New Revision: 584995

URL: http://svn.apache.org/viewvc?rev=584995&view=rev
Log:
fix a couple systest on OSX

Modified:
    incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java

Modified: incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java?rev=584995&r1=584994&r2=584995&view=diff
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
(original)
+++ incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
Mon Oct 15 18:46:53 2007
@@ -37,7 +37,6 @@
 import org.apache.cxf.common.logging.LogUtils;
 
 public class ServerLauncher {
-
     public static final int DEFAULT_TIMEOUT = 3 * 60 * 1000;
 
     protected static final String SERVER_FAILED = 
@@ -188,8 +187,9 @@
                 throw ex;
             }
 
+            LOG.fine("CMD: " + cmd);
             if (debug) {
-                System.err.print("CMD: ");
+                System.err.print("CMD: " + cmd);
             }
             
             
@@ -339,6 +339,15 @@
         
         ClassLoader loader = this.getClass().getClassLoader();
         StringBuffer classpath = new StringBuffer(System.getProperty("java.class.path"));
+        if (classpath.indexOf("/.compatibility/") != -1) {
+            classpath.append(":");
+            //on OSX, the compatibility lib brclasspath.indexOf("/.compatibility/")
+            int idx = classpath.indexOf("/.compatibility/");
+            int idx1 = classpath.lastIndexOf(":", idx);
+            int idx2 = classpath.indexOf(":", idx);
+            classpath.replace(idx1, idx2, ":");
+        }
+        
         if (loader instanceof URLClassLoader) {
             URLClassLoader urlloader = (URLClassLoader)loader; 
             for (URL url : urlloader.getURLs()) {



Mime
View raw message