From: Kabir K. <kk...@jb...> - 2006-04-25 12:23:54
|
User: kkhan Date: 06/04/25 08:23:49 Modified: jbosstest build.xml Log: Add special target for aop ScopedUntiTestCase requiring a special classloader hooks Revision Changes Path 1.560 +53 -3 jbosstest/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.559 retrieving revision 1.560 diff -u -b -r1.559 -r1.560 --- build.xml 23 Apr 2006 17:03:36 -0000 1.559 +++ build.xml 25 Apr 2006 12:23:49 -0000 1.560 @@ -10,7 +10,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.559 2006/04/23 17:03:36 kkhan Exp $ --> +<!-- $Id: build.xml,v 1.560 2006/04/25 12:23:49 kkhan Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -725,6 +725,9 @@ <!-- Needs to be started either with the bootclasspath or -javaagent classloader hooks --> <exclude name="org/jboss/test/aop/test/ScopedUnitTestCase.class"/> </patternset> + <patternset id="aop-with-classloader.includes"> + <include name="org/jboss/test/aop/test/ScopedUnitTestCase.class"/> + </patternset> <!-- The union of the excludes --> <patternset id="all.excludes"> @@ -775,6 +778,7 @@ <antcall target="tests-jacc-securitymgr"/> <antcall target="tests-compatibility"/> <antcall target="tests-webservice-ssl"/> + <antcall target="tests-aop-scoped"/> <antcall target="tests-report"/> <record name="${basedir}/build.log" action="stop"/> </target> @@ -2871,6 +2875,52 @@ </target> + <!-- The scoped AOP tests need a classloader hook --> + <target name="tests-aop-scoped" + 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"> + + <!-- Generate the JDK 1.4 classloader hook --> + <java classname="org.jboss.aop.hook.GeneratePluggableInstrumentedClassLoader"> + <classpath> + <path refid="javassist.classpath"/> + <path refid="jboss.aop.classpath"/> + </classpath> + <arg value="${jboss.dist}\bin\woven-classloader"/> + </java> + <!-- copy across the jdk 1.4 pluggable instrumentor --> + <copy todir="${jboss.dist}\bin" file="${jboss.aop.lib}/jdk14-pluggable-instrumentor.jar"/> + <server:start name="scoped-aop-jdk14"/> + + <run-junit junit.patternset="aop-with-classloader.includes"/> + + <server:stop name="scoped-aop-jdk14"/> + + <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"> + + <!-- copy across the pluggable instrumentor --> + <copy todir="${jboss.dist}\bin" file="${jboss.aop.lib}/pluggable-instrumentor.jar"/> + <server:start name="scoped-aop-jdk50"/> + + <run-junit junit.patternset="aop-with-classloader.includes"/> + + <server:stop name="scoped-aop-jdk50"/> + + <delete file="${jboss.dist}/bin/jdk14-pluggable-instrumentor.jar"/> + </target> + + + + <!-- Test for JAXR under the Web Services Umbrella --> <target name="tests-jaxr"> <mkdir dir="${build.reports}"/> |