FELIX-2063 [karaf] hardcoding org.ops4j.pax.exam.rbc.rmi.port property in raw pax runner --vmOptions is problematic when 1099 is not the next free port
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@908364 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/tooling/testing/src/main/java/org/apache/felix/karaf/testing/Helper.java b/karaf/tooling/testing/src/main/java/org/apache/felix/karaf/testing/Helper.java
index 5735481..e509575 100644
--- a/karaf/tooling/testing/src/main/java/org/apache/felix/karaf/testing/Helper.java
+++ b/karaf/tooling/testing/src/main/java/org/apache/felix/karaf/testing/Helper.java
@@ -37,7 +37,7 @@
import static org.ops4j.pax.exam.CoreOptions.maven;
import static org.ops4j.pax.exam.CoreOptions.wrappedBundle;
import static org.ops4j.pax.exam.OptionUtils.combine;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.rawPaxRunnerOption;
+import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
/**
* Helper class for setting up a pax-exam test environment for karaf.
@@ -142,7 +142,7 @@
}
// Transform system properties to VM options
List<Option> options = new ArrayList<Option>();
- String vmOptions = "-Dorg.ops4j.pax.exam.rbc.rmi.port=1099";
+ String vmOptions = "";
for (Enumeration e = configProps.propertyNames(); e.hasMoreElements();) {
String name = (String) e.nextElement();
String value = configProps.getProperty(name);
@@ -168,7 +168,7 @@
options.add(frameworkStartLevel(Integer.parseInt(configProps.getProperty("org.osgi.framework.startlevel.beginning"))));
}
- options.add(rawPaxRunnerOption("--vmOptions", vmOptions));
+ options.add(vmOption(vmOptions));
return options.toArray(new Option[options.size()]);
}
@@ -436,4 +436,4 @@
return value != null ? value.replaceAll("\r", "").replaceAll("\n", "").replaceAll(" ", "") : "";
}
-}
\ No newline at end of file
+}