geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1061133 - in /geronimo/tck/branches/3.0: jboss-test-harness-geronimo/src/main/java/org/apache/geronimo/testharness/GeronimoConnector.java jcdi-tck-runner/pom.xml
Date Thu, 20 Jan 2011 06:45:06 GMT
Author: xiaming
Date: Thu Jan 20 06:45:05 2011
New Revision: 1061133

URL: http://svn.apache.org/viewvc?rev=1061133&view=rev
Log:
Add JRE_HOME to GeronimoConnector to launch geronimo process, comment out validation.provider
before I know its meaning, since it block jcdi tck on unix-like platforms

Modified:
    geronimo/tck/branches/3.0/jboss-test-harness-geronimo/src/main/java/org/apache/geronimo/testharness/GeronimoConnector.java
    geronimo/tck/branches/3.0/jcdi-tck-runner/pom.xml

Modified: geronimo/tck/branches/3.0/jboss-test-harness-geronimo/src/main/java/org/apache/geronimo/testharness/GeronimoConnector.java
URL: http://svn.apache.org/viewvc/geronimo/tck/branches/3.0/jboss-test-harness-geronimo/src/main/java/org/apache/geronimo/testharness/GeronimoConnector.java?rev=1061133&r1=1061132&r2=1061133&view=diff
==============================================================================
--- geronimo/tck/branches/3.0/jboss-test-harness-geronimo/src/main/java/org/apache/geronimo/testharness/GeronimoConnector.java
(original)
+++ geronimo/tck/branches/3.0/jboss-test-harness-geronimo/src/main/java/org/apache/geronimo/testharness/GeronimoConnector.java
Thu Jan 20 06:45:05 2011
@@ -127,17 +127,20 @@ public class GeronimoConnector implement
         // always enable assertion checking
         javaOpts = "-ea " + javaOpts;
         
+        // set java.home if env variable is not defined
+        String jrehome = System.getProperty("java.home");        
+        
         String osName = System.getProperty("os.name");
         
         List<String> cmd = new ArrayList<String>();
         if (osName.startsWith("Windows")) {
             cmd.add("cmd.exe");
             cmd.add("/C");
-            cmd.add("set JAVA_OPTS=" + javaOpts + " & cd /D " + geronimoHome + " &
" + "bin\\geronimo.bat run -l");
+            cmd.add("set JAVA_OPTS=" + javaOpts + " & set JRE_HOME=" + jrehome +" &
cd /D " + geronimoHome + " & " + "bin\\geronimo.bat run -l");
         } else {
             cmd.add("sh");
             cmd.add("-c");
-            cmd.add("cd " + geronimoHome + "; JAVA_OPTS=\"" + javaOpts + "\" ./bin/geronimo
run -l");
+            cmd.add("cd " + geronimoHome + "; JAVA_OPTS=\"" + javaOpts + "\"; JRE_HOME=\""
+ jrehome + "\"; ./bin/geronimo run -l");
         }
         
         LOG.info("Starting server. Executing {} ", cmd);

Modified: geronimo/tck/branches/3.0/jcdi-tck-runner/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/tck/branches/3.0/jcdi-tck-runner/pom.xml?rev=1061133&r1=1061132&r2=1061133&view=diff
==============================================================================
--- geronimo/tck/branches/3.0/jcdi-tck-runner/pom.xml (original)
+++ geronimo/tck/branches/3.0/jcdi-tck-runner/pom.xml Thu Jan 20 06:45:05 2011
@@ -264,8 +264,9 @@
                                 </property>
                                 <property>
                                     <name>JAVA_OPTS</name>
-                                    <value>-Xms128m -Xmx512m -XX:MaxPermSize=256m -Djline.terminal=jline.UnsupportedTerminal
-Dvalidation.provider=${validation.provider} ${remote.debug}
-                                    </value>
+                                    <!--<value>-Xms128m -Xmx512m -XX:MaxPermSize=256m
-Djline.terminal=jline.UnsupportedTerminal -Dvalidation.provider=${validation.provider} ${remote.debug}
+                                    </value>-->
+                                    <value>-Xms128m -Xmx512m -XX:MaxPermSize=256m -Djline.terminal=jline.UnsupportedTerminal
${remote.debug}</value>
                                 </property>
                                 <property>
                                     <name>org.jboss.testharness.container.forceRestart</name>



Mime
View raw message