You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2007/10/16 04:41:06 UTC
svn commit: r585010 - in /incubator/cxf/branches/2.0.x-fixes: ./
testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
Author: dkulp
Date: Mon Oct 15 19:41:06 2007
New Revision: 585010
URL: http://svn.apache.org/viewvc?rev=585010&view=rev
Log:
Merged revisions 584995 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r584995 | dkulp | 2007-10-15 21:46:53 -0400 (Mon, 15 Oct 2007) | 1 line
fix a couple systest on OSX
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: incubator/cxf/branches/2.0.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java?rev=585010&r1=585009&r2=585010&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java Mon Oct 15 19:41:06 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()) {