svn commit: r1398257 - in /openejb/trunk/openejb/arquillian: arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/ arquillian-tomee-webapp-remote/src/main/j...

[rm...@apache.org]

Author: rmannibucau
Date: Mon Oct 15 12:06:30 2012
New Revision: 1398257

URL: http://svn.apache.org/viewvc?rev=1398257&view=rev
Log:
TOMEE-467 adding CATALINA_OPTS to arquillian tomee remote in arquillian.xml - managing conflict with java.opts

Modified:
    openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
    openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java
    openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java
    openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java

Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java?rev=1398257&r1=1398256&r2=1398257&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java Mon Oct 15 12:06:30 2012
@@ -54,13 +54,16 @@ import java.util.logging.Logger;
 public class Setup {
     private static final Logger LOGGER = Logger.getLogger(Setup.class.getName()); // JUL is used by arquillian so that's fine
     public static final String TOMEE_BEAN_DISCOVERER_JAR = "lib/arquillian-tomee-bean-discoverer.jar";
+    private static final String DEFAULT_MEM_CONFIG = "-Xmx512m -Xms256m -XX:PermSize=64m -XX:MaxPermSize=256m -XX:ReservedCodeCacheSize=64m";
 
-    public static void exportProperties(final File openejbHome, final TomEEConfiguration c) {
+    public static void exportProperties(final File openejbHome, final TomEEConfiguration c, final boolean defaultMem) {
         System.setProperty("java.naming.provider.url", "http://" + c.getHost() + ":" + c.getHttpPort() + "/tomee/ejb");
         System.setProperty("connect.tries", "90");
         System.setProperty("server.http.port", String.valueOf(c.getHttpPort()));
         System.setProperty("server.shutdown.port", String.valueOf(c.getStopPort()));
-        System.setProperty("java.opts", "-Xmx512m -Xms256m -XX:PermSize=64m -XX:MaxPermSize=256m -XX:ReservedCodeCacheSize=64m -Dtomee.httpPort=" + c.getHttpPort());
+        if (defaultMem) {
+            System.setProperty("java.opts", "-Dtomee.httpPort=" + c.getHttpPort());
+        }
         System.setProperty("openejb.home", openejbHome.getAbsolutePath());
         System.setProperty("tomee.home", openejbHome.getAbsolutePath());
     }

Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java?rev=1398257&r1=1398256&r2=1398257&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java Mon Oct 15 12:06:30 2012
@@ -177,4 +177,6 @@ public class RemoteTomEEConfiguration ex
     public void setCATALINA_OPTS(final String opts) {
         this.CATALINA_OPTS = opts;
     }
+
+
 }

Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java?rev=1398257&r1=1398256&r2=1398257&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java Mon Oct 15 12:06:30 2012
@@ -155,7 +155,8 @@ public class RemoteTomEEContainer extend
         Setup.synchronizeFolder(openejbHome, configuration.getBin(), "bin");
         Setup.synchronizeFolder(openejbHome, configuration.getLib(), "lib");
 
-        Setup.exportProperties(openejbHome, configuration);
+        final String opts = configuration.getCATALINA_OPTS();
+        Setup.exportProperties(openejbHome, configuration, opts == null || (!opts.contains("-Xm") && !opts.matches(".*-XX:[^=]*Size=.*")));
         Setup.installArquillianBeanDiscoverer(openejbHome);
 
         if (configuration.isRemoveUnusedWebapps()) {

Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java?rev=1398257&r1=1398256&r2=1398257&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java Mon Oct 15 12:06:30 2012
@@ -107,7 +107,7 @@ public class TomEEWebappContainer extend
             Setup.configureServerXml(openejbHome, configuration);
             Setup.configureSystemProperties(openejbHome, configuration);
 
-            Setup.exportProperties(openejbHome, configuration);
+            Setup.exportProperties(openejbHome, configuration, true);
 
             final URL logging = Thread.currentThread().getContextClassLoader().getResource("default.remote.logging.properties");
             if (logging != null) {