[webbeans-commits] Webbeans SVN: r1548 - ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-02-16 14:49:10 -0500 (Mon, 16 Feb 2009)
New Revision: 1548

Modified:
   ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java
Log:
Slightly safer java_opts

Modified: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java
===================================================================
--- ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java	2009-02-16 19:39:54 UTC (rev 1547)
+++ ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java	2009-02-16 19:49:10 UTC (rev 1548)
@@ -25,9 +25,10 @@
 public abstract class AbstractContainersImpl implements Configurable, Containers
 {
    
-   public static String JAVA_OPTS = "\"-Xms128m -Xmx512m -XX:MaxPermSize=256m -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -ea\"";
+   public static String JAVA_OPTS = "-ea";
    
    public static final String JBOSS_HOME_PROPERTY_NAME = "jboss.home";
+   public static final String JAVA_OPTS_PROPERTY_NAME = "java.opts";
    public static final String JBOSS_AS_DIR_PROPERTY_NAME = "jboss-as.dir";
    public static final String JBOSS_BOOT_TIMEOUT_PROPERTY_NAME = "jboss.boot.timeout";
    public static final String FORCE_RESTART_PROPERTY_NAME = "jboss.force.restart";
@@ -39,6 +40,7 @@
    private String jbossHttpUrl;
    private boolean jbossWasStarted;
    private long bootTimeout;
+   private String javaOpts;
 
    protected static void copy(InputStream inputStream, File file) throws IOException
    {
@@ -109,6 +111,12 @@
          }            
       }
       jbossHome = System.getProperty(JBOSS_HOME_PROPERTY_NAME);
+      javaOpts = System.getProperty(JAVA_OPTS_PROPERTY_NAME);
+      if (javaOpts == null)
+      {
+         javaOpts = "";
+      }
+      javaOpts = "\"" + javaOpts + JAVA_OPTS + "\"";
       if (jbossHome == null)
       {
          throw new IllegalArgumentException("-D" + JBOSS_HOME_PROPERTY_NAME + " must be set");