felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ccust...@apache.org
Subject svn commit: r908364 - /felix/trunk/karaf/tooling/testing/src/main/java/org/apache/felix/karaf/testing/Helper.java
Date Wed, 10 Feb 2010 06:40:56 GMT
Author: ccustine
Date: Wed Feb 10 06:40:55 2010
New Revision: 908364

URL: http://svn.apache.org/viewvc?rev=908364&view=rev
Log:
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

Modified:
    felix/trunk/karaf/tooling/testing/src/main/java/org/apache/felix/karaf/testing/Helper.java

Modified: felix/trunk/karaf/tooling/testing/src/main/java/org/apache/felix/karaf/testing/Helper.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/tooling/testing/src/main/java/org/apache/felix/karaf/testing/Helper.java?rev=908364&r1=908363&r2=908364&view=diff
==============================================================================
--- felix/trunk/karaf/tooling/testing/src/main/java/org/apache/felix/karaf/testing/Helper.java
(original)
+++ felix/trunk/karaf/tooling/testing/src/main/java/org/apache/felix/karaf/testing/Helper.java
Wed Feb 10 06:40:55 2010
@@ -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
+}



Mime
View raw message