[jboss-cvs] JBossAS SVN: r63288 - in branches/Branch_4_2/testsuite: imports and 1 other directory.

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

Author: rachmatowicz at jboss.com
Date: 2007-05-31 17:54:41 -0400 (Thu, 31 May 2007)
New Revision: 63288

Modified:
   branches/Branch_4_2/testsuite/build.xml
   branches/Branch_4_2/testsuite/imports/server-config.xml
Log:
Adjust targets in tests-aop-scoped to use their own server configurations

Modified: branches/Branch_4_2/testsuite/build.xml
===================================================================
--- branches/Branch_4_2/testsuite/build.xml	2007-05-31 20:00:53 UTC (rev 63287)
+++ branches/Branch_4_2/testsuite/build.xml	2007-05-31 21:54:41 UTC (rev 63288)
@@ -2296,10 +2296,20 @@
       description="AOP tests requiring a native classloader hook"
       depends="tests-aop-scoped-jdk14,tests-aop-scoped-jdk50">
    </target>
+	
    <target name="tests-aop-scoped-jdk14"
       description="AOP tests requiring a native classloader hook for JDK 1.4"
       unless="HAVE_JDK_1.5">
 
+	  <!-- create the new server configuration -->   
+      <create-config baseconf="all" newconf="scoped-aop-jdk14">
+        <patternset>
+          <include name="conf/**"/>
+          <include name="lib/**"/>
+          <include name="deploy/**"/>
+        </patternset>
+      </create-config>
+
       <!-- Generate the JDK 1.4 classloader hook -->
       <java classname="org.jboss.aop.hook.GeneratePluggableInstrumentedClassLoader">
          <classpath>
@@ -2319,9 +2329,19 @@
       <delete dir="${jboss.dist}/bin/woven-classloader"/>
       <delete file="${jboss.dist}/bin/jdk14-pluggable-instrumentor.jar"/>
    </target>
+	
    <target name="tests-aop-scoped-jdk50"
       description="AOP tests requiring a native classloader hook for JDK 5.0"
       if="HAVE_JDK_1.5">
+	
+	  <!-- create the new server configuration -->   
+      <create-config baseconf="all" newconf="scoped-aop-jdk50">
+        <patternset>
+          <include name="conf/**"/>
+          <include name="lib/**"/>
+          <include name="deploy/**"/>
+        </patternset>
+      </create-config>
 
       <!-- copy across the pluggable instrumentor -->
       <copy todir="${jboss.dist}/bin" file="${jboss.aop.lib}/pluggable-instrumentor.jar"/>

Modified: branches/Branch_4_2/testsuite/imports/server-config.xml
===================================================================
--- branches/Branch_4_2/testsuite/imports/server-config.xml	2007-05-31 20:00:53 UTC (rev 63287)
+++ branches/Branch_4_2/testsuite/imports/server-config.xml	2007-05-31 21:54:41 UTC (rev 63288)
@@ -93,12 +93,12 @@
          <jvmarg value="-Djava.security.policy==${build.resources}/securitymgr/server.policy"/>
          <jvmarg value="-Djava.security.debug=policy"/>
       </server>
-      <server name="scoped-aop" config="all" host="${node0}">
+      <server name="scoped-aop-jdk14" 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="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="${jpda.cmdline}" />
          <jvmarg value="-javaagent:pluggable-instrumentor.jar"/>
          <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />