Slightly safer java_opts

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@1548 1c488680-804c-0410-94cd-c6b725194a0e
weld · Feb 16, 2009 · 7ee71f6 · 7ee71f6
1 parent 962c5c5
commit 7ee71f6
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/...nner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java b/...nner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java
@@ -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 @@ public abstract class AbstractContainersImpl implements Configurable, Containers
    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 @@ public void setup() throws IOException
          }            
       }
       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");