[jboss-cvs] JBossAS SVN: r62411 - in branches/Branch_AOP_1_5/aop: previous.lib and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Apr 18 16:42:24 EDT 2007
Author: kabir.khan at jboss.com
Date: 2007-04-18 16:42:24 -0400 (Wed, 18 Apr 2007)
New Revision: 62411
Added:
branches/Branch_AOP_1_5/aop/previous.lib/
branches/Branch_AOP_1_5/aop/previous.lib/Readme.txt
branches/Branch_AOP_1_5/aop/previous.lib/concurrent.jar
branches/Branch_AOP_1_5/aop/previous.lib/javassist.jar
branches/Branch_AOP_1_5/aop/previous.lib/jboss-aop.jar
branches/Branch_AOP_1_5/aop/previous.lib/jboss-common.jar
branches/Branch_AOP_1_5/aop/previous.lib/qdox.jar
branches/Branch_AOP_1_5/aop/previous.lib/trove.jar
Modified:
branches/Branch_AOP_1_5/aop/build.xml
Log:
Add target to run tests agains jars aopc'ed with 1.5.2.GA
Modified: branches/Branch_AOP_1_5/aop/build.xml
===================================================================
--- branches/Branch_AOP_1_5/aop/build.xml 2007-04-18 19:29:25 UTC (rev 62410)
+++ branches/Branch_AOP_1_5/aop/build.xml 2007-04-18 20:42:24 UTC (rev 62411)
@@ -164,6 +164,23 @@
<pathelement path="${build.lib}/jboss-aop.jar"/>
</path>
+ <path id="compatibility.test.classpath">
+ <pathelement path="previous.lib/concurrent.jar"/>
+ <pathelement path="previous.lib/javassist.jar"/>
+ <pathelement path="previous.lib/jboss-aop.jar"/>
+ <pathelement path="previous.lib/jboss-common.jar"/>
+ <pathelement path="previous.lib/qdox.jar"/>
+ <pathelement path="previous.lib/trove.jar"/>
+
+ <path refid="junit.junit.classpath"/>
+ </path>
+
+ <path id="aop.task.classpath">
+ <path refid="library.classpath"/>
+ <path refid="dependentmodule.classpath"/>
+ <path refid="jboss.aop.classpath"/>
+ </path>
+
<path id="test.jrockit.classpath">
<path refid="test.classpath"/>
<path path="${jrockit.home}/jre/lib/${JROCKIT_API_AVAILABLE}"/>
@@ -656,6 +673,9 @@
<delete dir="${build.tests.classes}"/>
<antcall target="non-optimized-precompiled-tests" inheritRefs="true"/>
+
+ <delete dir="${build.tests.classes}"/>
+ <antcall target="precompiled-compatibility-tests" inheritRefs="true"/>
</target>
<!-- ==================================================================================== -->
@@ -827,13 +847,7 @@
<!-- ==================================================================================== -->
<target name="precompiled-tests" depends="compile-test-classes">
- <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/>
<taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC" classpathref="jboss.aop.classpath"/>
- <path id="aop.task.classpath">
- <path refid="library.classpath"/>
- <path refid="dependentmodule.classpath"/>
- <path refid="jboss.aop.classpath"/>
- </path>
<!-- Add tests in _base-precompiled-tests unless they should only be run in this weaving mode -->
<antcall target="_base-precompiled-tests" inheritRefs="true">
@@ -857,13 +871,7 @@
<!-- ==================================================================================== -->
<target name="non-optimized-precompiled-tests" depends="compile-test-classes">
- <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/>
<taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC" classpathref="jboss.aop.classpath"/>
- <path id="aop.task.classpath">
- <path refid="library.classpath"/>
- <path refid="dependentmodule.classpath"/>
- <path refid="jboss.aop.classpath"/>
- </path>
<!-- Add tests in _base-precompiled-tests unless they should only be run in this weaving mode -->
<antcall target="_base-precompiled-tests" inheritRefs="true">
@@ -883,13 +891,7 @@
<!-- ==================================================================================== -->
<target name="precompiled-genadvisor-tests" depends="compile-test-classes">
- <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/>
<taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC" classpathref="jboss.aop.classpath"/>
- <path id="aop.task.classpath">
- <path refid="library.classpath"/>
- <path refid="dependentmodule.classpath"/>
- <path refid="jboss.aop.classpath"/>
- </path>
<!-- Add tests in _base-precompiled-tests unless they should only be run in this weaving mode -->
<antcall target="_base-precompiled-tests" inheritRefs="true">
@@ -922,6 +924,19 @@
<!-- ==================================================================================== -->
+ <!-- TEST COMPATIBILITY WITH CODE WOVEN W PREVIOUS VERSION -->
+ <!-- ==================================================================================== -->
+
+ <target name="precompiled-compatibility-tests" depends="compile-test-classes">
+ <taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC" classpathref="jboss.aop.classpath"/>
+
+ <!-- Add tests in _base-precompiled-tests unless they should only be run in this weaving mode -->
+ <antcall target="_base-precompiled-tests" inheritRefs="true">
+ <param name="caller" value="precompiled-compatibility-tests"/>
+ </antcall>
+ </target>
+
+ <!-- ==================================================================================== -->
<!-- JDK 1.4 PRECOMPILED TEST COMMONS -->
<!-- These targets should not be called directly, use precompiled-tests, -->
<!-- non-optimized-precompiled-tests or precompiled-genadvisor-tests -->
@@ -1022,7 +1037,6 @@
</target>
<target name="precompiled-test" depends="init">
- <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/>
<antcall target="_run-precompiled-test" inheritRefs="true">
<param name="test" value="${test}"/>
<param name="caller" value="precompiled-tests"/>
@@ -1049,6 +1063,7 @@
<or>
<equals arg1="${caller}" arg2="precompiled-tests"/>
<equals arg1="${caller}" arg2="precompiled-genadvisor-tests"/>
+ <equals arg1="${caller}" arg2="precompiled-compatibility-tests"/>
</or>
</condition>
<condition property="optimized" value="false">
@@ -1065,9 +1080,19 @@
<echo>Compiling ${test} with optimized=${optimized} and instrumentor ${instrumentor}</echo>
+ <!-- The compatibility tests need another classpath for aopc -->
+ <condition property="aopc.tests.classpath" value="compatibility.test.classpath" else="test.classpath">
+ <equals arg1="${caller}" arg2="precompiled-compatibility-tests"/>
+ </condition>
+ <condition property="aopc.task.classpath" value="compatibility.test.classpath" else="aop.task.classpath">
+ <equals arg1="${caller}" arg2="precompiled-compatibility-tests"/>
+ </condition>
+
<!-- aopc -->
- <aopc optimized="${optimized}" compilerclasspathref="aop.task.classpath">
- <classpath refid="aop.task.classpath"/>
+ <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/>
+ <aopc optimized="${optimized}" compilerclasspathref="${aopc.task.classpath}">
+ <classpath refid="${aopc.task.classpath}"/>
+ <classpath refid="${aopc.tests.classpath}"/>
<classpath path="${build.tests.classes}"/>
<aoppath path="${aoppath}"/>
<sysproperty key="jboss.aop.instrumentor" value="${instrumentor}"/>
@@ -1389,11 +1414,6 @@
<mkdir dir="${report.dir}"/>
<taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/>
- <path id="aop.task.classpath">
- <path refid="test15.classpath"/>
- <pathelement location="${build.tests.classes}"/>
- <pathelement location="docs"/>
- </path>
<aopc compilerclasspathref="aop.task.classpath">
<classpath refid="aop.task.classpath"/>
@@ -1813,11 +1833,6 @@
<target name="compiletime-declare" depends="compile-test-classes">
<taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/>
<taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC" classpathref="jboss.aop.classpath"/>
- <path id="aop.task.classpath">
- <path refid="library.classpath"/>
- <path refid="dependentmodule.classpath"/>
- <path refid="jboss.aop.classpath"/>
- </path>
<annotationc compilerclasspathref="aop.task.classpath" bytecode="true">
<classpath refid="aop.task.classpath"/>
Added: branches/Branch_AOP_1_5/aop/previous.lib/Readme.txt
===================================================================
--- branches/Branch_AOP_1_5/aop/previous.lib/Readme.txt (rev 0)
+++ branches/Branch_AOP_1_5/aop/previous.lib/Readme.txt 2007-04-18 20:42:24 UTC (rev 62411)
@@ -0,0 +1 @@
+These files are from the AOP 1.5.2.GA release. They are here for the precompiled-compatibitily-tests target to check if files woven with AOP 1.5.2.GA is still runnable in the current AOP version
\ No newline at end of file
Added: branches/Branch_AOP_1_5/aop/previous.lib/concurrent.jar
===================================================================
(Binary files differ)
Property changes on: branches/Branch_AOP_1_5/aop/previous.lib/concurrent.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/Branch_AOP_1_5/aop/previous.lib/javassist.jar
===================================================================
(Binary files differ)
Property changes on: branches/Branch_AOP_1_5/aop/previous.lib/javassist.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/Branch_AOP_1_5/aop/previous.lib/jboss-aop.jar
===================================================================
(Binary files differ)
Property changes on: branches/Branch_AOP_1_5/aop/previous.lib/jboss-aop.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/Branch_AOP_1_5/aop/previous.lib/jboss-common.jar
===================================================================
(Binary files differ)
Property changes on: branches/Branch_AOP_1_5/aop/previous.lib/jboss-common.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/Branch_AOP_1_5/aop/previous.lib/qdox.jar
===================================================================
(Binary files differ)
Property changes on: branches/Branch_AOP_1_5/aop/previous.lib/qdox.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/Branch_AOP_1_5/aop/previous.lib/trove.jar
===================================================================
(Binary files differ)
Property changes on: branches/Branch_AOP_1_5/aop/previous.lib/trove.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the jboss-cvs-commits
mailing list