From: Kabir K. <kk...@jb...> - 2006-07-10 20:48:54
|
User: kkhan Date: 06/07/10 16:48:49 Modified: jboss-aop build-tests-jdk14.xml Added: jboss-aop build-tests-jdk50.xml base-tests.xml Log: Continue with the retro stuff Revision Changes Path 1.3 +26 -308 jboss-aop/build-tests-jdk14.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build-tests-jdk14.xml =================================================================== RCS file: /cvsroot/jboss/jboss-aop/build-tests-jdk14.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- build-tests-jdk14.xml 10 Jul 2006 19:07:48 -0000 1.2 +++ build-tests-jdk14.xml 10 Jul 2006 20:48:49 -0000 1.3 @@ -14,7 +14,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build-tests-jdk14.xml,v 1.2 2006/07/10 19:07:48 kkhan Exp $ --> +<!-- $Id: build-tests-jdk14.xml,v 1.3 2006/07/10 20:48:49 kkhan Exp $ --> <project default="main" name="JBoss/AOP"> @@ -31,6 +31,8 @@ &buildmagic; + <import file="base-tests.xml"/> + <!-- ================================================================== --> <!-- Initialization --> @@ -294,17 +296,18 @@ <arg value="${build.bootclasspath}"/> </java> + <!-- Add tests in _base-tests unless they should only be run in this weaving mode --> + <antcall target="_base-tests" inheritRefs="true"> + <param name="caller" value="bootclasspath-tests"/> + <param name="test-target" value="_run-bootclasspath-test"/> + </antcall> + <!-- Tests only applicable for this weaving mode --> <antcall target="_run-bootclasspath-test" inheritRefs="true"> <param name="test" value="override"/> <param name="caller" value="bootclasspath-tests"/> <param name="exclude" value="**/GenAdvisorOverrideTestCase.class"/> </antcall> - - <!-- Add tests in _base-bootclasspath-tests unless they should only be run in this weaving mode --> - <antcall target="_base-bootclasspath-tests" inheritRefs="true"> - <param name="caller" value="bootclasspath-tests"/> - </antcall> </target> <!-- ==================================================================================== --> @@ -319,18 +322,25 @@ <arg value="${build.bootclasspath}"/> </java> + <!-- Add tests in _base-tests unless they should only be run in this weaving mode --> + <antcall target="_base-tests" inheritRefs="true"> + <param name="caller" value="bootclasspath-genadvisor-tests"/> + <param name="test-target" value="_run-bootclasspath-test"/> + </antcall> + <!-- Tests only applicable for this weaving mode --> <antcall target="_run-bootclasspath-test" inheritRefs="true"> <param name="test" value="override"/> <param name="caller" value="bootclasspath-genadvisor-tests"/> <param name="exclude" value="**/OverrideTestCase.class"/> </antcall> + </target> - <!-- Add tests in _base-bootclasspath-tests unless they should only be run in this weaving mode --> - <antcall target="_base-bootclasspath-tests" inheritRefs="true"> - <param name="caller" value="bootclasspath-genadvisor-tests"/> + <target name="loadtime-test" depends="init"> + <antcall target="_run-bootclasspath-test" inheritRefs="true"> + <param name="test" value="${test}"/> + <param name="caller" value="bootclasspath-tests"/> </antcall> - </target> <!-- ==================================================================================== --> @@ -338,94 +348,6 @@ <!-- These targets should not be called directly, use bootclasspath-tests or --> <!-- bootclasspath-genadvisor-tests --> <!-- ==================================================================================== --> - <target name="_base-bootclasspath-tests"> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="jdk15base"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="stress/simple"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="invoketarget"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="instanceofintroduced"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="implementz"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="annotatedcflow"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="scope"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="construction"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="constructortarget"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="basic"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="marshalling"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="annotatedparams"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="callerscope"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="reflection"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="regression"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="perjoinpoint"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="beanstyleconfig"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="precedence"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="dotinpointcutname"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="instanceofannotated"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="callerargs"/> - </antcall> - - <!-- Tests with special requirements for parameters --> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="annotated"/> - <param name="no.xml" value="true"/> - <param name="use.annotations" value="true"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="jdk15annotated"/> - <param name="no.xml" value="true"/> - <param name="use.annotations" value="true"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="introduction"/> - <param name="aop.xml" value="${source.res}/test/introduction/introduction-aop.xml"/> - </antcall> - </target> - - <target name="loadtime-test" depends="init"> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="${test}"/> - <param name="caller" value="bootclasspath-tests"/> - </antcall> - </target> <target name="_run-bootclasspath-test"> <path id="bootclasspath"> @@ -510,8 +432,9 @@ </path> <!-- Add tests in _base-precompiled-tests unless they should only be run in this weaving mode --> - <antcall target="_base-precompiled-tests" inheritRefs="true"> + <antcall target="_base-tests" inheritRefs="true"> <param name="caller" value="precompiled-tests"/> + <param name="test-target" value="_run-precompiled-test"/> </antcall> <!-- Tests only applicable for this weaving mode --> @@ -542,8 +465,9 @@ </path> <!-- Add tests in _base-precompiled-tests unless they should only be run in this weaving mode --> - <antcall target="_base-precompiled-tests" inheritRefs="true"> + <antcall target="_base-tests" inheritRefs="true"> <param name="caller" value="non-optimized-precompiled-tests"/> + <param name="test-target" value="_run-precompiled-test"/> </antcall> <!-- Tests only applicable for this weaving mode --> @@ -568,8 +492,9 @@ </path> <!-- Add tests in _base-precompiled-tests unless they should only be run in this weaving mode --> - <antcall target="_base-precompiled-tests" inheritRefs="true"> + <antcall target="_base-tests" inheritRefs="true"> <param name="caller" value="precompiled-genadvisor-tests"/> + <param name="test-target" value="_run-precompiled-test"/> </antcall> <!-- Tests only applicable for this weaving mode --> @@ -592,99 +517,6 @@ </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 --> - <!-- bootclasspath-genadvisor-tests --> - <!-- ==================================================================================== --> - - <target name="_base-precompiled-tests"> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="jdk15base"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="invoketarget"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="invoketarget"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="stress/simple"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="instanceofintroduced"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="implementz"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="annotatedcflow"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="scope"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="construction"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="constructortarget"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="basic"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="marshalling"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="annotatedparams"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="callerscope"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="reflection"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="regression"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="perjoinpoint"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="beanstyleconfig"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="precedence"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="dotinpointcutname"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="instanceofannotated"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="callerargs"/> - </antcall> - - <!-- Tests with special requirements for parameters --> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="annotated"/> - <param name="no.xml" value="true"/> - <param name="use.annotations" value="true"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="jdk15annotated"/> - <param name="no.xml" value="true"/> - <param name="use.annotations" value="true"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="introduction"/> - <param name="aop.xml" value="${source.res}/test/introduction/introduction-aop.xml"/> - </antcall> - </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"> @@ -892,120 +724,6 @@ </junit> </target> -<!-- - <target name="memory-tests" depends="compile-test-classes, compile-jdk15-tests"> - <taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC" classpathref="jboss.aop.classpath"/> - <annotationc compilerclasspathref="aop.task.classpath" bytecode="true"> - <classpath refid="aop.task.classpath"/> - <classpath path="${build.tests.retro}"/> - <src path="${source.tests.java}"/> - <include name="org/jboss/test/aop/annotatedcflow/*.java"/> - <include name="org/jboss/test/aop/annotatedparams/*.java"/> - <include name="org/jboss/test/aop/perjoinpoint/*.java"/> - <include name="org/jboss/test/aop/annotated/*.java"/> - <include name="org/jboss/test/aop/instanceofannotated/*.java"/> - <include name="org/jboss/test/aop/implementz/*.java"/> - </annotationc> - - <antcall target="memory-test" inheritRefs="true"> - <param name="test" value="annotatedcflow"/> - <param name="case" value="AnnotatedCFlowTestCase"/> - </antcall> - <antcall target="memory-test" inheritRefs="true"> - <param name="test" value="annotatedparams"/> - <param name="case" value="AnnotatedParamsTester"/> - </antcall> - <antcall target="memory-test" inheritRefs="true"> - <param name="test" value="args"/> - <param name="case" value="ArgsTestCase"/> - </antcall> - <antcall target="memory-test" inheritRefs="true"> - <param name="test" value="basic"/> - <param name="case" value="AOPTester"/> - </antcall> - <antcall target="memory-test" inheritRefs="true"> - <param name="test" value="beanstyleconfig"/> - <param name="case" value="ConfigTester"/> - </antcall> - <antcall target="memory-test" inheritRefs="true"> - <param name="test" value="callerargs"/> - <param name="case" value="CallerArgsTestCase"/> - </antcall> - <antcall target="memory-test" inheritRefs="true"> - <param name="test" value="callerscope"/> - <param name="case" value="CallerScopeTestCase"/> - </antcall> - <antcall target="memory-test" inheritRefs="true"> - <param name="test" value="construction"/> - <param name="case" value="ConstructionTester"/> - </antcall> - <antcall target="memory-test" inheritRefs="true"> - <param name="test" value="constructortarget"/> - <param name="case" value="ConstructorTargetTester"/> - </antcall> - <antcall target="memory-test" inheritRefs="true"> - <param name="test" value="dotinpointcutname"/> - <param name="case" value="DotInPointcutNameTestCase"/> - </antcall> - <antcall target="memory-test" inheritRefs="true"> - <param name="test" value="implementz"/> - <param name="case" value="ImplementsTester"/> - </antcall> - <antcall target="memory-test" inheritRefs="true"> - <param name="test" value="instanceofannotated"/> - <param name="case" value="InstanceOfAnnotatedTester"/> - </antcall> - <antcall target="memory-test" inheritRefs="true"> - <param name="test" value="introduction"/> - <param name="case" value="IntroductionTester"/> - </antcall> - <antcall target="memory-test" inheritRefs="true"> - <param name="test" value="override"/> - <param name="case" value="OverrideTestCase"/> - </antcall> - <antcall target="memory-test" inheritRefs="true"> - <param name="test" value="perjoinpoint"/> - <param name="case" value="PerJoinpointTester"/> - </antcall> - <antcall target="memory-test" inheritRefs="true"> - <param name="test" value="scope"/> - <param name="case" value="ScopeTestCase"/> - </antcall> - </target> ---> - <target name="memory-test" depends="init"> - <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/> - <property name="aoppath" value="${source.res}/test/${test}/jboss-aop.xml"/> - <property name="testcase" value="org.jboss.test.aop.${test}.${case}"/> - - - <aopc compilerclasspathref="aop.task.classpath" jvm="${java14}"> - <classpath refid="aop.task.classpath"/> - <classpath refid="test.classpath"/> - <classpath path="${build.tests.retro}"/> - <aoppath path="${aoppath}"/> - <src path="${build.tests.retro}"/> - <include name="org/jboss/test/aop/${test}/**"/> - <aopclasspath path="${build.tests.retro}"/> - </aopc> - - <property name="report.dir" value="${build.reports}"/> - <mkdir dir="${report.dir}/memory-tests"/> - - <echo>${testcase}</echo> - <junit printsummary="yes" fork="yes" haltonfailure="no" jvm="${java14}"> - <sysproperty key="jboss.aop.path" value="${aoppath}"/> - <sysproperty key="test.to.run" value="${testcase}"/> - <sysproperty key="leak.report.dir" value="${report.dir}"/> - <classpath refid="test.classpath"/> - <classpath path="${build.tests.retro}"/> - <jvmarg value="-agentlib:jbossAgent"/> - <formatter usefile="true" type="xml" extension="-${testcase}.xml"/> - <formatter usefile="true" type="plain" extension="-${testcase}.txt"/> - <test fork="yes" name="org.jboss.test.aop.memoryleaks.MemoryLeakTestCase" todir="${report.dir}"/> - </junit> - </target> - <target name="compile-stylesheets" depends="configure"> <mkdir dir="${build.stylesheets}"/> <copy todir="${build.stylesheets}" filtering="yes"> 1.1 date: 2006/07/10 20:48:49; author: kkhan; state: Exp;jboss-aop/build-tests-jdk50.xml Index: build-tests-jdk50.xml =================================================================== <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE project [ <!ENTITY buildmagic SYSTEM "../tools/etc/buildmagic/buildmagic.ent"> <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent"> <!ENTITY modules SYSTEM "../tools/etc/buildmagic/modules.ent"> ]> <!-- ====================================================================== --> <!-- --> <!-- JBoss, the OpenSource J2EE webOS --> <!-- --> <!-- Distributable under LGPL license. --> <!-- See terms of license at http://www.gnu.org. --> <!-- --> <!-- ====================================================================== --> <!-- $Id: build-tests-jdk50.xml,v 1.1 2006/07/10 20:48:49 kkhan Exp $ --> <project default="main" name="JBoss/AOP"> <!-- ================================================================== --> <!-- Setup --> <!-- ================================================================== --> <!-- | Include the common Buildmagic elements. | | This defines several different targets, properties and paths. | It also sets up the basic extention tasks amoung other things. --> &buildmagic; <import file="base-tests.xml"/> <!-- ================================================================== --> <!-- Initialization --> <!-- ================================================================== --> <!-- | Initialize the build system. Must depend on '_buildmagic:init'. | Other targets should depend on 'init' or things will mysteriously fail. --> <target name="init" unless="init.disable" depends="_buildmagic:init"> </target> <!-- ================================================================== --> <!-- Configuration --> <!-- ================================================================== --> <!-- | Configure the build system. | | This target is invoked by the Buildmagic initialization logic and | should contain module specific configuration elements. --> <target name="configure" unless="configure.disable"> <property name="aop.version" value="jboss-aop-1.5.0.GA"/> <property name="aop.title" value="JBoss AOP Framework"/> <!-- =================== --> <!-- Basic Configuration --> <!-- =================== --> <!-- Module name(s) & version --> <property name="module.name" value="aop"/> <property name="module.Name" value="JBoss AOP"/> <property name="module.version" value="1.5.0.GA"/> <!-- ========= --> <!-- Libraries --> <!-- ========= --> &libraries; &modules; <!-- The combined library classpath --> <path id="library.classpath"> <path refid="apache.log4j.classpath"/> <path refid="qdox.classpath"/> <path refid="javassist.classpath"/> <path refid="trove.classpath"/> <path refid="xdoclet.xdoclet.classpath"/> <path refid="apache.ant.classpath"/> <path refid="oswego.concurrent.classpath"/> <path refid="junit.junit.classpath"/> <path refid="jboss.profiler.jvmti.classpath"/> <path refid="jboss.microcontainer.classpath"/> </path> <!-- Defines jrockit.home --> <property file="local.properties"/> <available file="${jrockit.home}/jre/lib/managementapi.jar" property="JROCKIT_AVAILABLE"/> <!-- ======= --> <!-- Modules --> <!-- ======= --> <!-- The combined dependent module classpath --> <path id="dependentmodule.classpath"> <path refid="jboss.common.classpath"/> <path refid="jboss.test.classpath"/> </path> <!-- ===== --> <!-- Tasks --> <!-- ===== --> <!-- Where source files live --> <property name="source.tests.java" value="${module.source}/test"/> <property name="source.etc" value="${module.source}/etc"/> <property name="source.res" value="${module.source}/resources"/> <property name="source.stylesheets" value="../testsuite/src/stylesheets"/> <!-- Where build generated files will go --> <property name="build.reports" value="${module.output}/reports"/> <property name="build.stylesheets" value="${module.output}/stylesheets"/> <property name="build.tests.classes" value="${module.output}/tests.classes"/> <property name="build15.classes" value="${module.output}/classes15"/> <property name="build15.tests.classes" value="${module.output}/tests.classes15"/> <property name="build.lib" value="${module.output}/lib"/> <property name="build.api" value="${module.output}/api"/> <property name="build.etc" value="${module.output}/etc"/> <property name="build.gen-src" value="${module.output}/gen-src"/> <property name="build.gen" value="${module.output}/gen"/> <property name="build.bootclasspath" value="${module.output}/gen-bootclasspath"/> <!-- Install/Release structure --> <property name="install.id" value="${module.name}-${module.version}"/> <property name="release.id" value="${install.id}"/> <property name="install.root" value="${module.output}/${install.id}"/> <!-- The combined thirdparty classpath --> <path id="thirdparty.classpath"> <path refid="library.classpath"/> <path refid="dependentmodule.classpath"/> </path> <!-- classpath and local.classpath must have a value using with a path --> <property name="classpath" value=""/> <property name="local.classpath" value=""/> <!-- The classpath required to build classes. --> <path id="javac.classpath"> <pathelement path="${classpath}"/> <pathelement path="${local.classpath}"/> <path refid="thirdparty.classpath"/> <pathelement path="${build.lib}/jboss-aop-jdk50.jar"/> </path> <path id="javac.jrockit.classpath"> <path refid="javac.classpath"/> <path path="${jrockit.home}/jre/lib/managementapi.jar"/> </path> <path id="test.classpath"> <path refid="thirdparty.classpath"/> <pathelement path="${build.lib}/jboss-aop-jdk50.jar"/> </path> <!-- The classpath required to build javadocs. --> <path id="javadoc.classpath"> <path refid="javac.classpath"/> </path> <!-- Packages to include when generating api documentation --> <property name="javadoc.packages" value="org.jbos.aop.*"/> <!-- Override JUnit defaults --> <property name="junit.timeout" value="240000"/> <!-- 4 minutes --> <property name="junit.batchtest.todir" value="${build.reports}"/> <property name="junit.jvm.options" value="-Ddummy"/> </target> <!-- ================================================================== --> <!-- Compile --> <!-- ================================================================== --> <!-- | Compile everything. | | This target should depend on other compile-* targets for each | different type of compile that needs to be performed, short of | documentation compiles. --> <target name="compile" description="Compile all source files." depends="compile-test-classes"/> <!-- Compile all class files --> <target name="compile-test-classes" depends="init"> <mkdir dir="${build.tests.classes}"/> <javac destdir="${build.tests.classes}" optimize="${javac.optimize}" target="1.5" source="1.5" debug="${javac.debug}" depend="${javac.depend}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" includeAntRuntime="${javac.include.ant.runtime}" includeJavaRuntime="${javac.include.java.runtime}" failonerror="${javac.fail.onerror}"> <src path="${source.tests.java}"/> <classpath refid="test.classpath"/> <include name="**/*.java"/> <exclude name="org/jboss/test/aop/memoryleaks/**/*.java"/> </javac> </target> <!-- ================================================================== --> <!-- Install & Release --> <!-- ================================================================== --> <target name="dist" depends="javadocs, init"> <fail unless="JROCKIT_AVAILABLE"> To build a distribution you must have a version of JRockit available and set the jrockit.home property. </fail> <copy todir="${build.lib}" filtering="no"> <fileset dir="${jboss.common.lib}"> <include name="jboss-common.jar"/> </fileset> </copy> <copy todir="${build.lib}" filtering="no"> <fileset dir="${javassist.lib}"> <include name="javassist.jar"/> </fileset> </copy> <copy todir="${build.lib}" filtering="no"> <fileset dir="${trove.lib}"> <include name="trove.jar"/> </fileset> </copy> <copy todir="${build.lib}" filtering="no"> <fileset dir="${oswego.concurrent.lib}"> <include name="concurrent.jar"/> </fileset> </copy> <copy todir="${build.lib}" filtering="no"> <fileset dir="${qdox.qdox.lib}"> <include name="qdox.jar"/> </fileset> </copy> <copy todir="${build.lib}" filtering="no"> <fileset dir="${junit.junit.lib}"> <include name="junit.jar"/> </fileset> </copy> <copy todir="docs" filtering="no"> <fileset dir="output"> <include name="api/**"/> </fileset> </copy> <delete file="jboss-aop-dist.zip"/> <zip zipfile="jboss-aop-dist.zip"> <zipfileset dir="${build.lib}" prefix="${aop.version}"> <include name="*.jar"/> </zipfileset> <zipfileset dir="." prefix="${aop.version}"> <include name="docs/api/**"/> <include name="docs/**/*.html"/> <include name="docs/**/*.jpg"/> <include name="docs/examples/**"/> <exclude name="docs/**/CVS/**"/> <exclude name="docs/**/*.wiki"/> </zipfileset> <zipfileset dir="." prefix="${aop.version}"> <include name="RELEASE_NOTES.txt"/> <include name="src/main/**/*.java"/> <include name="src/resources/test/**/*.xml"/> <exclude name="src/**/CVS/**"/> </zipfileset> <zipfileset file="src/build.xml" prefix="${aop.version}"/> </zip> </target> <target name="install" description="Install the structure for a release." depends="all, _buildmagic:install:default"/> <target name="release" depends="install"/> <target name="release-zip" description="Builds a ZIP distribution." depends="release, _buildmagic:release:zip"/> <target name="release-tar" description="Builds a TAR distribution." depends="release, _buildmagic:release:tar"/> <target name="release-tgz" description="Builds a TAR-GZ distribution." depends="release, _buildmagic:release:tgz"/> <target name="release-all" description="Builds a distribution for each archive type." depends="release-zip, release-tgz"/> <!-- ================================================================== --> <!-- Cleaning --> <!-- ================================================================== --> <!-- Clean up all build output --> <target name="clean" description="Cleans up most generated files." depends="init"> <delete dir="${build.tests.classes}"/> </target> <target name="clean-tests" depends="init"> <delete dir="${build.tests.classes}"/> </target> <!-- Clean up all generated files --> <target name="clobber" description="Cleans up all generated files." depends="_buildmagic:clobber, clean"> </target> <!-- ===============================================================p=== --> <!-- Misc. --> <!-- ================================================================== --> <target name="main" depends="most" description="Executes the default target (most)."/> <target name="all" depends="compile" description="Builds everything."/> <target name="most" depends="compile" description="Builds almost everything."/> <target name="help" description="Show this help message." depends="_buildmagic:help:standard"/> <!-- ==================================================================================== --> <!-- JDK 1.4 TESTS --> <!-- ==================================================================================== --> <target name="tests" depends="main"> <delete dir="${build.tests.classes}"/> <antcall target="javaagent-genadvisor-tests" inheritRefs="true"/> <antcall target="javaagent-tests" inheritRefs="true"/> <antcall target="system-classloader-test" inheritRefs="true"/> <antcall target="not-woven-tests" inheritRefs="true"/> <delete dir="${build.tests.classes}"/> <antcall target="jrockit-loadtime-tests" inheritRefs="true"/> <delete dir="${build.tests.classes}"/> <antcall target="precompiled-tests" inheritRefs="true"/> <delete dir="${build.tests.classes}"/> <antcall target="precompiled-genadvisor-tests" inheritRefs="true"/> <delete dir="${build.tests.classes}"/> <antcall target="non-optimized-precompiled-tests" inheritRefs="true"/> </target> <!-- ==================================================================================== --> <!-- JAVAAGENT TESTS (JDK 5.0) --> <!-- ==================================================================================== --> <target name="javaagent-tests" depends="compile-test-classes"> <!-- Add tests in _base-tests unless they should only be run in this weaving mode --> <antcall target="_base-tests" inheritRefs="true"> <param name="caller" value="javaagent-tests"/> <param name="test-target" value="_run-javaagent-test"/> </antcall> <!-- Tests only applicable for this weaving mode --> <antcall target="_run-javaagent-test" inheritRefs="true"> <param name="test" value="override"/> <param name="caller" value="javaagent-tests"/> <param name="exclude" value="**/GenAdvisorOverrideTestCase.class"/> </antcall> </target> <!-- ==================================================================================== --> <!-- GENERATED ADVISOR JAVAGENT TESTS (JDK 5.0) --> <!-- ==================================================================================== --> <target name="javaagent-genadvisor-tests" depends="compile-test-classes"> <!-- Add tests in _base-tests unless they should only be run in this weaving mode --> <antcall target="_base-tests" inheritRefs="true"> <param name="caller" value="javaagent-genadvisor-tests"/> <param name="test-target" value="_run-javaagent-test"/> </antcall> <!-- Tests only applicable for this weaving mode --> <antcall target="_run-javaagent-test" inheritRefs="true"> <param name="test" value="override"/> <param name="caller" value="javaagent-genadvisor-tests"/> <param name="exclude" value="**/OverrideTestCase.class"/> </antcall> </target> <!-- ==================================================================================== --> <!-- JDK 1.4 BOOTCLASSPATH TEST COMMONS --> <!-- These targets should not be called directly, use bootclasspath-tests or --> <!-- bootclasspath-genadvisor-tests --> <!-- ==================================================================================== --> <target name="loadtime-test" depends="init"> <antcall target="_run-javaagent-test" inheritRefs="true"> <param name="test" value="${test}"/> <param name="caller" value="javaagent-tests"/> </antcall> </target> <target name="_run-javaagent-test"> <!-- Check for jboss-aop.xml override --> <condition property="jboss.aop.path" value="-Djboss.aop.path=${aop.xml}"> <isset property="aop.xml"/> </condition> <condition property="jboss.aop.path" value=""> <isset property="no.xml"/> </condition> <condition property="jboss.aop.path" value="-Djboss.aop.path=${source.res}/test/${test}/jboss-aop.xml"> <not> <isset property="aop.xml"/> </not> </condition> <!-- Get -Djboss.aop.class.path from passed in parameters --> <condition property="jboss.aop.class.path" value="-Djboss.aop.class.path=${build.tests.classes}"> <isset property="use.annotations"/> </condition> <condition property="jboss.aop.class.path" value=""> <not> <isset property="use.annotations"/> </not> </condition> <!-- Set the weaving mode and instrumentor to use--> <condition property="instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor"> <equals arg1="${caller}" arg2="javaagent-tests"/> </condition> <condition property="instrumentor" value="org.jboss.aop.instrument.GeneratedAdvisorInstrumentor"> <equals arg1="${caller}" arg2="javaagent-genadvisor-tests"/> </condition> <echo>Running ${test} with instrumentor ${instrumentor}</echo> <mkdir dir="${build.reports}"/> <junit printsummary="yes" fork="no" haltonfailure="no"> <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar"/> <jvmarg value="${jboss.aop.class.path}"/> <jvmarg value="${jboss.aop.path}"/> <sysproperty key="jboss.aop.instrumentor" value="${instrumentor}"/> <formatter type="plain" extension="-${caller}.txt"/> <classpath refid="test.classpath"/> <formatter type="xml" extension="-${caller}.xml"/> <classpath> <pathelement location="${build.tests.classes}"/> </classpath> <batchtest todir="${build.reports}" haltonerror="false" haltonfailure="false" fork="true"> <fileset dir="${build.tests.classes}"> <include name="org/jboss/test/aop/${test}/**/*TestCase.class"/> <include name="org/jboss/test/aop/${test}/**/*Tester.class"/> <exclude name="${exclude}"/> <!-- These are not test cases, and so they will fail when junit tries to run them. Should really rename all tests to *TestCase --> <exclude name="org/jboss/test/aop/reflection/ReflectionAspectTester.class"/> <exclude name="org/jboss/test/aop/basic/POJOAspectTester.class"/> </fileset> </batchtest> </junit> </target> <!-- ==================================================================================== --> <!-- OPTIMIZED PRECOMPILED TESTS (JDK 1.4) --> <!-- ==================================================================================== --> <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"> <param name="caller" value="precompiled-tests"/> </antcall> <!-- Tests only applicable for this weaving mode --> <antcall target="_run-precompiled-test" inheritRefs="true"> <param name="test" value="args"/> <param name="caller" value="precompiled-tests"/> </antcall> <antcall target="_run-precompiled-test" inheritRefs="true"> <param name="test" value="override"/> <param name="caller" value="precompiled-tests"/> <param name="exclude" value="**/GenAdvisorOverrideTestCase.class"/> </antcall> </target> <!-- ==================================================================================== --> <!-- NON OPTIMIZED PRECOMPILED TESTS (JDK 1.4) --> <!-- ==================================================================================== --> <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"> <param name="caller" value="non-optimized-precompiled-tests"/> </antcall> <!-- Tests only applicable for this weaving mode --> <antcall target="_run-precompiled-test" inheritRefs="true"> <param name="test" value="override"/> <param name="caller" value="non-optimized-precompiled-tests"/> <param name="exclude" value="**/GenAdvisorOverrideTestCase.class"/> </antcall> </target> <!-- ==================================================================================== --> <!-- JDK 1.5 GENERATED ADVISOR PRECOMPILED TESTS --> <!-- ==================================================================================== --> <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"> <param name="caller" value="precompiled-genadvisor-tests"/> </antcall> <!-- Tests only applicable for this weaving mode --> <antcall target="_run-precompiled-test" inheritRefs="true"> <param name="test" value="args"/> <param name="caller" value="precompiled-genadvisor-tests"/> </antcall> <antcall target="_run-precompiled-test" inheritRefs="true"> <param name="test" value="beforeafter"/> <param name="caller" value="precompiled-genadvisor-tests"/> </antcall> <antcall target="_run-precompiled-test" inheritRefs="true"> <param name="test" value="dynamicgenadvisor"/> <param name="caller" value="precompiled-genadvisor-tests"/> </antcall> <antcall target="_run-precompiled-test" inheritRefs="true"> <param name="test" value="override"/> <param name="caller" value="precompiled-genadvisor-tests"/> <param name="exclude" value="**/OverrideTestCase.class"/> </antcall> </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"/> </antcall> </target> <target name="precompiled-genadvisor-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="args"/> <param name="caller" value="precompiled-genadvisor-tests"/> </antcall> </target> <target name="_run-precompiled-test"> <!-- Check for jboss-aop.xml override for compiler --> <condition property="aoppath" value="${aop.xml}"> <isset property="aop.xml"/> </condition> <condition property="aoppath" value=""> <isset property="no.xml"/> </condition> <condition property="aoppath" value="${source.res}/test/${test}/jboss-aop.xml"> <not> <isset property="aop.xml"/> </not> </condition> <!-- Set the weaving mode and instrumentor to use--> <condition property="optimized" value="true"> <or> <equals arg1="${caller}" arg2="precompiled-tests"/> <equals arg1="${caller}" arg2="precompiled-genadvisor-tests"/> </or> </condition> <condition property="optimized" value="false"> <equals arg1="${caller}" arg2="non-optimized-precompiled-tests"/> </condition> <condition property="instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor"> <not> <equals arg1="${caller}" arg2="precompiled-genadvisor-tests"/> </not> </condition> <condition property="instrumentor" value="org.jboss.aop.instrument.GeneratedAdvisorInstrumentor"> <equals arg1="${caller}" arg2="precompiled-genadvisor-tests"/> </condition> <echo>Compiling ${test} with optimized=${optimized} and instrumentor ${instrumentor}</echo> <!-- aopc --> <aopc optimized="${optimized}" compilerclasspathref="aop.task.classpath"> <classpath refid="aop.task.classpath"/> <classpath path="${build.tests.classes}"/> <aoppath path="${aoppath}"/> <sysproperty key="jboss.aop.instrumentor" value="${instrumentor}"/> <src path="${build.tests.classes}"/> <include name="org/jboss/test/aop/${test}/**"/> <exclude name="${exclude}"/> <aopclasspath path="${build.tests.classes}"/> </aopc> <!-- Get -Djboss.aop.path from passed in parameters --> <condition property="jboss.aop.path" value="-Djboss.aop.path=${aop.xml}"> <isset property="aop.xml"/> </condition> <condition property="jboss.aop.path" value=""> <isset property="no.xml"/> </condition> <condition property="jboss.aop.path" value="-Djboss.aop.path=${source.res}/test/${test}/jboss-aop.xml"> <not> <isset property="aop.xml"/> </not> </condition> <!-- Get -Djboss.aop.class.path from passed in parameters --> <condition property="jboss.aop.class.path" value="-Djboss.aop.class.path=${build.tests.classes}"> <isset property="use.annotations"/> </condition> <condition property="jboss.aop.class.path" value=""> <not> <isset property="use.annotations"/> </not> </condition> <!-- determine output directory from weaving mode --> <mkdir dir="${build.reports}"/> <junit printsummary="yes" fork="no" haltonfailure="no"> <jvmarg value="${jboss.aop.path}"/> <jvmarg value="${jboss.aop.class.path}"/> <formatter type="plain" extension="-${caller}.txt"/> <formatter type="xml" extension="-${caller}.xml"/> <classpath> <path refid="test.classpath"/> <pathelement location="${build.tests.classes}"/> <pathelement location="docs"/> </classpath> <batchtest todir="${build.reports}" haltonerror="false" haltonfailure="false" fork="true"> <fileset dir="${build.tests.classes}"> <include name="org/jboss/test/aop/${test}/**/*TestCase.class"/> <include name="org/jboss/test/aop/${test}/**/*Tester.class"/> <exclude name="${exclude}"/> <!-- These are not test cases, and so they will fail when junit tries to run them. Should really rename all tests to *TestCase --> <exclude name="org/jboss/test/aop/reflection/ReflectionAspectTester.class"/> <exclude name="org/jboss/test/aop/basic/POJOAspectTester.class"/> </fileset> </batchtest> </junit> </target> <!-- ==================================================================================== --> <!-- NON-WOVEN TESTS --> <!-- ==================================================================================== --> <target name="not-woven-tests" depends="compile-test-classes"> <mkdir dir="${build.reports}"/> <taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC" classpathref="jboss.aop.classpath"/> <annotationc compilerclasspathref="aop.task.classpath" bytecode="true"> <classpath refid="aop.task.classpath"/> <classpath path="${build.tests.classes}"/> <src path="${source.tests.java}"/> <include name="org/jboss/test/aop/annotationc/*.java"/> </annotationc> <echo>org/jboss/test/aop/methodhashing/MethodHashingTestCase will fail until the microcontainer has been updated in the repository</echo> <junit printsummary="yes" fork="no" haltonfailure="no" > <classpath> <path refid="test.classpath"/> <pathelement location="${build.tests.classes}"/> <pathelement location="docs"/> </classpath> <formatter type="plain"/> <formatter type="xml"/> <batchtest todir="${build.reports}" haltonerror="false" haltonfailure="false" fork="true"> <fileset dir="${build.tests.classes}"> <include name="org/jboss/test/aop/proxy/ProxyTestCase.class"/> <include name="org/jboss/test/aop/methodhashing/MethodHashingTestCase.class"/> <include name="org/jboss/test/aop/annotationc/AnnotationTester.class"/> </fileset> </batchtest> </junit> </target> <!-- ==================================================================================== --> <!-- JDK 5 TESTS --> <!-- ==================================================================================== --> <target name="jdk15-tests"> <delete dir="${build.tests.classes}/org/jboss/test"/> <antcall target="jdk15-loadtime-tests" inheritRefs="true"/> <delete dir="${build.tests.classes}/org/jboss/test"/> <antcall target="jdk15-precompiled-tests" inheritRefs="true"/> </target> <target name="jdk15-loadtime-tests" depends="compile"> <property name="report.dir" value="${build.reports}"/> <mkdir dir="${report.dir}"/> <!-- <junit printsummary="yes" fork="yes" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/jdk15/dynamic/prepareAll/jboss-aop.xml"/> <sysproperty key="scenario.jar" value="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario.jar"/> <sysproperty key="java5Agent" value="true"/> <sysproperty key="jboss.aop.instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor"/> <sysproperty key="jboss.aop.prune" value="false"/> <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar"/> <classpath> <path refid="test15.classpath"/> <pathelement location="${build.tests.classes}"/> <pathelement location="docs"/> </classpath> <formatter usefile="true" type="plain" extension="-jdk15-loadtime-tests.txt"/> <formatter usefile="true" type="xml" extension="-jdk15-loadtime-tests.xml"/> <test todir="${report.dir}" name="org.jboss.test.aop.jdk15.dynamic.prepareAll.HotSwapDisabledTester" /> </junit> <junit printsummary="yes" fork="yes" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/jdk15/dynamic/prepareConstructor/jboss-aop.xml"/> <sysproperty key="scenario.jar" value="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario.jar"/> <sysproperty key="java5Agent" value="true"/> <sysproperty key="jboss.aop.instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor"/> <sysproperty key="jboss.aop.prune" value="false"/> <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar"/> <classpath> <path refid="test15.classpath"/> <pathelement location="${build.tests.classes}"/> <pathelement location="docs"/> </classpath> <formatter usefile="true" type="plain" extension="-jdk15-loadtime-tests.txt"/> <formatter usefile="true" type="xml" extension="-jdk15-loadtime-tests.xml"/> <test todir="${report.dir}" name="org.jboss.test.aop.jdk15.dynamic.prepareConstructor.HotSwapDisabledTester" /> </junit> <junit printsummary="yes" fork="yes" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/jdk15/dynamic/prepareMethod/jboss-aop.xml"/> <sysproperty key="scenario.jar" value="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario.jar"/> <sysproperty key="java5Agent" value="true"/> <sysproperty key="jboss.aop.prune" value="false"/> <sysproperty key="jboss.aop.instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor"/> <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar"/> <classpath> <path refid="test15.classpath"/> <pathelement location="${build.tests.classes}"/> <pathelement location="docs"/> </classpath> <formatter usefile="true" type="plain" extension="-jdk15-loadtime-tests.txt"/> <formatter usefile="true" type="xml" extension="-jdk15-loadtime-tests.xml"/> <test todir="${report.dir}" name="org.jboss.test.aop.jdk15.dynamic.prepareMethod.HotSwapDisabledTester" /> </junit> <junit printsummary="yes" fork="yes" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/jdk15/dynamic/prepareField/jboss-aop.xml"/> <sysproperty key="scenario.jar" value="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario.jar"/> <sysproperty key="java5Agent" value="true"/> <sysproperty key="jboss.aop.instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor"/> <sysproperty key="jboss.aop.prune" value="false"/> <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar"/> <classpath> <path refid="test15.classpath"/> <pathelement location="${build.tests.classes}"/> <pathelement location="docs"/> </classpath> <formatter usefile="true" type="plain" extension="-jdk15-loadtime-tests.txt"/> <formatter usefile="true" type="xml" extension="-jdk15-loadtime-tests.xml"/> <test todir="${report.dir}" name="org.jboss.test.aop.jdk15.dynamic.prepareField.HotSwapDisabledTester" /> </junit> <junit printsummary="yes" fork="yes" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/jdk15/dynamic/prepareFieldGet/jboss-aop.xml"/> <sysproperty key="scenario.jar" value="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario.jar"/> <sysproperty key="java5Agent" value="true"/> <sysproperty key="jboss.aop.instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor"/> <sysproperty key="jboss.aop.prune" value="false"/> <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar"/> <classpath> <path refid="test15.classpath"/> <pathelement location="${build.tests.classes}"/> <pathelement location="docs"/> </classpath> <formatter usefile="true" type="plain" extension="-jdk15-loadtime-tests.txt"/> <formatter usefile="true" type="xml" extension="-jdk15-loadtime-tests.xml"/> <test todir="${report.dir}" name="org.jboss.test.aop.jdk15.dynamic.prepareFieldGet.HotSwapDisabledTester" /> </junit> <junit printsummary="yes" fork="yes" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/jdk15/dynamic/prepareFieldSet/jboss-aop.xml"/> <sysproperty key="scenario.jar" value="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario.jar"/> <sysproperty ... [truncated message content] |