[jboss-cvs] JBossAS SVN: r68076 - in trunk/testsuite: imports and 1 other directory.

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

Author: scott.stark at jboss.org
Date: 2007-12-09 05:05:50 -0500 (Sun, 09 Dec 2007)
New Revision: 68076

Modified:
   trunk/testsuite/build.xml
   trunk/testsuite/imports/server-config.xml
Log:
Breakout messaging tests to a separate jbossmessaging server config

Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml	2007-12-09 03:42:45 UTC (rev 68075)
+++ trunk/testsuite/build.xml	2007-12-09 10:05:50 UTC (rev 68076)
@@ -861,6 +861,7 @@
 <!--
       <antcall target="tests-security-jaspi-unit"/>
 -->
+      <antcall target="tests-jbossmessaging"/>
       <antcall target="tests-compatibility"/>
       <antcall target="tests-aop-scoped"/>
       <antcall target="tests-classloader-leak"/>
@@ -888,7 +889,6 @@
       description="The units tests which are run against the jboss all config" depends="init">
       <server:start name="all"/>
    	  <antcall target="tests-standard-unit"/>
-      <antcall target="tests-jbossmessaging"/>
       <antcall target="tests-client-unit"/>
       <antcall target="tests-security-basic-unit"/>
       <antcall target="tests-standard-stress"/>
@@ -2274,19 +2274,18 @@
    <target name="tests-jbossmessaging"
       description="Run JMS tests against the Messaging JMS provider">
 
-      <!-- Create a scoped Messaging server config -->
-      <!-- <ant antfile="${jboss.messaging.resources}/release-admin.xml" -->
-      <!--     target="create-server-config"> -->
-      <!--  <property name="jboss.home" value="${jboss.dist}"/> -->
-      <!--   <property name="messaging.artifact.name" value="jboss-messaging-scoped.sar"/> -->
-      <!--  <property name="relative.artifact.location" value="${jboss.messaging.lib}"/> -->
-      <!-- </ant> -->
-
-      <!-- run the tests by calling a target - this target was defined in order to -->
-      <!-- allow modification of the test classpath                                -->
-      <!-- <server:start name="jbossmessaging"/> -->
-        <antcall target="tests-jbossmessaging-unit" />
-      <!-- <server:stop name="jbossmessaging"/> -->
+      <!-- Create a separate messaging config -->
+      <create-config baseconf="default" newconf="jbossmessaging">
+         <patternset>
+            <include name="conf/**"/>
+            <include name="deployers/**"/>
+            <include name="deploy/**"/>
+			   <include name="lib/**"/>
+         </patternset>
+      </create-config>
+	   <server:start name="jbossmessaging"/>
+      <antcall target="tests-jbossmessaging-unit" />
+      <server:stop name="jbossmessaging"/>
    </target>
 
   <!-- Test the Messaging JMS provider -->

Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml	2007-12-09 03:42:45 UTC (rev 68075)
+++ trunk/testsuite/imports/server-config.xml	2007-12-09 10:05:50 UTC (rev 68076)
@@ -686,7 +686,6 @@
          <sysproperty key="java.net.preferIPv4Stack" value="true" />
          <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
       </server>
-      <server name="jbossmessaging" host="${node0}" config="messaging"/>
       <server name="classloader-leak" host="${node0}">
       	<jvmarg value="-Xms128m" />
       	<jvmarg value="-Xmx512m" />
@@ -705,6 +704,15 @@
          <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
          <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
       </server>   	
+      <server name="jbossmessaging" host="${node0}">
+         <jvmarg value="-Xms128m" />
+         <jvmarg value="-Xmx512m" />
+         <jvmarg value="-XX:MaxPermSize=512m" />
+         <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
+         <sysproperty key="java.net.preferIPv4Stack" value="true" />
+         <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
+         <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+      </server>   	
    </server:config>
 
     <!-- A macro for printing sleep before going into sleep