[jboss-cvs] JBossAS SVN: r66857 - trunk/ejb3.

[jboss-cvs-commits at lists.jboss.org]

Author: wolfc
Date: 2007-11-08 06:26:56 -0500 (Thu, 08 Nov 2007)
New Revision: 66857

Modified:
   trunk/ejb3/build-test.xml
Log:
One setting for max memory

Modified: trunk/ejb3/build-test.xml
===================================================================
--- trunk/ejb3/build-test.xml	2007-11-08 11:03:28 UTC (rev 66856)
+++ trunk/ejb3/build-test.xml	2007-11-08 11:26:56 UTC (rev 66857)
@@ -4362,7 +4362,7 @@
 
    <target name="start-stop-test" depends="init" description="Start and stop JBoss">
 
-      <start-jboss conf="all" host="${node0}" jvmargs="-Xmx128M"/>
+      <start-jboss conf="all" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
       <wait-on-host/>
 
       <stop-jboss/>
@@ -4830,7 +4830,7 @@
          </patternset>
       </create-config>
 
-      <start-jboss conf="libdeployment" host="${node0}" jvmargs="-Xmx256M"/>
+      <start-jboss conf="libdeployment" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
       <wait-on-host/>
 
       <antcall target="test" inheritRefs="true">
@@ -4854,7 +4854,7 @@
          We are using the simplest remoting sslsocket configuration possible, we
          need to tell JBoss to use the supplied keystore via system properties
       -->
-      <property name="ssl-args" value="-Xmx256M -Djavax.net.ssl.keyStore=${jboss.dist}/server/ejb3-ssl/conf/localhost.keystore -Djavax.net.ssl.keyStorePassword=opensource"/>
+      <property name="ssl-args" value="${ejb3.jboss.jvmargs} -Djavax.net.ssl.keyStore=${jboss.dist}/server/ejb3-ssl/conf/localhost.keystore -Djavax.net.ssl.keyStorePassword=opensource"/>
       <start-jboss conf="ejb3-ssl" host="${node0}" jvmargs="${ssl-args}"/>
       <wait-on-host/>
 
@@ -4882,7 +4882,7 @@
       <!--
          "Advanced" remoting sslsocket configuration contains keystore info
       -->
-      <start-jboss conf="ejb3-ssl-advanced" host="${node0}" jvmargs="-Xmx512M"/>
+      <start-jboss conf="ejb3-ssl-advanced" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
       <wait-on-host/>
 
       <!-- Tell client to use the supplied truststore -->
@@ -4906,7 +4906,7 @@
          </patternset>
       </create-config>
 
-      <start-jboss conf="invoker" host="${node0}" jvmargs="-Xmx128M"/>
+      <start-jboss conf="invoker" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
       <wait-on-host/>
 
       <property name="jvmargs" value=""/>
@@ -4932,7 +4932,7 @@
             <include name="lib/**"/>
          </patternset>
       </create-config>
-      <start-jboss conf="ejb3-jacc" host="${node0}" jvmargs="-Xmx128M"/>
+      <start-jboss conf="ejb3-jacc" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
       <wait-on-host/>
       <antcall target="test" inheritRefs="true">
          <param name="test" value="jacc"/>
@@ -5066,8 +5066,8 @@
          </patternset>
       </create-config>
 
-      <start-jboss conf="clusteredjms" host="${node0}" jvmargs="-Xmx512M"/>
-	  <start-jboss conf="clusteredjms2" host="${node1}" jvmargs="-Xmx512M"/>
+      <start-jboss conf="clusteredjms" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
+	  <start-jboss conf="clusteredjms2" host="${node1}" jvmargs="${ejb3.jboss.jvmargs}"/>
 
 	  <antcall target="tests-clustering-wait"/>
 
@@ -5102,8 +5102,8 @@
       <buddy-repl-config-change conf="clustered-ejb3-noBR-0"/>
       <buddy-repl-config-change conf="clustered-ejb3-noBR-1"/>
 
-      <start-jboss conf="clustered-ejb3-noBR-0" host="${node0}" jvmargs="-Xmx512M"/>
-      <start-jboss conf="clustered-ejb3-noBR-1" host="${node1}" jvmargs="-Xmx512M"/>
+      <start-jboss conf="clustered-ejb3-noBR-0" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
+      <start-jboss conf="clustered-ejb3-noBR-1" host="${node1}" jvmargs="${ejb3.jboss.jvmargs}"/>
 
       <antcall target="tests-clustering-wait"/>
 
@@ -5151,9 +5151,9 @@
       <property name="second-node" value="node1"/> 
    
       <create-cluster-node conf="node0"/>
-      <start-jboss  conf="${first-node}" host="${node0}" jvmargs="-Xmx128M"/>
+      <start-jboss  conf="${first-node}" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
       <create-cluster-node conf="${second-node}"/>
-      <start-jboss  conf="${second-node}" host="${node1}" jvmargs="-Xmx128M"/>
+      <start-jboss  conf="${second-node}" host="${node1}" jvmargs="${ejb3.jboss.jvmargs}"/>
    </target>
 
    <target name="tests-clustering-shutdown" unless="${tests.clustering.skip.startup}">
@@ -5265,7 +5265,7 @@
 
    <target name="iiop-tests" depends="init" description="Execute all tests">
 
-      <start-jboss conf="all" host="${node0}" jvmargs="-Xmx128M"/>
+      <start-jboss conf="all" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
       <wait-on-host/>
 
       <antcall target="no-start-jboss-iiop-tests" inheritRefs="true"/>