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

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

Author: adrian at jboss.org
Date: 2007-12-06 08:31:03 -0500 (Thu, 06 Dec 2007)
New Revision: 67994

Modified:
   trunk/testsuite/build.xml
   trunk/testsuite/imports/server-config.xml
Log:
Run the AOP scoped tests in their own copies of all so we don't override the server.log of the main tests

Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml	2007-12-06 13:02:33 UTC (rev 67993)
+++ trunk/testsuite/build.xml	2007-12-06 13:31:03 UTC (rev 67994)
@@ -2191,6 +2191,15 @@
 
       <!-- copy across the pluggable instrumentor -->
       <copy todir="${jboss.dist}/bin" file="${jboss.aop.lib}/pluggable-instrumentor.jar"/>
+      <create-config baseconf="all" newconf="scoped-aop-jdk50">
+         <patternset>
+            <include name="conf/**"/>
+            <include name="deployers/**"/>
+            <include name="deploy/**"/>
+            <include name="deploy-hasingleton/**"/>
+            <include name="lib/**"/>
+         </patternset>
+      </create-config>
       <server:start name="scoped-aop-jdk50"/>
 
 	   <antcall target="run-tests-aop-scoped" inheritRefs="true"/>
@@ -2204,6 +2213,15 @@
 
       <!-- copy across the pluggable instrumentor -->
       <copy todir="${jboss.dist}/bin" file="${jboss.aop.lib}/pluggable-instrumentor.jar"/>
+      <create-config baseconf="all" newconf="scoped-aop-generated-advisor">
+         <patternset>
+            <include name="conf/**"/>
+            <include name="deployers/**"/>
+            <include name="deploy/**"/>
+            <include name="deploy-hasingleton/**"/>
+            <include name="lib/**"/>
+         </patternset>
+      </create-config>
       <server:start name="scoped-aop-generated-advisor"/>
 
        <run-junit junit.patternset="aop-with-classloader.includes"/>

Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml	2007-12-06 13:02:33 UTC (rev 67993)
+++ trunk/testsuite/imports/server-config.xml	2007-12-06 13:31:03 UTC (rev 67994)
@@ -102,13 +102,7 @@
          <jvmarg value="-Djava.security.debug=failure"/>
          <sysproperty key="java.net.preferIPv4Stack" value="true" />
       </server>
-      <server name="scoped-aop-jdk14" config="all" host="${node0}">
-         <jvmarg value="${jpda.cmdline}" />
-         <jvmarg value="-Xbootclasspath/p:${jboss.dist}/bin/jdk14-pluggable-instrumentor.jar${separator}${jboss.dist}/bin/woven-classloader"/>
-         <sysproperty key="java.net.preferIPv4Stack" value="true" />
-         <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
-      </server>
-      <server name="scoped-aop-jdk50" config="all" host="${node0}">
+      <server name="scoped-aop-jdk50" host="${node0}">
           <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx512m" />
          <jvmarg value="-XX:MaxPermSize=512m" />
@@ -119,7 +113,7 @@
          <sysproperty key="java.net.preferIPv4Stack" value="true" />
          <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
       </server>
-      <server name="scoped-aop-generated-advisor" config="all" host="${node0}">
+      <server name="scoped-aop-generated-advisor" host="${node0}">
          <jvmarg value="${jpda.cmdline}" />
          <jvmarg value="-javaagent:pluggable-instrumentor.jar"/>
          <sysproperty key="jboss.aop.instrumentor" value="org.jboss.aop.instrument.GeneratedAdvisorInstrumentor"/>