[jboss-cvs] JBossAS SVN: r60736 - in branches/Branch_4_2/testsuite: imports and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Feb 20 16:42:13 EST 2007
Author: kabir.khan at jboss.com
Date: 2007-02-20 16:42:13 -0500 (Tue, 20 Feb 2007)
New Revision: 60736
Modified:
branches/Branch_4_2/testsuite/build.xml
branches/Branch_4_2/testsuite/imports/server-config.xml
Log:
[JBAS-4126] 4.2 now uses the AOP JDK 5 deployer so start up the scoped tests using the -javaagent since that is requir3ed by the AspectManagerServiceJDK5
Modified: branches/Branch_4_2/testsuite/build.xml
===================================================================
--- branches/Branch_4_2/testsuite/build.xml 2007-02-20 21:32:05 UTC (rev 60735)
+++ branches/Branch_4_2/testsuite/build.xml 2007-02-20 21:42:13 UTC (rev 60736)
@@ -183,7 +183,7 @@
<include name="org/jboss/test/cluster/test/DRMTestCase$TestListener.class"/>
<include name="org/jboss/test/cts/test/ClientCallbackImpl.class"/>
<include name="org/jboss/test/jmx/invoker/BadListener.class"/>
- <include name="org/jboss/test/jmx/invoker/Listener.class"/>
+ <include name="org/jboss/test/jmx/invoker/Listener.class"/>
</patternset>
<!-- ===== -->
@@ -2403,14 +2403,16 @@
<server:stop name="webservice-ssl"/>
</target>
- <target name="tests-aop-scoped"
- description="AOP tests requiring a native classloader hook">
+ <!-- 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 (we use this both when running with JDK 1.4 and 5.0 since
- the JDK 5.0 pluggable instrumentor depends on the jboss-aop-jdk50.deployer being deployed), and
- the testsuite uses the config with the jboss-aop.deployer.
- -->
+ <!-- Generate the JDK 1.4 classloader hook -->
<java classname="org.jboss.aop.hook.GeneratePluggableInstrumentedClassLoader">
<classpath>
<path refid="javassist.classpath"/>
@@ -2420,16 +2422,29 @@
</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"/>
+ <server:start name="scoped-aop-jdk14"/>
- <antcall target="run-tests-aop-scoped" inheritRefs="true"/>
+ <antcall target="run-tests-aop-scoped" inheritRefs="true"/>
+ <server:stop name="scoped-aop-jdk14"/>
- <server:stop name="scoped-aop"/>
<delete dir="${jboss.dist}/bin/woven-classloader"/>
<delete file="${jboss.dist}/bin/jdk14-pluggable-instrumentor.jar"/>
- </target>
+ </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"/>
+
+ <antcall target="run-tests-aop-scoped" inheritRefs="true"/>
+ <server:stop name="scoped-aop-jdk50"/>
+
+ <delete file="${jboss.dist}/bin/pluggable-instrumentor.jar"/>
+ </target>
+
<target name="run-tests-aop-scoped"
description="AOP tests requiring a native classloader hook">
<run-junit junit.patternset="aop-with-classloader.includes" junit.configuration="aop-scoped"/>
Modified: branches/Branch_4_2/testsuite/imports/server-config.xml
===================================================================
--- branches/Branch_4_2/testsuite/imports/server-config.xml 2007-02-20 21:32:05 UTC (rev 60735)
+++ branches/Branch_4_2/testsuite/imports/server-config.xml 2007-02-20 21:42:13 UTC (rev 60736)
@@ -94,6 +94,11 @@
<jvmarg value="-Xbootclasspath/p:${jboss.dist}/bin/jdk14-pluggable-instrumentor.jar${separator}${jboss.dist}/bin/woven-classloader"/>
<sysproperty key="jgroups.udp.ip_ttl" value="1" />
</server>
+ <server name="scoped-aop-jdk50" config="all" host="${node0}">
+ <jvmarg value="${jpda.cmdline}" />
+ <jvmarg value="-javaagent:pluggable-instrumentor.jar"/>
+ <sysproperty key="jgroups.udp.ip_ttl" value="1" />
+ </server>
<server name="jacc-securitymgr" host="${node0}" config="jacc-securitymgr">
<jvmarg value="${jpda.cmdline}" />
<jvmarg value="-Xmx64m" />
@@ -365,12 +370,12 @@
<include name="**/*"/>
</patternset>
</create-config>
- <!-- Unified config is now the default in 4.2.x
+ <!-- Unified config is now the default in 4.2.x
<replace file="@{jboss.dist}/server/@{conf}/conf/standardjboss.xml">
<replacefilter token="<invoker-mbean>jboss:service=invoker,type=jrmp</invoker-mbean>" value="<invoker-mbean>jboss:service=invoker,type=unified</invoker-mbean>"/>
<replacefilter token="<invoker-mbean>jboss:service=invoker,type=jrmpha</invoker-mbean>" value="<invoker-mbean>jboss:service=invoker,type=unifiedha</invoker-mbean>"/>
</replace>
-
+
<replace file="@{jboss.dist}/server/@{conf}/conf/jboss-service.xml">
<replacetoken><![CDATA[<!- - @TESTSUITE_CLUSTER_CONFIG@ - ->]]></replacetoken>
<replacevalue><![CDATA[
@@ -494,7 +499,7 @@
</replace>
</sequential>
</macrodef>
-
+
<!-- A macro for creating a clustered sso config -->
<macrodef name="create-cluster-sso-node"
description="Create a simplified clustered-sso configuration">
@@ -519,7 +524,7 @@
</create-config>
</sequential>
</macrodef>
-
+
<!-- This macro makes a new config whose name is given by the newconf
attribute by copying the config given by the baseconf. The content that
is copied from baseconf is limited to the patternset nested element. In
More information about the jboss-cvs-commits
mailing list