svn commit: r1398258 - /openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java

[rmannibucau]

Author: rmannibucau
Date: Mon Oct 15 12:06:59 2012
New Revision: 1398258

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

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=1398258&r1=1398257&r2=1398258&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:59 2012
@@ -62,6 +62,8 @@ public class Setup {
         System.setProperty("server.http.port", 
String.valueOf(c.getHttpPort()));
         System.setProperty("server.shutdown.port", 
String.valueOf(c.getStopPort()));
         if (defaultMem) {
+            System.setProperty("java.opts", DEFAULT_MEM_CONFIG + 
"-Dtomee.httpPort=" + c.getHttpPort());
+        } else {
             System.setProperty("java.opts", "-Dtomee.httpPort=" + 
c.getHttpPort());
         }
         System.setProperty("openejb.home", openejbHome.getAbsolutePath());