From: Bill B. <bi...@jb...> - 2005-06-03 14:46:32
|
User: bill Date: 05/06/03 10:46:06 Modified: jboss-aop build.xml Log: remove microcontainer dependencies from AOP module Revision Changes Path 1.75 +1 -2 jboss-aop/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jboss-aop/build.xml,v retrieving revision 1.74 retrieving revision 1.75 diff -u -b -r1.74 -r1.75 --- build.xml 21 Apr 2005 13:30:22 -0000 1.74 +++ build.xml 3 Jun 2005 14:46:06 -0000 1.75 @@ -14,7 +14,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.74 2005/04/21 13:30:22 bill Exp $ --> +<!-- $Id: build.xml,v 1.75 2005/06/03 14:46:06 bill Exp $ --> <project default="main" name="JBoss/AOP"> @@ -94,7 +94,6 @@ <!-- The combined dependent module classpath --> <path id="dependentmodule.classpath"> <path refid="jboss.common.classpath"/> - <path refid="jboss.container.classpath"/> </path> <!-- ===== --> |
From: Bill B. <bi...@jb...> - 2005-06-08 18:34:35
|
User: bill Date: 05/06/08 14:34:02 Modified: jboss-aop build.xml Log: Speed up aopc and load-time transformations. Fix bug JBAS139 Revision Changes Path 1.76 +277 -2 jboss-aop/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jboss-aop/build.xml,v retrieving revision 1.75 retrieving revision 1.76 diff -u -b -r1.75 -r1.76 --- build.xml 3 Jun 2005 14:46:06 -0000 1.75 +++ build.xml 8 Jun 2005 18:34:02 -0000 1.76 @@ -14,7 +14,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.75 2005/06/03 14:46:06 bill Exp $ --> +<!-- $Id: build.xml,v 1.76 2005/06/08 18:34:02 bill Exp $ --> <project default="main" name="JBoss/AOP"> @@ -80,7 +80,6 @@ <path refid="qdox.classpath"/> <path refid="javassist.classpath"/> <path refid="trove.classpath"/> - <path refid="jboss.jmx.classpath"/> <path refid="xdoclet.xdoclet.classpath"/> <path refid="apache.ant.classpath"/> <path refid="oswego.concurrent.classpath"/> @@ -433,6 +432,10 @@ <delete dir="${build.tests.classes}"/> </target> + <target name="clean-tests"> + <delete dir="${build.tests.classes}"/> + </target> + <!-- Clean up all generated files --> <target name="clobber" description="Cleans up all generated files." @@ -481,6 +484,8 @@ <target name="tests" depends="main"> <delete dir="${build.tests.classes}"/> <antcall target="precompiled-tests" inheritRefs="true"/> + <delete dir="${build.tests.classes}"/> + <antcall target="non-optimized-precompiled-tests" inheritRefs="true"/> <delete dir="${build.tests.classes}/org/jboss/test"/> <antcall target="bootclasspath-tests" inheritRefs="true"/> </target> @@ -826,6 +831,276 @@ </junit> </target> + <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> + + <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"/> + <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"/> + </annotationc> + + + <aopc optimized="false" compilerclasspathref="aop.task.classpath"> + <classpath refid="aop.task.classpath"/> + <classpath path="${build.tests.classes}"/> + <src path="${build.tests.classes}"/> + <include name="org/jboss/test/aop/basic/**"/> + <aoppath path="${source.res}/test/basic/jboss-aop.xml"/> + </aopc> + + <aopc optimized="false" compilerclasspathref="aop.task.classpath"> + <classpath refid="aop.task.classpath"/> + <classpath path="${build.tests.classes}"/> + <src path="${build.tests.classes}"/> + <include name="org/jboss/test/aop/args/**"/> + <aoppath path="${source.res}/test/args/jboss-aop.xml"/> + </aopc> + + <aopc optimized="false" compilerclasspathref="aop.task.classpath"> + <classpath refid="aop.task.classpath"/> + <classpath path="${build.tests.classes}"/> + <src path="${build.tests.classes}"/> + <include name="org/jboss/test/aop/annotatedparams/**"/> + <aoppath path="${source.res}/test/annotatedparams/jboss-aop.xml"/> + </aopc> + + <aopc optimized="false" compilerclasspathref="aop.task.classpath"> + <classpath refid="aop.task.classpath"/> + <classpath path="${build.tests.classes}"/> + <src path="${build.tests.classes}"/> + <include name="org/jboss/test/aop/callerscope/**"/> + <aoppath path="${source.res}/test/callerscope/jboss-aop.xml"/> + </aopc> + + <aopc optimized="false" compilerclasspathref="aop.task.classpath"> + <classpath refid="aop.task.classpath"/> + <classpath path="${build.tests.classes}"/> + <src path="${build.tests.classes}"/> + <include name="org/jboss/test/aop/reflection/**"/> + <aoppath path="${source.res}/test/reflection/jboss-aop.xml"/> + </aopc> + + <aopc optimized="false" compilerclasspathref="aop.task.classpath"> + <classpath refid="aop.task.classpath"/> + <classpath path="${build.tests.classes}"/> + <src path="${build.tests.classes}"/> + <include name="org/jboss/test/aop/introduction/**"/> + <aoppath path="${source.res}/test/introduction/introduction-aop.xml"/> + </aopc> + + <aopc optimized="false" compilerclasspathref="aop.task.classpath"> + <classpath refid="aop.task.classpath"/> + <classpath path="${build.tests.classes}"/> + <src path="${build.tests.classes}"/> + <include name="org/jboss/test/aop/regression/**"/> + <aoppath path="${source.res}/test/regression/jboss-aop.xml"/> + </aopc> + + <aopc optimized="false" compilerclasspathref="aop.task.classpath"> + <classpath refid="aop.task.classpath"/> + <classpath path="${build.tests.classes}"/> + <src path="${build.tests.classes}"/> + <include name="org/jboss/test/aop/perjoinpoint/**"/> + <aoppath path="${source.res}/test/perjoinpoint/jboss-aop.xml"/> + </aopc> + + <aopc optimized="false" compilerclasspathref="aop.task.classpath"> + <classpath refid="aop.task.classpath"/> + <classpath path="${build.tests.classes}"/> + <src path="${build.tests.classes}"/> + <include name="org/jboss/test/aop/beanstyleconfig/**"/> + <aoppath path="${source.res}/test/beanstyleconfig/jboss-aop.xml"/> + </aopc> + <aopc optimized="false" compilerclasspathref="aop.task.classpath"> + <classpath refid="aop.task.classpath"/> + <classpath path="${build.tests.classes}"/> + <src path="${build.tests.classes}"/> + <include name="org/jboss/test/aop/annotated/**"/> + <exclude name="org/jboss/test/aop/annotated/declare/**"/> + <aopclasspath path="${build.tests.classes}"/> + </aopc> + + <aopc optimized="false" compilerclasspathref="aop.task.classpath"> + <classpath refid="aop.task.classpath"/> + <classpath path="${build.tests.classes}"/> + <src path="${build.tests.classes}"/> + <include name="org/jboss/test/aop/precedence/**"/> + <aoppath path="${source.res}/test/precedence/jboss-aop.xml"/> + </aopc> + + <aopc optimized="false" compilerclasspathref="aop.task.classpath"> + <classpath refid="aop.task.classpath"/> + <classpath path="${build.tests.classes}"/> + <src path="${build.tests.classes}"/> + <include name="org/jboss/test/aop/dotinpointcutname/**"/> + <aoppath path="${source.res}/test/dotinpointcutname/jboss-aop.xml"/> + </aopc> + + <aopc optimized="false" compilerclasspathref="aop.task.classpath"> + <classpath refid="aop.task.classpath"/> + <classpath path="${build.tests.classes}"/> + <src path="${build.tests.classes}"/> + <include name="org/jboss/test/aop/instanceofannotated/**"/> + <aoppath path="${source.res}/test/instanceofannotated/jboss-aop.xml"/> + </aopc> + + <junit printsummary="yes" fork="no" haltonfailure="yes"> + <sysproperty key="jboss.aop.path" value="${source.res}/test/regression/jboss-aop.xml"/> + <classpath> + <path refid="test.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter type="plain"/> + <test fork="yes" name="org.jboss.test.aop.regression.annotatedIntroduction.AOPTester"/> + <test fork="yes" name="org.jboss.test.aop.regression.statictest.AOPTester"/> + <test fork="yes" name="org.jboss.test.aop.regression.inheritedmcall.AOPTester"/> + </junit> + <junit printsummary="yes" fork="no" haltonfailure="no"> + <sysproperty key="jboss.aop.path" value="${source.res}/test/args/jboss-aop.xml"/> + <classpath> + <path refid="test.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter type="plain"/> + <test fork="yes" name="org.jboss.test.aop.args.ArgsTestCase"/> + </junit> + <junit printsummary="yes" fork="no" haltonfailure="yes"> + <classpath> + <path refid="test.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter type="plain"/> + <test fork="yes" name="org.jboss.test.aop.annotationc.AnnotationTester"/> + </junit> + <junit printsummary="yes" fork="no" haltonfailure="yes"> + <sysproperty key="jboss.aop.path" value="${source.res}/test/annotatedparams/jboss-aop.xml"/> + <classpath> + <path refid="test.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter type="plain"/> + <test fork="yes" name="org.jboss.test.aop.annotatedparams.AnnotatedParamsTester"/> + </junit> + <junit printsummary="yes" fork="no" haltonfailure="no"> + <sysproperty key="jboss.aop.path" value="${source.res}/test/callerscope/jboss-aop.xml"/> + <classpath> + <path refid="test.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter type="plain"/> + <test fork="yes" name="org.jboss.test.aop.callerscope.CallerScopeTestCase"/> + </junit> + <junit printsummary="yes" fork="no" haltonfailure="no"> + <sysproperty key="jboss.aop.path" value="${source.res}/test/dotinpointcutname/jboss-aop.xml"/> + <classpath> + <path refid="test.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter type="plain"/> + <test fork="yes" name="org.jboss.test.aop.dotinpointcutname.DotInPointcutNameTestCase"/> + </junit> + <junit printsummary="yes" fork="no" haltonfailure="yes"> + <sysproperty key="jboss.aop.path" value="${source.res}/test/instanceofannotated/jboss-aop.xml"/> + <classpath> + <path refid="test.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter type="plain"/> + <test fork="yes" name="org.jboss.test.aop.instanceofannotated.InstanceOfAnnotatedTester"/> + </junit> + <junit printsummary="yes" fork="no" haltonfailure="yes"> + <sysproperty key="jboss.aop.class.path" value="${build.tests.classes}"/> + <classpath> + <path refid="test.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter type="plain"/> + <test fork="yes" name="org.jboss.test.aop.annotated.AnnotatedTestCase"/> + </junit> + <junit printsummary="yes" fork="no" haltonfailure="yes"> + <sysproperty key="jboss.aop.path" value="${source.res}/test/basic/jboss-aop.xml"/> + <classpath> + <path refid="test.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter type="plain"/> + <test fork="yes" name="org.jboss.test.aop.basic.AOPTester"/> + </junit> + <junit printsummary="yes" fork="no" haltonfailure="yes"> + <sysproperty key="jboss.aop.path" value="${source.res}/test/introduction/introduction-aop.xml"/> + <classpath> + <path refid="test.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter type="plain"/> + <test fork="yes" name="org.jboss.test.aop.introduction.IntroductionTester"/> + </junit> + <junit printsummary="yes" fork="no" haltonfailure="yes"> + <sysproperty key="jboss.aop.path" value="${source.res}/test/precedence/jboss-aop.xml"/> + <classpath> + <path refid="test.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter type="plain"/> + <test fork="yes" name="org.jboss.test.aop.precedence.PrecedenceTester"/> + </junit> + <junit printsummary="yes" fork="no" haltonfailure="yes"> + <sysproperty key="jboss.aop.path" value="${source.res}/test/reflection/jboss-aop.xml"/> + <classpath> + <path refid="test.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter type="plain"/> + <test fork="yes" name="org.jboss.test.aop.reflection.ReflectionTester"/> + </junit> + <junit printsummary="yes" fork="no" haltonfailure="yes"> + <sysproperty key="jboss.aop.path" value="${source.res}/test/perjoinpoint/jboss-aop.xml"/> + <classpath> + <path refid="test.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter type="plain"/> + <test fork="yes" name="org.jboss.test.aop.perjoinpoint.PerJoinpointTester"/> + </junit> + + <junit printsummary="yes" fork="no" haltonfailure="yes"> + <sysproperty key="jboss.aop.path" value="${source.res}/test/beanstyleconfig/jboss-aop.xml"/> + <classpath> + <path refid="test.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter type="plain"/> + <test fork="yes" name="org.jboss.test.aop.beanstyleconfig.ConfigTester"/> + </junit> + </target> + + <target name="proxy-test" depends="compile-test-classes"> <junit printsummary="yes" fork="no" haltonfailure="yes"> <classpath> |
From: Flavia R. <fl...@im...> - 2005-06-09 05:11:49
|
User: flaviarnn Date: 05/06/09 01:10:25 Modified: jboss-aop build.xml Log: Added dynamic aop junit tests. Revision Changes Path 1.77 +219 -2 jboss-aop/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jboss-aop/build.xml,v retrieving revision 1.76 retrieving revision 1.77 diff -u -b -r1.76 -r1.77 --- build.xml 8 Jun 2005 18:34:02 -0000 1.76 +++ build.xml 9 Jun 2005 05:10:25 -0000 1.77 @@ -14,7 +14,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.76 2005/06/08 18:34:02 bill Exp $ --> +<!-- $Id: build.xml,v 1.77 2005/06/09 05:10:25 flaviarnn Exp $ --> <project default="main" name="JBoss/AOP"> @@ -1162,6 +1162,78 @@ <classpath refid="test15.classpath"/> <classpath path="${build.tests.classes}"/> </java> + <junit printsummary="yes" fork="yes" haltonfailure="no"> + <sysproperty key="jboss.aop.path" value="${source.res}/test/jdk15/dynamic/prepareAll/jboss-aop.xml"/> + <sysproperty key="jboss.aop.class.path" value="${build.tests.classes}"/> + <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"/> + <test name="org.jboss.test.aop.jdk15.dynamic.prepareAll.PrecompiledClassesTester" /> + </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="jboss.aop.class.path" value="${build.tests.classes}"/> + <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"/> + <test name="org.jboss.test.aop.jdk15.dynamic.prepareConstructor.PrecompiledClassesTester" /> + </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="jboss.aop.class.path" value="${build.tests.classes}"/> + <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"/> + <test name="org.jboss.test.aop.jdk15.dynamic.prepareField.PrecompiledClassesTester" /> + </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="jboss.aop.class.path" value="${build.tests.classes}"/> + <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"/> + <test name="org.jboss.test.aop.jdk15.dynamic.prepareFieldGet.PrecompiledClassesTester" /> + </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="jboss.aop.class.path" value="${build.tests.classes}"/> + <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"/> + <test name="org.jboss.test.aop.jdk15.dynamic.prepareFieldSet.PrecompiledClassesTester" /> + </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="jboss.aop.class.path" value="${build.tests.classes}"/> + <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"/> + <test name="org.jboss.test.aop.jdk15.dynamic.prepareMethod.PrecompiledClassesTester" /> + </junit> </target> <target name="jdk15-precompiled-tests" depends="compile-jdk15-tests"> @@ -1177,6 +1249,7 @@ <classpath path="${build.tests.classes}"/> <src path="${build.tests.classes}"/> <include name="org/jboss/test/aop/jdk15/**"/> + <exclude name="org/jboss/test/aop/jdk15/dynamic/**"/> <aoppath path="${source.res}/test/jdk15/jboss-aop.xml"/> <aopclasspath path="${build.tests.classes}"/> </aopc> @@ -1189,7 +1262,85 @@ <aoppath path="${source.res}/test/basic/jboss-aop.xml"/> </aopc> - <junit printsummary="yes" fork="yes" haltonfailure="yes"> + <copy todir="${build.tests.classes}/dynamic-prepareAll"> + <fileset dir="${build.tests.classes}"> + <include name="org/jboss/test/aop/jdk15/dynamic/prepareAll/**"/> + <include name="org/jboss/test/aop/jdk15/dynamic/common/**"/> + </fileset> + </copy> + <aopc verbose="false" compilerclasspathref="aop.task.classpath"> + <classpath path="${build.tests.classes}/dynamic-prepareAll"/> + <src path="${build.tests.classes}/dynamic-prepareAll"/> + <include name="org/jboss/test/aop/jdk15/dynamic/prepareAll/**"/> + <include name="org/jboss/test/aop/jdk15/dynamic/common/**"/> + <aoppath path="${source.res}/test/jdk15/dynamic/prepareAll/jboss-aop.xml"/> + </aopc> + <copy todir="${build.tests.classes}/dynamic-prepareConstructor"> + <fileset dir="${build.tests.classes}"> + <include name="org/jboss/test/aop/jdk15/dynamic/prepareConstructor/**"/> + <include name="org/jboss/test/aop/jdk15/dynamic/common/**"/> + </fileset> + </copy> + <aopc verbose="false" compilerclasspathref="aop.task.classpath"> + <classpath path="${build.tests.classes}/dynamic-prepareConstructor"/> + <src path="${build.tests.classes}/dynamic-prepareConstructor"/> + <include name="org/jboss/test/aop/jdk15/dynamic/prepareConstructor/**"/> + <include name="org/jboss/test/aop/jdk15/dynamic/common/**"/> + <aoppath path="${source.res}/test/jdk15/dynamic/prepareConstructor/jboss-aop.xml"/> + </aopc> + <copy todir="${build.tests.classes}/dynamic-prepareField"> + <fileset dir="${build.tests.classes}"> + <include name="org/jboss/test/aop/jdk15/dynamic/prepareField/**"/> + <include name="org/jboss/test/aop/jdk15/dynamic/common/**"/> + </fileset> + </copy> + <aopc verbose="false" compilerclasspathref="aop.task.classpath"> + <classpath path="${build.tests.classes}/dynamic-prepareField"/> + <src path="${build.tests.classes}/dynamic-prepareField"/> + <include name="org/jboss/test/aop/jdk15/dynamic/prepareField/**"/> + <include name="org/jboss/test/aop/jdk15/dynamic/common/**"/> + <aoppath path="${source.res}/test/jdk15/dynamic/prepareField/jboss-aop.xml"/> + </aopc> + <copy todir="${build.tests.classes}/dynamic-prepareFieldGet"> + <fileset dir="${build.tests.classes}"> + <include name="org/jboss/test/aop/jdk15/dynamic/prepareFieldGet/**"/> + <include name="org/jboss/test/aop/jdk15/dynamic/common/**"/> + </fileset> + </copy> + <aopc verbose="false" compilerclasspathref="aop.task.classpath"> + <classpath path="${build.tests.classes}/dynamic-prepareFieldGet"/> + <src path="${build.tests.classes}/dynamic-prepareFieldGet"/> + <include name="org/jboss/test/aop/jdk15/dynamic/prepareFieldGet/**"/> + <include name="org/jboss/test/aop/jdk15/dynamic/common/**"/> + <aoppath path="${source.res}/test/jdk15/dynamic/prepareFieldGet/jboss-aop.xml"/> + </aopc> + <copy todir="${build.tests.classes}/dynamic-prepareFieldSet"> + <fileset dir="${build.tests.classes}"> + <include name="org/jboss/test/aop/jdk15/dynamic/prepareFieldSet/**"/> + <include name="org/jboss/test/aop/jdk15/dynamic/common/**"/> + </fileset> + </copy> + <aopc verbose="false" compilerclasspathref="aop.task.classpath"> + <classpath path="${build.tests.classes}/dynamic-prepareFieldSet"/> + <src path="${build.tests.classes}/dynamic-prepareFieldSet"/> + <include name="org/jboss/test/aop/jdk15/dynamic/prepareFieldSet/**"/> + <include name="org/jboss/test/aop/jdk15/dynamic/common/**"/> + <aoppath path="${source.res}/test/jdk15/dynamic/prepareFieldSet/jboss-aop.xml"/> + </aopc> + <copy todir="${build.tests.classes}/dynamic-prepareMethod"> + <fileset dir="${build.tests.classes}"> + <include name="org/jboss/test/aop/jdk15/dynamic/prepareMethod/**"/> + <include name="org/jboss/test/aop/jdk15/dynamic/common/**"/> + </fileset> + </copy> + <aopc verbose="false" compilerclasspathref="aop.task.classpath"> + <classpath path="${build.tests.classes}/dynamic-prepareMethod"/> + <src path="${build.tests.classes}/dynamic-prepareMethod"/> + <include name="org/jboss/test/aop/jdk15/dynamic/prepareMethod/**"/> + <include name="org/jboss/test/aop/jdk15/dynamic/common/**"/> + <aoppath path="${source.res}/test/jdk15/dynamic/prepareMethod/jboss-aop.xml"/> + </aopc> + <junit printsummary="yes" fork="yes" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/jdk15/jboss-aop.xml"/> <sysproperty key="jboss.aop.class.path" value="${build.tests.classes}"/> <classpath> @@ -1212,6 +1363,72 @@ <formatter type="plain"/> <test name="org.jboss.test.aop.basic.AOPTester"/> </junit> + <junit printsummary="yes" fork="yes" haltonfailure="yes"> + <sysproperty key="jboss.aop.path" value="${source.res}/test/jdk15/dynamic/prepareAll/jboss-aop.xml"/> + <sysproperty key="jboss.aop.class.path" value="${build.tests.classes}/dynamic-prepareAll"/> + <classpath> + <path refid="test15.classpath"/> + <pathelement location="${build.tests.classes}/dynamic-prepareAll"/> + <pathelement location="docs"/> + </classpath> + <formatter usefile="true" type="plain"/> + <test name="org.jboss.test.aop.jdk15.dynamic.prepareAll.PrecompiledClassesTester" /> + </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="jboss.aop.class.path" value="${build.tests.classes}/dynamic-prepareConstructor"/> + <classpath> + <path refid="test15.classpath"/> + <pathelement location="${build.tests.classes}/dynamic-prepareConstructor"/> + <pathelement location="docs"/> + </classpath> + <formatter usefile="true" type="plain"/> + <test name="org.jboss.test.aop.jdk15.dynamic.prepareConstructor.PrecompiledClassesTester" /> + </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="jboss.aop.class.path" value="${build.tests.classes}/dynamic-prepareField"/> + <classpath> + <path refid="test15.classpath"/> + <pathelement location="${build.tests.classes}/dynamic-prepareField"/> + <pathelement location="docs"/> + </classpath> + <formatter usefile="true" type="plain"/> + <test name="org.jboss.test.aop.jdk15.dynamic.prepareField.PrecompiledClassesTester" /> + </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="jboss.aop.class.path" value="${build.tests.classes}/dynamic-prepareFieldGet"/> + <classpath> + <path refid="test15.classpath"/> + <pathelement location="${build.tests.classes}/dynamic-prepareFieldGet"/> + <pathelement location="docs"/> + </classpath> + <formatter usefile="true" type="plain"/> + <test name="org.jboss.test.aop.jdk15.dynamic.prepareFieldGet.PrecompiledClassesTester" /> + </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="jboss.aop.class.path" value="${build.tests.classes}/dynamic-prepareFieldSet"/> + <classpath> + <path refid="test15.classpath"/> + <pathelement location="${build.tests.classes}/dynamic-prepareFieldSet"/> + <pathelement location="docs"/> + </classpath> + <formatter usefile="true" type="plain"/> + <test name="org.jboss.test.aop.jdk15.dynamic.prepareFieldSet.PrecompiledClassesTester" /> + </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="jboss.aop.class.path" value="${build.tests.classes}/dynamic-prepareMethod"/> + <classpath> + <path refid="test15.classpath"/> + <pathelement location="${build.tests.classes}/dynamic-prepareMethod"/> + <pathelement location="docs"/> + </classpath> + <formatter usefile="true" type="plain"/> + <test name="org.jboss.test.aop.jdk15.dynamic.prepareMethod.PrecompiledClassesTester" /> + </junit> </target> |
From: Bill B. <bi...@jb...> - 2005-06-10 15:33:15
|
User: bill Date: 05/06/10 11:32:45 Modified: jboss-aop build.xml Log: new JDK 1.4 transformation support. Updated docs too. Revision Changes Path 1.78 +9 -2 jboss-aop/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jboss-aop/build.xml,v retrieving revision 1.77 retrieving revision 1.78 diff -u -b -r1.77 -r1.78 --- build.xml 9 Jun 2005 05:10:25 -0000 1.77 +++ build.xml 10 Jun 2005 15:32:45 -0000 1.78 @@ -14,7 +14,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.77 2005/06/09 05:10:25 flaviarnn Exp $ --> +<!-- $Id: build.xml,v 1.78 2005/06/10 15:32:45 bill Exp $ --> <project default="main" name="JBoss/AOP"> @@ -57,7 +57,7 @@ --> <target name="configure" unless="configure.disable"> - <property name="aop.version" value="jboss-aop-1.1.2"/> + <property name="aop.version" value="jboss-aop-1.3"/> <property name="aop.title" value="JBoss AOP Framework"/> <!-- =================== --> @@ -279,6 +279,13 @@ <fileset file="docs/jboss-aop_1_0.dtd"/> </jar> + <jar jarfile="${build.lib}/jdk14-pluggable-instrumentor.jar" + manifest="${build.etc}/default.mf"> + <fileset dir="${build.classes}"> + <!-- Include everything else --> + <include name="org/jboss/aop/hook/JDK14*.class"/> + </fileset> + </jar> <!-- Update the build marker to allow bypassing --> <touch file="${build-bypass.marker}"/> |
From: Flavia R. <fl...@im...> - 2005-06-16 03:45:37
|
User: flaviarnn Date: 05/06/15 23:45:01 Modified: jboss-aop build.xml Log: HotSwap feature implemented. Revision Changes Path 1.79 +322 -208 jboss-aop/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jboss-aop/build.xml,v retrieving revision 1.78 retrieving revision 1.79 diff -u -b -r1.78 -r1.79 --- build.xml 10 Jun 2005 15:32:45 -0000 1.78 +++ build.xml 16 Jun 2005 03:45:01 -0000 1.79 @@ -14,7 +14,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.78 2005/06/10 15:32:45 bill Exp $ --> +<!-- $Id: build.xml,v 1.79 2005/06/16 03:45:01 flaviarnn Exp $ --> <project default="main" name="JBoss/AOP"> @@ -208,7 +208,7 @@ optimize="${javac.optimize}" target="1.4" source="1.4" - debug="${javac.debug}" + debug= "${javac.debug}" depend="${javac.depend}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" @@ -510,7 +510,7 @@ <path refid="test.classpath"/> </path> <property name="bootclasspath" refid="bootclasspath"/> - <junit printsummary="yes" fork="no" haltonfailure="yes"> + <junit printsummary="yes" fork="no" haltonfailure="no"> <jvmarg value="-Xbootclasspath/p:${bootclasspath}"/> <sysproperty key="jboss.aop.path" value="${source.res}/test/basic/jboss-aop.xml"/> <formatter type="plain"/> @@ -519,7 +519,7 @@ </classpath> <test fork="yes" name="org.jboss.test.aop.basic.AOPTester"/> </junit> - <junit printsummary="yes" fork="no" haltonfailure="yes"> + <junit printsummary="yes" fork="no" haltonfailure="no"> <jvmarg value="-Xbootclasspath/p:${bootclasspath}"/> <sysproperty key="jboss.aop.path" value="${source.res}/test/reflection/jboss-aop.xml"/> <classpath> @@ -528,7 +528,7 @@ <formatter type="plain"/> <test fork="yes" name="org.jboss.test.aop.reflection.ReflectionTester"/> </junit> - <junit printsummary="yes" fork="no" haltonfailure="yes"> + <junit printsummary="yes" fork="no" haltonfailure="no"> <jvmarg value="-Xbootclasspath/p:${bootclasspath}"/> <sysproperty key="jboss.aop.path" value="${source.res}/test/dotinpointcutname/jboss-aop.xml"/> <classpath> @@ -537,7 +537,7 @@ <formatter type="plain"/> <test fork="yes" name="org.jboss.test.aop.dotinpointcutname.DotInPointcutNameTestCase"/> </junit> - <junit printsummary="yes" fork="no" haltonfailure="yes"> + <junit printsummary="yes" fork="no" haltonfailure="no"> <jvmarg value="-Xbootclasspath/p:${bootclasspath}"/> <sysproperty key="jboss.aop.path" value="${source.res}/test/introduction/introduction-aop.xml"/> <formatter type="plain"/> @@ -546,7 +546,7 @@ </classpath> <test fork="yes" name="org.jboss.test.aop.introduction.IntroductionTester"/> </junit> - <junit printsummary="yes" fork="no" haltonfailure="yes"> + <junit printsummary="yes" fork="no" haltonfailure="no"> <jvmarg value="-Xbootclasspath/p:${bootclasspath}"/> <sysproperty key="jboss.aop.path" value="${source.res}/test/precedence/jboss-aop.xml"/> <classpath> @@ -557,7 +557,7 @@ <formatter type="plain"/> <test fork="yes" name="org.jboss.test.aop.precedence.PrecedenceTester"/> </junit> - <junit printsummary="yes" fork="no" haltonfailure="yes"> + <junit printsummary="yes" fork="no" haltonfailure="no"> <jvmarg value="-Xbootclasspath/p:${bootclasspath}"/> <sysproperty key="jboss.aop.path" value="${source.res}/test/regression/jboss-aop.xml"/> <formatter type="plain"/> @@ -661,14 +661,14 @@ <include name="org/jboss/test/aop/beanstyleconfig/**"/> <aoppath path="${source.res}/test/beanstyleconfig/jboss-aop.xml"/> </aopc> - <aopc compilerclasspathref="aop.task.classpath"> +<!-- <aopc compilerclasspathref="aop.task.classpath"> <classpath refid="aop.task.classpath"/> <classpath path="${build.tests.classes}"/> <src path="${build.tests.classes}"/> <include name="org/jboss/test/aop/annotated/**"/> <exclude name="org/jboss/test/aop/annotated/declare/**"/> <aopclasspath path="${build.tests.classes}"/> - </aopc> + </aopc> --> <aopc compilerclasspathref="aop.task.classpath"> <classpath refid="aop.task.classpath"/> @@ -686,7 +686,7 @@ <aoppath path="${source.res}/test/dotinpointcutname/jboss-aop.xml"/> </aopc> - <aopc compilerclasspathref="aop.task.classpath"> + <aopc compilerclasspathref="aop.task.classpath" verbose="false"> <classpath refid="aop.task.classpath"/> <classpath path="${build.tests.classes}"/> <src path="${build.tests.classes}"/> @@ -694,7 +694,7 @@ <aoppath path="${source.res}/test/instanceofannotated/jboss-aop.xml"/> </aopc> - <junit printsummary="yes" fork="no" haltonfailure="yes"> + <junit printsummary="yes" fork="no" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/regression/jboss-aop.xml"/> <classpath> <path refid="test.classpath"/> @@ -716,7 +716,7 @@ <formatter type="plain"/> <test fork="yes" name="org.jboss.test.aop.args.ArgsTestCase"/> </junit> - <junit printsummary="yes" fork="no" haltonfailure="yes"> + <junit printsummary="yes" fork="no" haltonfailure="no"> <classpath> <path refid="test.classpath"/> <pathelement location="${build.tests.classes}"/> @@ -725,7 +725,7 @@ <formatter type="plain"/> <test fork="yes" name="org.jboss.test.aop.annotationc.AnnotationTester"/> </junit> - <junit printsummary="yes" fork="no" haltonfailure="yes"> + <junit printsummary="yes" fork="no" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/annotatedparams/jboss-aop.xml"/> <classpath> <path refid="test.classpath"/> @@ -755,7 +755,7 @@ <formatter type="plain"/> <test fork="yes" name="org.jboss.test.aop.dotinpointcutname.DotInPointcutNameTestCase"/> </junit> - <junit printsummary="yes" fork="no" haltonfailure="yes"> + <junit printsummary="yes" fork="no" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/instanceofannotated/jboss-aop.xml"/> <classpath> <path refid="test.classpath"/> @@ -765,7 +765,7 @@ <formatter type="plain"/> <test fork="yes" name="org.jboss.test.aop.instanceofannotated.InstanceOfAnnotatedTester"/> </junit> - <junit printsummary="yes" fork="no" haltonfailure="yes"> + <junit printsummary="yes" fork="no" haltonfailure="no"> <sysproperty key="jboss.aop.class.path" value="${build.tests.classes}"/> <classpath> <path refid="test.classpath"/> @@ -775,7 +775,7 @@ <formatter type="plain"/> <test fork="yes" name="org.jboss.test.aop.annotated.AnnotatedTestCase"/> </junit> - <junit printsummary="yes" fork="no" haltonfailure="yes"> + <junit printsummary="yes" fork="no" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/basic/jboss-aop.xml"/> <classpath> <path refid="test.classpath"/> @@ -785,7 +785,7 @@ <formatter type="plain"/> <test fork="yes" name="org.jboss.test.aop.basic.AOPTester"/> </junit> - <junit printsummary="yes" fork="no" haltonfailure="yes"> + <junit printsummary="yes" fork="no" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/introduction/introduction-aop.xml"/> <classpath> <path refid="test.classpath"/> @@ -795,7 +795,7 @@ <formatter type="plain"/> <test fork="yes" name="org.jboss.test.aop.introduction.IntroductionTester"/> </junit> - <junit printsummary="yes" fork="no" haltonfailure="yes"> + <junit printsummary="yes" fork="no" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/precedence/jboss-aop.xml"/> <classpath> <path refid="test.classpath"/> @@ -805,7 +805,7 @@ <formatter type="plain"/> <test fork="yes" name="org.jboss.test.aop.precedence.PrecedenceTester"/> </junit> - <junit printsummary="yes" fork="no" haltonfailure="yes"> + <junit printsummary="yes" fork="no" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/reflection/jboss-aop.xml"/> <classpath> <path refid="test.classpath"/> @@ -815,7 +815,7 @@ <formatter type="plain"/> <test fork="yes" name="org.jboss.test.aop.reflection.ReflectionTester"/> </junit> - <junit printsummary="yes" fork="no" haltonfailure="yes"> + <junit printsummary="yes" fork="no" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/perjoinpoint/jboss-aop.xml"/> <classpath> <path refid="test.classpath"/> @@ -826,7 +826,7 @@ <test fork="yes" name="org.jboss.test.aop.perjoinpoint.PerJoinpointTester"/> </junit> - <junit printsummary="yes" fork="no" haltonfailure="yes"> + <junit printsummary="yes" fork="no" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/beanstyleconfig/jboss-aop.xml"/> <classpath> <path refid="test.classpath"/> @@ -963,7 +963,7 @@ <aoppath path="${source.res}/test/instanceofannotated/jboss-aop.xml"/> </aopc> - <junit printsummary="yes" fork="no" haltonfailure="yes"> + <junit printsummary="yes" fork="no" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/regression/jboss-aop.xml"/> <classpath> <path refid="test.classpath"/> @@ -985,7 +985,7 @@ <formatter type="plain"/> <test fork="yes" name="org.jboss.test.aop.args.ArgsTestCase"/> </junit> - <junit printsummary="yes" fork="no" haltonfailure="yes"> + <junit printsummary="yes" fork="no" haltonfailure="no"> <classpath> <path refid="test.classpath"/> <pathelement location="${build.tests.classes}"/> @@ -994,7 +994,7 @@ <formatter type="plain"/> <test fork="yes" name="org.jboss.test.aop.annotationc.AnnotationTester"/> </junit> - <junit printsummary="yes" fork="no" haltonfailure="yes"> + <junit printsummary="yes" fork="no" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/annotatedparams/jboss-aop.xml"/> <classpath> <path refid="test.classpath"/> @@ -1024,7 +1024,7 @@ <formatter type="plain"/> <test fork="yes" name="org.jboss.test.aop.dotinpointcutname.DotInPointcutNameTestCase"/> </junit> - <junit printsummary="yes" fork="no" haltonfailure="yes"> + <junit printsummary="yes" fork="no" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/instanceofannotated/jboss-aop.xml"/> <classpath> <path refid="test.classpath"/> @@ -1034,7 +1034,7 @@ <formatter type="plain"/> <test fork="yes" name="org.jboss.test.aop.instanceofannotated.InstanceOfAnnotatedTester"/> </junit> - <junit printsummary="yes" fork="no" haltonfailure="yes"> + <junit printsummary="yes" fork="no" haltonfailure="no"> <sysproperty key="jboss.aop.class.path" value="${build.tests.classes}"/> <classpath> <path refid="test.classpath"/> @@ -1044,7 +1044,7 @@ <formatter type="plain"/> <test fork="yes" name="org.jboss.test.aop.annotated.AnnotatedTestCase"/> </junit> - <junit printsummary="yes" fork="no" haltonfailure="yes"> + <junit printsummary="yes" fork="no" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/basic/jboss-aop.xml"/> <classpath> <path refid="test.classpath"/> @@ -1054,7 +1054,7 @@ <formatter type="plain"/> <test fork="yes" name="org.jboss.test.aop.basic.AOPTester"/> </junit> - <junit printsummary="yes" fork="no" haltonfailure="yes"> + <junit printsummary="yes" fork="no" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/introduction/introduction-aop.xml"/> <classpath> <path refid="test.classpath"/> @@ -1064,7 +1064,7 @@ <formatter type="plain"/> <test fork="yes" name="org.jboss.test.aop.introduction.IntroductionTester"/> </junit> - <junit printsummary="yes" fork="no" haltonfailure="yes"> + <junit printsummary="yes" fork="no" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/precedence/jboss-aop.xml"/> <classpath> <path refid="test.classpath"/> @@ -1074,7 +1074,7 @@ <formatter type="plain"/> <test fork="yes" name="org.jboss.test.aop.precedence.PrecedenceTester"/> </junit> - <junit printsummary="yes" fork="no" haltonfailure="yes"> + <junit printsummary="yes" fork="no" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/reflection/jboss-aop.xml"/> <classpath> <path refid="test.classpath"/> @@ -1084,7 +1084,7 @@ <formatter type="plain"/> <test fork="yes" name="org.jboss.test.aop.reflection.ReflectionTester"/> </junit> - <junit printsummary="yes" fork="no" haltonfailure="yes"> + <junit printsummary="yes" fork="no" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/perjoinpoint/jboss-aop.xml"/> <classpath> <path refid="test.classpath"/> @@ -1095,7 +1095,7 @@ <test fork="yes" name="org.jboss.test.aop.perjoinpoint.PerJoinpointTester"/> </junit> - <junit printsummary="yes" fork="no" haltonfailure="yes"> + <junit printsummary="yes" fork="no" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/beanstyleconfig/jboss-aop.xml"/> <classpath> <path refid="test.classpath"/> @@ -1109,7 +1109,7 @@ <target name="proxy-test" depends="compile-test-classes"> - <junit printsummary="yes" fork="no" haltonfailure="yes"> + <junit printsummary="yes" fork="no" haltonfailure="no"> <classpath> <path refid="test.classpath"/> <pathelement location="${build.tests.classes}"/> @@ -1131,6 +1131,11 @@ <include name="org/jboss/test/aop/**"/> <classpath refid="test15.classpath"/> </javac> + <jar destfile="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario.jar" + basedir="${build.tests.classes}" + includes="org/jboss/test/aop/jdk15/dynamic/common/scenario/**" + /> + <delete dir="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario"/> </target> <target name="jdk15-tests"> @@ -1138,16 +1143,21 @@ <antcall target="jdk15-precompiled-tests" inheritRefs="true"/> <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-hotswap-tests" inheritRefs="true"/> </target> <target name="jdk15-loadtime-tests" depends="compile-jdk15-tests"> - <java fork="yes" failOnError="true" className="org.jboss.test.aop.basic.AOPTester"> + <junit printsummary="yes" fork="yes" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/basic/jboss-aop.xml"/> <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar"/> <classpath refid="test15.classpath"/> <classpath path="${build.tests.classes}"/> - </java> - <java fork="yes" failOnError="true" className="org.jboss.test.aop.jdk15.annotated.AnnotatedTestCase"> + <formatter usefile="true" type="plain"/> + <test name="org.jboss.test.aop.basic.AOPTester" /> + </junit> + + <junit printsummary="yes" fork="yes" haltonfailure="no"> <sysproperty key="jboss.aop.class.path" value="${build.tests.classes}"/> <!-- The manifest.mf file of the jar contains Premain-Class: which class is the agent @@ -1156,22 +1166,32 @@ <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar"/> <classpath refid="test15.classpath"/> <classpath path="${build.tests.classes}"/> - </java> - <java fork="yes" failOnError="true" className="org.jboss.test.aop.jdk15.AOPTester"> + <formatter usefile="true" type="plain"/> + <test name="org.jboss.test.aop.jdk15.annotated.AnnotatedTestCase" /> + </junit> + <junit printsummary="yes" fork="yes" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/jdk15/jboss-aop.xml"/> <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar"/> <classpath refid="test15.classpath"/> <classpath path="${build.tests.classes}"/> - </java> - <java fork="yes" failOnError="true" className="org.jboss.test.aop.jdk15.annotated.declare.AnnotatedDeclareTestCase"> + <formatter usefile="true" type="plain"/> + <test name="org.jboss.test.aop.jdk15.AOPTester" /> + </junit> + <junit printsummary="yes" fork="yes" haltonfailure="no"> <sysproperty key="jboss.aop.class.path" value="${build.tests.classes}"/> <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar"/> <classpath refid="test15.classpath"/> <classpath path="${build.tests.classes}"/> - </java> + <formatter usefile="true" type="plain"/> + <test name="org.jboss.test.aop.jdk15.annotated.declare.AnnotatedDeclareTestCase" /> + </junit> + <junit printsummary="yes" fork="yes" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/jdk15/dynamic/prepareAll/jboss-aop.xml"/> - <sysproperty key="jboss.aop.class.path" value="${build.tests.classes}"/> + <sysproperty key="scenario.jar" value="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario.jar"/> + <sysproperty key="java5Agent" value="true"/> + <!-- don't prune it so that we can inspect the bytecodes state during tests execution --> + <sysproperty key="jboss.aop.prune" value="false"/> <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar"/> <classpath> <path refid="test15.classpath"/> @@ -1179,11 +1199,13 @@ <pathelement location="docs"/> </classpath> <formatter usefile="true" type="plain"/> - <test name="org.jboss.test.aop.jdk15.dynamic.prepareAll.PrecompiledClassesTester" /> + <test 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="jboss.aop.class.path" value="${build.tests.classes}"/> + <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"/> <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar"/> <classpath> <path refid="test15.classpath"/> @@ -1191,11 +1213,13 @@ <pathelement location="docs"/> </classpath> <formatter usefile="true" type="plain"/> - <test name="org.jboss.test.aop.jdk15.dynamic.prepareConstructor.PrecompiledClassesTester" /> + <test 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/prepareField/jboss-aop.xml"/> - <sysproperty key="jboss.aop.class.path" value="${build.tests.classes}"/> + <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"/> <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar"/> <classpath> <path refid="test15.classpath"/> @@ -1203,11 +1227,13 @@ <pathelement location="docs"/> </classpath> <formatter usefile="true" type="plain"/> - <test name="org.jboss.test.aop.jdk15.dynamic.prepareField.PrecompiledClassesTester" /> + <test 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/prepareFieldGet/jboss-aop.xml"/> - <sysproperty key="jboss.aop.class.path" value="${build.tests.classes}"/> + <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.prune" value="false"/> <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar"/> <classpath> <path refid="test15.classpath"/> @@ -1215,11 +1241,13 @@ <pathelement location="docs"/> </classpath> <formatter usefile="true" type="plain"/> - <test name="org.jboss.test.aop.jdk15.dynamic.prepareFieldGet.PrecompiledClassesTester" /> + <test 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/prepareFieldSet/jboss-aop.xml"/> - <sysproperty key="jboss.aop.class.path" value="${build.tests.classes}"/> + <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.prune" value="false"/> <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar"/> <classpath> <path refid="test15.classpath"/> @@ -1227,11 +1255,13 @@ <pathelement location="docs"/> </classpath> <formatter usefile="true" type="plain"/> - <test name="org.jboss.test.aop.jdk15.dynamic.prepareFieldSet.PrecompiledClassesTester" /> + <test 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/prepareMethod/jboss-aop.xml"/> - <sysproperty key="jboss.aop.class.path" value="${build.tests.classes}"/> + <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 key="java5Agent" value="true"/> + <sysproperty key="jboss.aop.prune" value="false"/> <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar"/> <classpath> <path refid="test15.classpath"/> @@ -1239,10 +1269,9 @@ <pathelement location="docs"/> </classpath> <formatter usefile="true" type="plain"/> - <test name="org.jboss.test.aop.jdk15.dynamic.prepareMethod.PrecompiledClassesTester" /> + <test name="org.jboss.test.aop.jdk15.dynamic.prepareFieldSet.HotSwapDisabledTester" /> </junit> </target> - <target name="jdk15-precompiled-tests" depends="compile-jdk15-tests"> <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/> <path id="aop.task.classpath"> @@ -1268,85 +1297,84 @@ <include name="org/jboss/test/aop/basic/**"/> <aoppath path="${source.res}/test/basic/jboss-aop.xml"/> </aopc> - - <copy todir="${build.tests.classes}/dynamic-prepareAll"> - <fileset dir="${build.tests.classes}"> - <include name="org/jboss/test/aop/jdk15/dynamic/prepareAll/**"/> - <include name="org/jboss/test/aop/jdk15/dynamic/common/**"/> - </fileset> - </copy> + <mkdir dir="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario"/> + <!-- process jdk15/dynamic/common/scenario with prepareAll jboss-aop.xml file --> + <unjar src="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario.jar" + dest="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario"/> <aopc verbose="false" compilerclasspathref="aop.task.classpath"> - <classpath path="${build.tests.classes}/dynamic-prepareAll"/> - <src path="${build.tests.classes}/dynamic-prepareAll"/> - <include name="org/jboss/test/aop/jdk15/dynamic/prepareAll/**"/> - <include name="org/jboss/test/aop/jdk15/dynamic/common/**"/> + <classpath path="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario/"/> + <src path="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario/"/> <aoppath path="${source.res}/test/jdk15/dynamic/prepareAll/jboss-aop.xml"/> </aopc> - <copy todir="${build.tests.classes}/dynamic-prepareConstructor"> - <fileset dir="${build.tests.classes}"> - <include name="org/jboss/test/aop/jdk15/dynamic/prepareConstructor/**"/> - <include name="org/jboss/test/aop/jdk15/dynamic/common/**"/> - </fileset> - </copy> + <jar destfile="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenarioAopcPrepareAll.jar" + basedir="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario/"/> + <delete includeemptydirs="true"> + <fileset dir="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario" includes="**/*"/> + </delete> + <!-- process jdk15/dynamic/common/scenario with prepareConstructor jboss-aop.xml file --> + <unjar src="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario.jar" + dest="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario"/> <aopc verbose="false" compilerclasspathref="aop.task.classpath"> - <classpath path="${build.tests.classes}/dynamic-prepareConstructor"/> - <src path="${build.tests.classes}/dynamic-prepareConstructor"/> - <include name="org/jboss/test/aop/jdk15/dynamic/prepareConstructor/**"/> - <include name="org/jboss/test/aop/jdk15/dynamic/common/**"/> + <classpath path="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario/"/> + <src path="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario/"/> <aoppath path="${source.res}/test/jdk15/dynamic/prepareConstructor/jboss-aop.xml"/> </aopc> - <copy todir="${build.tests.classes}/dynamic-prepareField"> - <fileset dir="${build.tests.classes}"> - <include name="org/jboss/test/aop/jdk15/dynamic/prepareField/**"/> - <include name="org/jboss/test/aop/jdk15/dynamic/common/**"/> - </fileset> - </copy> + <jar destfile="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenarioAopcPrepareConstructor.jar" + basedir="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario/"/> + <delete includeemptydirs="true"> + <fileset dir="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario" includes="**/*"/> + </delete> + <!-- process jdk15/dynamic/common/scenario with prepareField jboss-aop.xml file --> + <unjar src="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario.jar" + dest="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario"/> <aopc verbose="false" compilerclasspathref="aop.task.classpath"> - <classpath path="${build.tests.classes}/dynamic-prepareField"/> - <src path="${build.tests.classes}/dynamic-prepareField"/> - <include name="org/jboss/test/aop/jdk15/dynamic/prepareField/**"/> - <include name="org/jboss/test/aop/jdk15/dynamic/common/**"/> + <classpath path="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario/"/> + <src path="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario/"/> <aoppath path="${source.res}/test/jdk15/dynamic/prepareField/jboss-aop.xml"/> </aopc> - <copy todir="${build.tests.classes}/dynamic-prepareFieldGet"> - <fileset dir="${build.tests.classes}"> - <include name="org/jboss/test/aop/jdk15/dynamic/prepareFieldGet/**"/> - <include name="org/jboss/test/aop/jdk15/dynamic/common/**"/> - </fileset> - </copy> + <jar destfile="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenarioAopcPrepareField.jar" + basedir="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario/"/> + <delete includeemptydirs="true"> + <fileset dir="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario" includes="**/*"/> + </delete> + <!-- process jdk15/dynamic/common/scenario with prepareFieldGet jboss-aop.xml file --> + <unjar src="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario.jar" + dest="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario"/> <aopc verbose="false" compilerclasspathref="aop.task.classpath"> - <classpath path="${build.tests.classes}/dynamic-prepareFieldGet"/> - <src path="${build.tests.classes}/dynamic-prepareFieldGet"/> - <include name="org/jboss/test/aop/jdk15/dynamic/prepareFieldGet/**"/> - <include name="org/jboss/test/aop/jdk15/dynamic/common/**"/> + <classpath path="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario/"/> + <src path="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario/"/> <aoppath path="${source.res}/test/jdk15/dynamic/prepareFieldGet/jboss-aop.xml"/> </aopc> - <copy todir="${build.tests.classes}/dynamic-prepareFieldSet"> - <fileset dir="${build.tests.classes}"> - <include name="org/jboss/test/aop/jdk15/dynamic/prepareFieldSet/**"/> - <include name="org/jboss/test/aop/jdk15/dynamic/common/**"/> - </fileset> - </copy> + <jar destfile="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenarioAopcPrepareFieldGet.jar" + basedir="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario/"/> + <delete includeemptydirs="true"> + <fileset dir="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario" includes="**/*"/> + </delete> + <!-- process jdk15/dynamic/common/scenario with prepareFieldSet jboss-aop.xml file --> + <unjar src="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario.jar" + dest="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario"/> <aopc verbose="false" compilerclasspathref="aop.task.classpath"> - <classpath path="${build.tests.classes}/dynamic-prepareFieldSet"/> - <src path="${build.tests.classes}/dynamic-prepareFieldSet"/> - <include name="org/jboss/test/aop/jdk15/dynamic/prepareFieldSet/**"/> - <include name="org/jboss/test/aop/jdk15/dynamic/common/**"/> + <classpath path="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario/"/> + <src path="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario/"/> <aoppath path="${source.res}/test/jdk15/dynamic/prepareFieldSet/jboss-aop.xml"/> </aopc> - <copy todir="${build.tests.classes}/dynamic-prepareMethod"> - <fileset dir="${build.tests.classes}"> - <include name="org/jboss/test/aop/jdk15/dynamic/prepareMethod/**"/> - <include name="org/jboss/test/aop/jdk15/dynamic/common/**"/> - </fileset> - </copy> + <jar destfile="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenarioAopcPrepareFieldSet.jar" + basedir="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario/"/> + <delete includeemptydirs="true"> + <fileset dir="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario" includes="**/*"/> + </delete> + <!-- process jdk15/dynamic/common/scenario with prepareMethod jboss-aop.xml file --> + <unjar src="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario.jar" + dest="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario"/> <aopc verbose="false" compilerclasspathref="aop.task.classpath"> - <classpath path="${build.tests.classes}/dynamic-prepareMethod"/> - <src path="${build.tests.classes}/dynamic-prepareMethod"/> - <include name="org/jboss/test/aop/jdk15/dynamic/prepareMethod/**"/> - <include name="org/jboss/test/aop/jdk15/dynamic/common/**"/> + <classpath path="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario/"/> + <src path="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario/"/> <aoppath path="${source.res}/test/jdk15/dynamic/prepareMethod/jboss-aop.xml"/> </aopc> + <jar destfile="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenarioAopcPrepareMethod.jar" + basedir="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario/"/> + <delete dir="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario"/> + <junit printsummary="yes" fork="yes" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/jdk15/jboss-aop.xml"/> <sysproperty key="jboss.aop.class.path" value="${build.tests.classes}"/> @@ -1359,7 +1387,7 @@ <test name="org.jboss.test.aop.jdk15.AOPTester"/> <test name="org.jboss.test.aop.jdk15.annotated.AnnotatedTestCase"/> </junit> - <junit printsummary="yes" fork="yes" haltonfailure="yes"> + <junit printsummary="yes" fork="yes" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/basic/jboss-aop.xml"/> <sysproperty key="jboss.aop.class.path" value="${build.tests.classes}"/> <classpath> @@ -1370,74 +1398,160 @@ <formatter type="plain"/> <test name="org.jboss.test.aop.basic.AOPTester"/> </junit> - <junit printsummary="yes" fork="yes" haltonfailure="yes"> + <junit printsummary="yes" fork="yes" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/jdk15/dynamic/prepareAll/jboss-aop.xml"/> - <sysproperty key="jboss.aop.class.path" value="${build.tests.classes}/dynamic-prepareAll"/> + <sysproperty key="scenario.jar" + value="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenarioAopcPrepareAll.jar"/> <classpath> <path refid="test15.classpath"/> - <pathelement location="${build.tests.classes}/dynamic-prepareAll"/> + <pathelement location="${build.tests.classes}"/> <pathelement location="docs"/> </classpath> <formatter usefile="true" type="plain"/> - <test name="org.jboss.test.aop.jdk15.dynamic.prepareAll.PrecompiledClassesTester" /> + <test 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="jboss.aop.class.path" value="${build.tests.classes}/dynamic-prepareConstructor"/> + <sysproperty key="scenario.jar" + value="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenarioAopcPrepareConstructor.jar"/> <classpath> <path refid="test15.classpath"/> - <pathelement location="${build.tests.classes}/dynamic-prepareConstructor"/> + <pathelement location="${build.tests.classes}"/> <pathelement location="docs"/> </classpath> <formatter usefile="true" type="plain"/> - <test name="org.jboss.test.aop.jdk15.dynamic.prepareConstructor.PrecompiledClassesTester" /> + <test 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/prepareField/jboss-aop.xml"/> - <sysproperty key="jboss.aop.class.path" value="${build.tests.classes}/dynamic-prepareField"/> + <sysproperty key="scenario.jar" + value="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenarioAopcPrepareField.jar"/> <classpath> <path refid="test15.classpath"/> - <pathelement location="${build.tests.classes}/dynamic-prepareField"/> + <pathelement location="${build.tests.classes}"/> <pathelement location="docs"/> </classpath> <formatter usefile="true" type="plain"/> - <test name="org.jboss.test.aop.jdk15.dynamic.prepareField.PrecompiledClassesTester" /> + <test 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="jboss.aop.class.path" value="${build.tests.classes}/dynamic-prepareFieldGet"/> + <sysproperty key="scenario.jar" + value="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenarioAopcPrepareFieldGet.jar"/> <classpath> <path refid="test15.classpath"/> - <pathelement location="${build.tests.classes}/dynamic-prepareFieldGet"/> + <pathelement location="${build.tests.classes}"/> <pathelement location="docs"/> </classpath> <formatter usefile="true" type="plain"/> - <test name="org.jboss.test.aop.jdk15.dynamic.prepareFieldGet.PrecompiledClassesTester" /> + <test 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="jboss.aop.class.path" value="${build.tests.classes}/dynamic-prepareFieldSet"/> + <sysproperty key="scenario.jar" + value="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenarioAopcPrepareFieldSet.jar"/> <classpath> <path refid="test15.classpath"/> - <pathelement location="${build.tests.classes}/dynamic-prepareFieldSet"/> + <pathelement location="${build.tests.classes}"/> <pathelement location="docs"/> </classpath> <formatter usefile="true" type="plain"/> - <test name="org.jboss.test.aop.jdk15.dynamic.prepareFieldSet.PrecompiledClassesTester" /> + <test name="org.jboss.test.aop.jdk15.dynamic.prepareFieldSet.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="jboss.aop.class.path" value="${build.tests.classes}/dynamic-prepareMethod"/> + <sysproperty key="scenario.jar" + value="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenarioAopcPrepareMethod.jar"/> <classpath> <path refid="test15.classpath"/> - <pathelement location="${build.tests.classes}/dynamic-prepareMethod"/> + <pathelement location="${build.tests.classes}"/> <pathelement location="docs"/> </classpath> <formatter usefile="true" type="plain"/> - <test name="org.jboss.test.aop.jdk15.dynamic.prepareMethod.PrecompiledClassesTester" /> + <test name="org.jboss.test.aop.jdk15.dynamic.prepareMethod.HotSwapDisabledTester" /> + </junit> + </target> + <target name="jdk15-hotswap-tests" depends="compile-jdk15-tests"> + <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"/> + <!-- don't prune it so that we can inspect the bytecodes state during tests execution --> + <sysproperty key="jboss.aop.prune" value="false"/> + <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar=-hotSwap"/> + <classpath> + <path refid="test15.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter usefile="true" type="plain"/> + <test name="org.jboss.test.aop.jdk15.dynamic.prepareAll.HotSwapEnabledTester" /> + </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="jboss.aop.prune" value="false"/> + <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar=-hotSwap"/> + <classpath> + <path refid="test15.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter usefile="true" type="plain"/> + <test name="org.jboss.test.aop.jdk15.dynamic.prepareConstructor.HotSwapEnabledTester" /> + </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="jboss.aop.prune" value="false"/> + <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar=-hotSwap"/> + <classpath> + <path refid="test15.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter usefile="true" type="plain"/> + <test name="org.jboss.test.aop.jdk15.dynamic.prepareMethod.HotSwapEnabledTester" /> + </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="jboss.aop.prune" value="false"/> + <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar=-hotSwap"/> + <classpath> + <path refid="test15.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter usefile="true" type="plain"/> + <test name="org.jboss.test.aop.jdk15.dynamic.prepareField.HotSwapEnabledTester" /> + </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="jboss.aop.prune" value="false"/> + <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar=-hotSwap"/> + <classpath> + <path refid="test15.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter usefile="true" type="plain"/> + <test name="org.jboss.test.aop.jdk15.dynamic.prepareFieldGet.HotSwapEnabledTester" /> + </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 key="jboss.aop.prune" value="false"/> + <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar=-hotSwap"/> + <classpath> + <path refid="test15.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter usefile="true" type="plain"/> + <test name="org.jboss.test.aop.jdk15.dynamic.prepareFieldSet.HotSwapEnabledTester" /> </junit> </target> - <target name="compiletime-declare" depends="compile-test-classes"> <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/> |
From: Thomas D. <tho...@jb...> - 2005-06-28 11:58:01
|
User: tdiesler Date: 05/06/28 07:56:56 Added: jboss-aop Tag: Branch_4_0 .cvsignore Log: Fix ejb3 dependencies Revision Changes Path No revision No revision 1.4.6.2 +1 -2 jboss-aop/.cvsignore (In the diff below, changes in quantity of whitespace are not shown.) Index: .cvsignore =================================================================== RCS file: .cvsignore diff -N .cvsignore --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ .cvsignore 28 Jun 2005 11:56:56 -0000 1.4.6.2 @@ -0,0 +1 @@ +bin \ No newline at end of file |
From: Bill B. <bi...@jb...> - 2005-07-05 22:30:54
|
User: bill Date: 05/07/05 18:30:05 Modified: jboss-aop build.xml Log: update Revision Changes Path 1.82 +70 -1 jboss-aop/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jboss-aop/build.xml,v retrieving revision 1.81 retrieving revision 1.82 diff -u -b -r1.81 -r1.82 --- build.xml 4 Jul 2005 11:27:10 -0000 1.81 +++ build.xml 5 Jul 2005 22:30:05 -0000 1.82 @@ -14,7 +14,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.81 2005/07/04 11:27:10 kkhan Exp $ --> +<!-- $Id: build.xml,v 1.82 2005/07/05 22:30:05 bill Exp $ --> <project default="main" name="JBoss/AOP"> @@ -211,6 +211,25 @@ | documentation compiles. --> + <!-- Generate parsers --> + <target name="generate-parsers" depends="init"> + <!-- + | make sure to generate the JBoss-QL parser first so the node + | interface is keyed to JBossQLParserVisitor. + --> + + <!-- JBoss-QL parser --> + <jjtree + target="${source.java}/org/jboss/aop/pointcut/ast/pointcut.jjt" + outputdirectory="${source.java}/org/jboss/aop/pointcut/ast" + javacchome="${sun.javacc.lib}"/> + + <javacc + target="${source.java}/org/jboss/aop/pointcut/ast/pointcut.jj" + javacchome="${sun.javacc.lib}"/> + + </target> + <target name="compile" description="Compile all source files." depends="compile-classes, compile-classes15, @@ -570,6 +589,18 @@ <property name="bootclasspath" refid="bootclasspath"/> <junit printsummary="yes" fork="no" haltonfailure="no"> <jvmarg value="-Xbootclasspath/p:${bootclasspath}"/> + <sysproperty key="jboss.aop.path" value="${source.res}/test/construction/jboss-aop.xml"/> + <classpath> + <path refid="test.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter type="plain"/> + <test fork="yes" name="org.jboss.test.aop.construction.ConstructionTester"/> + </junit> + + <junit printsummary="yes" fork="no" haltonfailure="no"> + <jvmarg value="-Xbootclasspath/p:${bootclasspath}"/> <sysproperty key="jboss.aop.path" value="${source.res}/test/basic/jboss-aop.xml"/> <formatter type="plain"/> <classpath> @@ -652,6 +683,14 @@ <classpath refid="aop.task.classpath"/> <classpath path="${build.tests.classes}"/> <src path="${build.tests.classes}"/> + <include name="org/jboss/test/aop/construction/**"/> + <aoppath path="${source.res}/test/construction/jboss-aop.xml"/> + </aopc> + + <aopc compilerclasspathref="aop.task.classpath"> + <classpath refid="aop.task.classpath"/> + <classpath path="${build.tests.classes}"/> + <src path="${build.tests.classes}"/> <include name="org/jboss/test/aop/basic/**"/> <aoppath path="${source.res}/test/basic/jboss-aop.xml"/> </aopc> @@ -753,6 +792,17 @@ </aopc> <junit printsummary="yes" fork="no" haltonfailure="no"> + <sysproperty key="jboss.aop.path" value="${source.res}/test/construction/jboss-aop.xml"/> + <classpath> + <path refid="test.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter type="plain"/> + <test fork="yes" name="org.jboss.test.aop.construction.ConstructionTester"/> + </junit> + + <junit printsummary="yes" fork="no" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/regression/jboss-aop.xml"/> <classpath> <path refid="test.classpath"/> @@ -921,6 +971,14 @@ <classpath refid="aop.task.classpath"/> <classpath path="${build.tests.classes}"/> <src path="${build.tests.classes}"/> + <include name="org/jboss/test/aop/construction/**"/> + <aoppath path="${source.res}/test/construction/jboss-aop.xml"/> + </aopc> + + <aopc optimized="false" compilerclasspathref="aop.task.classpath"> + <classpath refid="aop.task.classpath"/> + <classpath path="${build.tests.classes}"/> + <src path="${build.tests.classes}"/> <include name="org/jboss/test/aop/basic/**"/> <aoppath path="${source.res}/test/basic/jboss-aop.xml"/> </aopc> @@ -1022,6 +1080,17 @@ </aopc> <junit printsummary="yes" fork="no" haltonfailure="no"> + <sysproperty key="jboss.aop.path" value="${source.res}/test/construction/jboss-aop.xml"/> + <classpath> + <path refid="test.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter type="plain"/> + <test fork="yes" name="org.jboss.test.aop.construction.ConstructionTester"/> + </junit> + + <junit printsummary="yes" fork="no" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/regression/jboss-aop.xml"/> <classpath> <path refid="test.classpath"/> |
From: Bill B. <bi...@jb...> - 2005-07-06 15:47:54
|
User: bill Date: 05/07/06 11:47:02 Modified: jboss-aop build.xml Log: version Revision Changes Path 1.83 +3 -3 jboss-aop/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jboss-aop/build.xml,v retrieving revision 1.82 retrieving revision 1.83 diff -u -b -r1.82 -r1.83 --- build.xml 5 Jul 2005 22:30:05 -0000 1.82 +++ build.xml 6 Jul 2005 15:47:02 -0000 1.83 @@ -14,7 +14,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.82 2005/07/05 22:30:05 bill Exp $ --> +<!-- $Id: build.xml,v 1.83 2005/07/06 15:47:02 bill Exp $ --> <project default="main" name="JBoss/AOP"> @@ -57,7 +57,7 @@ --> <target name="configure" unless="configure.disable"> - <property name="aop.version" value="jboss-aop-1.3"/> + <property name="aop.version" value="jboss-aop-1.3.1"/> <property name="aop.title" value="JBoss AOP Framework"/> <!-- =================== --> @@ -67,7 +67,7 @@ <!-- Module name(s) & version --> <property name="module.name" value="aop"/> <property name="module.Name" value="JBoss AOP"/> - <property name="module.version" value="1.2"/> + <property name="module.version" value="1.3.1"/> <!-- ========= --> <!-- Libraries --> |
From: Kabir K. <kk...@jb...> - 2005-07-11 16:31:09
|
User: kkhan Date: 05/07/11 12:29:46 Modified: jboss-aop build.xml Log: Test for overriding aspect/interceptor chains Revision Changes Path 1.84 +26 -8 jboss-aop/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jboss-aop/build.xml,v retrieving revision 1.83 retrieving revision 1.84 diff -u -b -r1.83 -r1.84 --- build.xml 6 Jul 2005 15:47:02 -0000 1.83 +++ build.xml 11 Jul 2005 16:29:46 -0000 1.84 @@ -14,7 +14,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.83 2005/07/06 15:47:02 bill Exp $ --> +<!-- $Id: build.xml,v 1.84 2005/07/11 16:29:46 kkhan Exp $ --> <project default="main" name="JBoss/AOP"> @@ -678,6 +678,13 @@ <include name="org/jboss/test/aop/instanceofannotated/*.java"/> </annotationc> + <aopc compilerclasspathref="aop.task.classpath"> + <classpath refid="aop.task.classpath"/> + <classpath path="${build.tests.classes}"/> + <src path="${build.tests.classes}"/> + <include name="org/jboss/test/aop/override/**"/> + <aoppath path="${source.res}/test/override/jboss-aop.xml"/> + </aopc> <aopc compilerclasspathref="aop.task.classpath"> <classpath refid="aop.task.classpath"/> @@ -792,6 +799,17 @@ </aopc> <junit printsummary="yes" fork="no" haltonfailure="no"> + <sysproperty key="jboss.aop.path" value="${source.res}/test/override/jboss-aop.xml"/> + <classpath> + <path refid="test.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter type="plain"/> + <test fork="yes" name="org.jboss.test.aop.override.OverrideTestCase"/> + </junit> + + <junit printsummary="yes" fork="no" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/construction/jboss-aop.xml"/> <classpath> <path refid="test.classpath"/> |
From: Bill B. <bi...@jb...> - 2005-07-11 23:46:04
|
User: bill Date: 05/07/11 19:45:08 Modified: jboss-aop Tag: Branch_AOP_1_3 build.xml Log: update from head Revision Changes Path No revision No revision 1.80.2.2 +38 -1 jboss-aop/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jboss-aop/build.xml,v retrieving revision 1.80.2.1 retrieving revision 1.80.2.2 diff -u -b -r1.80.2.1 -r1.80.2.2 --- build.xml 6 Jul 2005 18:54:39 -0000 1.80.2.1 +++ build.xml 11 Jul 2005 23:45:08 -0000 1.80.2.2 @@ -14,7 +14,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.80.2.1 2005/07/06 18:54:39 bill Exp $ --> +<!-- $Id: build.xml,v 1.80.2.2 2005/07/11 23:45:08 bill Exp $ --> <project default="main" name="JBoss/AOP"> @@ -678,6 +678,21 @@ <include name="org/jboss/test/aop/instanceofannotated/*.java"/> </annotationc> + <aopc compilerclasspathref="aop.task.classpath"> + <classpath refid="aop.task.classpath"/> + <classpath path="${build.tests.classes}"/> + <src path="${build.tests.classes}"/> + <include name="org/jboss/test/aop/override/**"/> + <aoppath path="${source.res}/test/override/jboss-aop.xml"/> + </aopc> + + <aopc compilerclasspathref="aop.task.classpath"> + <classpath refid="aop.task.classpath"/> + <classpath path="${build.tests.classes}"/> + <src path="${build.tests.classes}"/> + <include name="org/jboss/test/aop/construction/**"/> + <aoppath path="${source.res}/test/construction/jboss-aop.xml"/> + </aopc> <aopc compilerclasspathref="aop.task.classpath"> <classpath refid="aop.task.classpath"/> @@ -792,6 +807,28 @@ </aopc> <junit printsummary="yes" fork="no" haltonfailure="no"> + <sysproperty key="jboss.aop.path" value="${source.res}/test/override/jboss-aop.xml"/> + <classpath> + <path refid="test.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter type="plain"/> + <test fork="yes" name="org.jboss.test.aop.override.OverrideTestCase"/> + </junit> + + <junit printsummary="yes" fork="no" haltonfailure="no"> + <sysproperty key="jboss.aop.path" value="${source.res}/test/construction/jboss-aop.xml"/> + <classpath> + <path refid="test.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter type="plain"/> + <test fork="yes" name="org.jboss.test.aop.construction.ConstructionTester"/> + </junit> + + <junit printsummary="yes" fork="no" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/construction/jboss-aop.xml"/> <classpath> <path refid="test.classpath"/> |
From: Ruel L. <rue...@jb...> - 2005-07-15 13:41:37
|
User: rloehr Date: 05/07/15 09:40:37 Modified: jboss-aop jbossbuild.xml Log: updated to include jrockit exclude in source Revision Changes Path 1.5 +1 -1 jboss-aop/jbossbuild.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: jbossbuild.xml =================================================================== RCS file: /cvsroot/jboss/jboss-aop/jbossbuild.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- jbossbuild.xml 14 Apr 2005 20:47:36 -0000 1.4 +++ jbossbuild.xml 15 Jul 2005 13:40:37 -0000 1.5 @@ -31,7 +31,7 @@ <resource id="docs" path="../../docs"/> - <source id="main"> + <source id="main" excludes="org/jboss/aop/hook/JRockit*"> <include component="common"/> <include component="container"/> <include component="qdox"/> |
From: Kabir K. <kk...@jb...> - 2005-07-26 10:19:48
|
User: kkhan Date: 05/07/26 06:18:42 Modified: jboss-aop .cvsignore Log: Split out Instrumentor into Classic (what we had before) and for GeneratedAdvisor (new stuff). Created GeneratedClassAdvisor. Split MethodExecutionTransformer into subclasses for optimized, nonoptimized and generated. Added some of the basic funtionality for generated. Split ConstructorExecutionTransformer into subclasses for optimized and nonoptimized Revision Changes Path 1.6 +1 -0 jboss-aop/.cvsignore (In the diff below, changes in quantity of whitespace are not shown.) Index: .cvsignore =================================================================== RCS file: /cvsroot/jboss/jboss-aop/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -b -r1.5 -r1.6 --- .cvsignore 16 Jun 2005 11:10:13 -0000 1.5 +++ .cvsignore 26 Jul 2005 10:18:42 -0000 1.6 @@ -1,3 +1,4 @@ output build.log TEST-org.jboss.test.aop.*.txt +junit*.properties |
From: Kabir K. <kk...@jb...> - 2005-08-04 15:24:32
|
User: kkhan Date: 05/08/04 11:23:18 Modified: jboss-aop build.xml Log: Initial checkin of the generated advisors stuff. This involves refactoring of the Instrumentor/XXXTransformers into what we had before (ClassicInstrumentor, NonOptimizedXXXTransformer and OptimizedXXXTransformer) and new GeneratedAdvisorInstrumentor + GeneratedAdvisorXXXTransformer The old stuff should be fine, the generated stuff has not been tested properly yet, getting that working with all the main tests is next on my list. Revision Changes Path 1.85 +136 -111 jboss-aop/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jboss-aop/build.xml,v retrieving revision 1.84 retrieving revision 1.85 diff -u -b -r1.84 -r1.85 --- build.xml 11 Jul 2005 16:29:46 -0000 1.84 +++ build.xml 4 Aug 2005 15:23:18 -0000 1.85 @@ -14,7 +14,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.84 2005/07/11 16:29:46 kkhan Exp $ --> +<!-- $Id: build.xml,v 1.85 2005/08/04 15:23:18 kkhan Exp $ --> <project default="main" name="JBoss/AOP"> @@ -86,8 +86,7 @@ <path refid="junit.junit.classpath"/> </path> - <!--<property name="jrockit.home" value="C:/Java/jdk/jrockit-j2sdk1.4.2_05"/>--> - <property name="jrockit.home" value="C:/Java/jdk/jrockit-j2sdk1.4.2_05"/> + <property name="jrockit.home" value="C:/jdk/jrockit-j2sdk1.4.2_05"/> <available file="${jrockit.home}/jre/lib/managementapi.jar" property="JROCKIT_AVAILABLE"/> @@ -569,6 +568,8 @@ <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"/> <delete dir="${build.tests.classes}/org/jboss/test"/> <antcall target="bootclasspath-tests" inheritRefs="true"/> @@ -1823,4 +1824,28 @@ </aopc> </target> + <target name="precompiled-genadvisor-tests" depends="compile-test-classes"> + <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/> + <aopc compilerclasspathref="aop.task.classpath" instrumentor="org.jboss.aop.instrument.GeneratedAdvisorInstrumentor" verbose="true"> + <classpath refid="aop.task.classpath"/> + <classpath path="${build.tests.classes}"/> + <src path="${build.tests.classes}"/> + <include name="org/jboss/test/aop/construction/**"/> + <aoppath path="${source.res}/test/construction/jboss-aop.xml"/> + </aopc> + + <junit printsummary="yes" fork="no" haltonfailure="no"> + <sysproperty key="jboss.aop.path" value="${source.res}/test/construction/jboss-aop.xml"/> + <sysproperty key="jboss.aop.verbose" value="true"/> + <classpath> + <path refid="test.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter type="plain"/> + <test fork="yes" name="org.jboss.test.aop.construction.ConstructionTester"/> + </junit> + + + </target> </project> |
From: Kabir K. <kk...@jb...> - 2005-08-04 19:33:01
|
User: kkhan Date: 05/08/04 15:31:48 Modified: jboss-aop build.xml Log: Make build in JDK 1.4 Revision Changes Path 1.86 +1 -3 jboss-aop/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jboss-aop/build.xml,v retrieving revision 1.85 retrieving revision 1.86 diff -u -b -r1.85 -r1.86 --- build.xml 4 Aug 2005 15:23:18 -0000 1.85 +++ build.xml 4 Aug 2005 19:31:48 -0000 1.86 @@ -14,7 +14,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.85 2005/08/04 15:23:18 kkhan Exp $ --> +<!-- $Id: build.xml,v 1.86 2005/08/04 19:31:48 kkhan Exp $ --> <project default="main" name="JBoss/AOP"> @@ -1845,7 +1845,5 @@ <formatter type="plain"/> <test fork="yes" name="org.jboss.test.aop.construction.ConstructionTester"/> </junit> - - </target> </project> |
From: Kabir K. <kk...@jb...> - 2005-08-08 15:56:06
|
User: kkhan Date: 05/08/08 11:54:51 Modified: jboss-aop build.xml Log: Move HelperFieldName from Instrumentor to ClassicInstrumentor Fixes to get some of the tests working with generated advisors (per instance tests will fail until that has been implemented): Handle Mixins in the generated stuff Override getCFlowStack() and attachMetadata() in Domain Revision Changes Path 1.87 +98 -3 jboss-aop/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jboss-aop/build.xml,v retrieving revision 1.86 retrieving revision 1.87 diff -u -b -r1.86 -r1.87 --- build.xml 4 Aug 2005 19:31:48 -0000 1.86 +++ build.xml 8 Aug 2005 15:54:51 -0000 1.87 @@ -14,7 +14,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.86 2005/08/04 19:31:48 kkhan Exp $ --> +<!-- $Id: build.xml,v 1.87 2005/08/08 15:54:51 kkhan Exp $ --> <project default="main" name="JBoss/AOP"> @@ -1826,14 +1826,49 @@ <target name="precompiled-genadvisor-tests" depends="compile-test-classes"> <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/> - <aopc compilerclasspathref="aop.task.classpath" instrumentor="org.jboss.aop.instrument.GeneratedAdvisorInstrumentor" verbose="true"> + <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"/> + <classpath path="${build.tests.classes}"/> + <src path="${source.tests.java}"/> + <include name="org/jboss/test/aop/annotationc/*.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"/> + </annotationc> + + <aopc compilerclasspathref="aop.task.classpath" instrumentor="org.jboss.aop.instrument.GeneratedAdvisorInstrumentor"> + <classpath refid="aop.task.classpath"/> + <classpath path="${build.tests.classes}"/> + <src path="${build.tests.classes}"/> + <include name="org/jboss/test/aop/basic/**"/> + <aoppath path="${source.res}/test/basic/jboss-aop.xml"/> + </aopc> + <junit printsummary="yes" fork="no" haltonfailure="no"> + <sysproperty key="jboss.aop.path" value="${source.res}/test/basic/jboss-aop.xml"/> + <classpath> + <path refid="test.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter type="plain"/> + <test fork="yes" name="org.jboss.test.aop.basic.AOPTester"/> + </junit> + + <aopc compilerclasspathref="aop.task.classpath" instrumentor="org.jboss.aop.instrument.GeneratedAdvisorInstrumentor"> <classpath refid="aop.task.classpath"/> <classpath path="${build.tests.classes}"/> <src path="${build.tests.classes}"/> <include name="org/jboss/test/aop/construction/**"/> <aoppath path="${source.res}/test/construction/jboss-aop.xml"/> </aopc> - <junit printsummary="yes" fork="no" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/construction/jboss-aop.xml"/> <sysproperty key="jboss.aop.verbose" value="true"/> @@ -1845,5 +1880,65 @@ <formatter type="plain"/> <test fork="yes" name="org.jboss.test.aop.construction.ConstructionTester"/> </junit> + + <aopc compilerclasspathref="aop.task.classpath" instrumentor="org.jboss.aop.instrument.GeneratedAdvisorInstrumentor"> + <classpath refid="aop.task.classpath"/> + <classpath path="${build.tests.classes}"/> + <src path="${build.tests.classes}"/> + <include name="org/jboss/test/aop/annotatedparams/**"/> + <aoppath path="${source.res}/test/annotatedparams/jboss-aop.xml"/> + </aopc> + + <junit printsummary="yes" fork="no" haltonfailure="no"> + <sysproperty key="jboss.aop.path" value="${source.res}/test/annotatedparams/jboss-aop.xml"/> + <classpath> + <path refid="test.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter type="plain"/> + <test fork="yes" name="org.jboss.test.aop.annotatedparams.AnnotatedParamsTester"/> + </junit> + + <aopc compilerclasspathref="aop.task.classpath" instrumentor="org.jboss.aop.instrument.GeneratedAdvisorInstrumentor"> + <classpath refid="aop.task.classpath"/> + <classpath path="${build.tests.classes}"/> + <src path="${build.tests.classes}"/> + <include name="org/jboss/test/aop/regression/**"/> + <aoppath path="${source.res}/test/regression/jboss-aop.xml"/> + </aopc> + + <junit printsummary="yes" fork="no" haltonfailure="no"> + <sysproperty key="jboss.aop.path" value="${source.res}/test/regression/jboss-aop.xml"/> + <classpath> + <path refid="test.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter type="plain"/> + <test fork="yes" name="org.jboss.test.aop.regression.annotatedIntroduction.AOPTester"/> + <test fork="yes" name="org.jboss.test.aop.regression.statictest.AOPTester"/> + <test fork="yes" name="org.jboss.test.aop.regression.inheritedmcall.AOPTester"/> + </junit> + + <aopc compilerclasspathref="aop.task.classpath" instrumentor="org.jboss.aop.instrument.GeneratedAdvisorInstrumentor"> + <classpath refid="aop.task.classpath"/> + <classpath path="${build.tests.classes}"/> + <src path="${build.tests.classes}"/> + <include name="org/jboss/test/aop/callerscope/**"/> + <aoppath path="${source.res}/test/callerscope/jboss-aop.xml"/> + </aopc> + + <junit printsummary="yes" fork="no" haltonfailure="no"> + <sysproperty key="jboss.aop.path" value="${source.res}/test/callerscope/jboss-aop.xml"/> + <classpath> + <path refid="test.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter type="plain"/> + <test fork="yes" name="org.jboss.test.aop.callerscope.CallerScopeTestCase"/> + </junit> + </target> </project> |
From: Ruel L. <rue...@jb...> - 2005-08-11 16:43:30
|
User: rloehr Date: 05/08/11 12:42:12 Modified: jboss-aop build.xml Log: JBBUILD-127 - prep build files for thirdparty build. Changed hardcoding of xdoclet lib path to property defined in libraries.ent. Revision Changes Path 1.88 +2 -2 jboss-aop/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jboss-aop/build.xml,v retrieving revision 1.87 retrieving revision 1.88 diff -u -b -r1.87 -r1.88 --- build.xml 8 Aug 2005 15:54:51 -0000 1.87 +++ build.xml 11 Aug 2005 16:42:12 -0000 1.88 @@ -14,7 +14,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.87 2005/08/08 15:54:51 kkhan Exp $ --> +<!-- $Id: build.xml,v 1.88 2005/08/11 16:42:12 rloehr Exp $ --> <project default="main" name="JBoss/AOP"> @@ -181,7 +181,7 @@ <!-- xdoclet --> <path id="xdoclet.task.classpath"> <path refid="javac.classpath"/> - <fileset dir="${project.thirdparty}/xdoclet-xdoclet/lib"> + <fileset dir="${xdoclet.xdoclet.lib}"> <include name="**/*.jar"/> </fileset> </path> |
From: Kabir K. <kk...@jb...> - 2005-08-14 13:09:42
|
User: kkhan Date: 05/08/14 09:08:13 Modified: jboss-aop build.xml Log: Generated ClassAdvisor just uses main AspectManager, it no longer creates its own domain. Adapter for InstanceAdvisor in the GeneratedInstanceAdvisors, it does not "work" yet, but we can now run with PER_INSTANCE and PER_JOINPOINT scoped interceptors. Added some dynamic tests. TBD Make generated instance advisors use Domain and test dynamic additions of interceptors per instance (one test in basic.AOPTester tries this and fails at the moment when using dynamic stuff) Revision Changes Path 1.89 +60 -2 jboss-aop/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jboss-aop/build.xml,v retrieving revision 1.88 retrieving revision 1.89 diff -u -b -r1.88 -r1.89 --- build.xml 11 Aug 2005 16:42:12 -0000 1.88 +++ build.xml 14 Aug 2005 13:08:13 -0000 1.89 @@ -14,7 +14,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.88 2005/08/11 16:42:12 rloehr Exp $ --> +<!-- $Id: build.xml,v 1.89 2005/08/14 13:08:13 kkhan Exp $ --> <project default="main" name="JBoss/AOP"> @@ -1848,6 +1848,44 @@ <classpath refid="aop.task.classpath"/> <classpath path="${build.tests.classes}"/> <src path="${build.tests.classes}"/> + <include name="org/jboss/test/aop/dynamicgenadvisor/**"/> + <aoppath path="${source.res}/test/dynamicgenadvisor/jboss-aop.xml"/> + </aopc> + + <junit printsummary="yes" fork="no" haltonfailure="no"> + <sysproperty key="jboss.aop.path" value="${source.res}/test/dynamicgenadvisor/jboss-aop.xml"/> + <classpath> + <path refid="test.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter type="plain"/> + <test fork="yes" name="org.jboss.test.aop.dynamicgenadvisor.DynamicTester"/> + </junit> + + <aopc compilerclasspathref="aop.task.classpath" instrumentor="org.jboss.aop.instrument.GeneratedAdvisorInstrumentor"> + <classpath refid="aop.task.classpath"/> + <classpath path="${build.tests.classes}"/> + <src path="${build.tests.classes}"/> + <include name="org/jboss/test/aop/beanstyleconfig/**"/> + <aoppath path="${source.res}/test/beanstyleconfig/jboss-aop.xml"/> + </aopc> + + <junit printsummary="yes" fork="no" haltonfailure="no"> + <sysproperty key="jboss.aop.path" value="${source.res}/test/beanstyleconfig/jboss-aop.xml"/> + <classpath> + <path refid="test.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter type="plain"/> + <test fork="yes" name="org.jboss.test.aop.beanstyleconfig.ConfigTester"/> + </junit> + + <aopc compilerclasspathref="aop.task.classpath" instrumentor="org.jboss.aop.instrument.GeneratedAdvisorInstrumentor"> + <classpath refid="aop.task.classpath"/> + <classpath path="${build.tests.classes}"/> + <src path="${build.tests.classes}"/> <include name="org/jboss/test/aop/basic/**"/> <aoppath path="${source.res}/test/basic/jboss-aop.xml"/> </aopc> @@ -1940,5 +1978,25 @@ <test fork="yes" name="org.jboss.test.aop.callerscope.CallerScopeTestCase"/> </junit> + <aopc compilerclasspathref="aop.task.classpath" instrumentor="org.jboss.aop.instrument.GeneratedAdvisorInstrumentor"> + <classpath refid="aop.task.classpath"/> + <classpath path="${build.tests.classes}"/> + <src path="${build.tests.classes}"/> + <include name="org/jboss/test/aop/introduction/**"/> + <aoppath path="${source.res}/test/introduction/introduction-aop.xml"/> + </aopc> + + <junit printsummary="yes" fork="no" haltonfailure="no"> + <sysproperty key="jboss.aop.path" value="${source.res}/test/introduction/introduction-aop.xml"/> + <classpath> + <path refid="test.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter type="plain"/> + <test fork="yes" name="org.jboss.test.aop.introduction.IntroductionTester"/> + </junit> + </target> + </project> |
From: Kabir K. <kk...@jb...> - 2005-08-14 16:03:18
|
User: kkhan Date: 05/08/14 12:01:55 Modified: jboss-aop build.xml Log: Added rest of tests to precompiled-genadvisor-tests target Revision Changes Path 1.90 +77 -1 jboss-aop/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jboss-aop/build.xml,v retrieving revision 1.89 retrieving revision 1.90 diff -u -b -r1.89 -r1.90 --- build.xml 14 Aug 2005 13:08:13 -0000 1.89 +++ build.xml 14 Aug 2005 16:01:55 -0000 1.90 @@ -14,7 +14,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.89 2005/08/14 13:08:13 kkhan Exp $ --> +<!-- $Id: build.xml,v 1.90 2005/08/14 16:01:55 kkhan Exp $ --> <project default="main" name="JBoss/AOP"> @@ -1997,6 +1997,82 @@ <test fork="yes" name="org.jboss.test.aop.introduction.IntroductionTester"/> </junit> + <aopc compilerclasspathref="aop.task.classpath" instrumentor="org.jboss.aop.instrument.GeneratedAdvisorInstrumentor"> + <classpath refid="aop.task.classpath"/> + <classpath path="${build.tests.classes}"/> + <src path="${build.tests.classes}"/> + <include name="org/jboss/test/aop/override/**"/> + <aoppath path="${source.res}/test/override/jboss-aop.xml"/> + </aopc> + + <junit printsummary="yes" fork="no" haltonfailure="no"> + <sysproperty key="jboss.aop.path" value="${source.res}/test/override/jboss-aop.xml"/> + <classpath> + <path refid="test.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter type="plain"/> + <test fork="yes" name="org.jboss.test.aop.override.OverrideTestCase"/> + </junit> + + <aopc compilerclasspathref="aop.task.classpath" instrumentor="org.jboss.aop.instrument.GeneratedAdvisorInstrumentor"> + <classpath refid="aop.task.classpath"/> + <classpath path="${build.tests.classes}"/> + <src path="${build.tests.classes}"/> + <include name="org/jboss/test/aop/args/**"/> + <aoppath path="${source.res}/test/args/jboss-aop.xml"/> + </aopc> + + <junit printsummary="yes" fork="no" haltonfailure="no"> + <sysproperty key="jboss.aop.path" value="${source.res}/test/args/jboss-aop.xml"/> + <classpath> + <path refid="test.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter type="plain"/> + <test fork="yes" name="org.jboss.test.aop.args.ArgsTestCase"/> + </junit> + + <aopc compilerclasspathref="aop.task.classpath" instrumentor="org.jboss.aop.instrument.GeneratedAdvisorInstrumentor"> + <classpath refid="aop.task.classpath"/> + <classpath path="${build.tests.classes}"/> + <src path="${build.tests.classes}"/> + <include name="org/jboss/test/aop/reflection/**"/> + <aoppath path="${source.res}/test/reflection/jboss-aop.xml"/> + </aopc> + + <junit printsummary="yes" fork="no" haltonfailure="no"> + <sysproperty key="jboss.aop.path" value="${source.res}/test/reflection/jboss-aop.xml"/> + <classpath> + <path refid="test.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter type="plain"/> + <test fork="yes" name="org.jboss.test.aop.reflection.ReflectionTester"/> + </junit> + + <aopc compilerclasspathref="aop.task.classpath" instrumentor="org.jboss.aop.instrument.GeneratedAdvisorInstrumentor"> + <classpath refid="aop.task.classpath"/> + <classpath path="${build.tests.classes}"/> + <src path="${build.tests.classes}"/> + <include name="org/jboss/test/aop/perjoinpoint/**"/> + <aoppath path="${source.res}/test/perjoinpoint/jboss-aop.xml"/> + </aopc> + + <junit printsummary="yes" fork="no" haltonfailure="no"> + <sysproperty key="jboss.aop.path" value="${source.res}/test/perjoinpoint/jboss-aop.xml"/> + <classpath> + <path refid="test.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter type="plain"/> + <test fork="yes" name="org.jboss.test.aop.perjoinpoint.PerJoinpointTester"/> + </junit> + </target> </project> |
From: Kabir K. <kk...@jb...> - 2005-08-18 19:26:19
|
User: kkhan Date: 05/08/18 15:25:45 Modified: jboss-aop build.xml Log: Make Advisor, ClassAdvisor and Domain interfaces, as well as a new AOPManager interface for AspectManager and Domain to extend Revision Changes Path 1.91 +2 -2 jboss-aop/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jboss-aop/build.xml,v retrieving revision 1.90 retrieving revision 1.91 diff -u -b -r1.90 -r1.91 --- build.xml 14 Aug 2005 16:01:55 -0000 1.90 +++ build.xml 18 Aug 2005 19:25:45 -0000 1.91 @@ -14,7 +14,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.90 2005/08/14 16:01:55 kkhan Exp $ --> +<!-- $Id: build.xml,v 1.91 2005/08/18 19:25:45 kkhan Exp $ --> <project default="main" name="JBoss/AOP"> @@ -513,7 +513,7 @@ <delete dir="${build.tests.classes}"/> </target> - <target name="clean-tests"> + <target name="clean-tests" depends="init"> <delete dir="${build.tests.classes}"/> </target> |
From: Ruel L. <rue...@jb...> - 2005-08-24 18:58:04
|
User: rloehr Date: 05/08/24 14:58:00 Modified: jboss-aop Tag: REPO_BRANCH_HEAD build.xml Log: JBBUILD-132- merge thidparty build into buildmagic Revision Changes Path No revision No revision 1.91.2.1 +2 -2 jboss-aop/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jboss-aop/build.xml,v retrieving revision 1.91 retrieving revision 1.91.2.1 diff -u -b -r1.91 -r1.91.2.1 --- build.xml 18 Aug 2005 19:25:45 -0000 1.91 +++ build.xml 24 Aug 2005 18:58:00 -0000 1.91.2.1 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE project [ <!ENTITY buildmagic SYSTEM "../tools/etc/buildmagic/buildmagic.ent"> - <!ENTITY libraries SYSTEM "../tools/etc/buildmagic/libraries.ent"> + <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent"> <!ENTITY modules SYSTEM "../tools/etc/buildmagic/modules.ent"> ]> @@ -14,7 +14,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.91 2005/08/18 19:25:45 kkhan Exp $ --> +<!-- $Id: build.xml,v 1.91.2.1 2005/08/24 18:58:00 rloehr Exp $ --> <project default="main" name="JBoss/AOP"> |
From: Ruel L. <rue...@jb...> - 2005-08-29 15:49:44
|
User: rloehr Date: 05/08/29 11:49:11 Modified: jboss-aop build.xml Log: JBBUILD-89 - change over to repository build Revision Changes Path 1.92 +2 -2 jboss-aop/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jboss-aop/build.xml,v retrieving revision 1.91 retrieving revision 1.92 diff -u -b -r1.91 -r1.92 --- build.xml 18 Aug 2005 19:25:45 -0000 1.91 +++ build.xml 29 Aug 2005 15:49:11 -0000 1.92 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE project [ <!ENTITY buildmagic SYSTEM "../tools/etc/buildmagic/buildmagic.ent"> - <!ENTITY libraries SYSTEM "../tools/etc/buildmagic/libraries.ent"> + <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent"> <!ENTITY modules SYSTEM "../tools/etc/buildmagic/modules.ent"> ]> @@ -14,7 +14,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.91 2005/08/18 19:25:45 kkhan Exp $ --> +<!-- $Id: build.xml,v 1.92 2005/08/29 15:49:11 rloehr Exp $ --> <project default="main" name="JBoss/AOP"> |
From: Adrian B. <adr...@jb...> - 2005-08-29 17:47:18
|
User: adrian Date: 05/08/29 13:47:16 Modified: jboss-aop .classpath Log: Cutover the eclipse build to the new build, still some issues. Revision Changes Path 1.26 +2 -2 jboss-aop/.classpath (In the diff below, changes in quantity of whitespace are not shown.) Index: .classpath =================================================================== RCS file: /cvsroot/jboss/jboss-aop/.classpath,v retrieving revision 1.25 retrieving revision 1.26 diff -u -b -r1.25 -r1.26 --- .classpath 4 Jul 2005 11:27:10 -0000 1.25 +++ .classpath 29 Aug 2005 17:47:16 -0000 1.26 @@ -7,11 +7,11 @@ <classpathentry kind="src" path="/common"/> <classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/> <classpathentry kind="lib" path="/thirdparty/javassist/lib/javassist.jar"/> - <classpathentry kind="lib" path="/thirdparty/dom4j-dom4j/lib/dom4j.jar"/> + <classpathentry kind="lib" path="/thirdparty/dom4j/lib/dom4j.jar"/> <classpathentry kind="lib" path="/thirdparty/trove/lib/trove.jar"/> <classpathentry kind="lib" path="/tools/lib/ant.jar"/> <classpathentry kind="lib" path="/thirdparty/qdox/lib/qdox.jar"/> - <classpathentry kind="lib" path="/thirdparty/junit-junit/lib/junit.jar"/> + <classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/> <classpathentry kind="src" path="/container"/> <classpathentry kind="output" path="output/eclipse-classes"/> </classpath> |
From: Kabir K. <kk...@jb...> - 2005-09-13 19:37:35
|
User: kkhan Date: 05/09/13 15:37:33 Modified: jboss-aop Tag: Branch_AOP_1_3 build.xml Log: JBAOP-167 Make it possible to have metadata method expressions taking array parameters and returning arrays Revision Changes Path No revision No revision 1.80.2.4 +44 -40 jboss-aop/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jboss-aop/build.xml,v retrieving revision 1.80.2.3 retrieving revision 1.80.2.4 diff -u -b -r1.80.2.3 -r1.80.2.4 --- build.xml 25 Jul 2005 16:02:53 -0000 1.80.2.3 +++ build.xml 13 Sep 2005 19:37:33 -0000 1.80.2.4 @@ -14,7 +14,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.80.2.3 2005/07/25 16:02:53 bill Exp $ --> +<!-- $Id: build.xml,v 1.80.2.4 2005/09/13 19:37:33 kkhan Exp $ --> <project default="main" name="JBoss/AOP"> @@ -655,6 +655,7 @@ </classpath> <test fork="yes" name="org.jboss.test.aop.regression.annotatedIntroduction.AOPTester"/> <test fork="yes" name="org.jboss.test.aop.regression.statictest.AOPTester"/> + <test fork="yes" name="org.jboss.test.aop.regression.arraymethodparam.ArrayMethodParamTestCase"/> </junit> </target> @@ -830,6 +831,7 @@ <test fork="yes" name="org.jboss.test.aop.regression.annotatedIntroduction.AOPTester"/> <test fork="yes" name="org.jboss.test.aop.regression.statictest.AOPTester"/> <test fork="yes" name="org.jboss.test.aop.regression.inheritedmcall.AOPTester"/> + <test fork="yes" name="org.jboss.test.aop.regression.arraymethodparam.ArrayMethodParamTestCase"/> </junit> <junit printsummary="yes" fork="no" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/args/jboss-aop.xml"/> @@ -1118,6 +1120,7 @@ <test fork="yes" name="org.jboss.test.aop.regression.annotatedIntroduction.AOPTester"/> <test fork="yes" name="org.jboss.test.aop.regression.statictest.AOPTester"/> <test fork="yes" name="org.jboss.test.aop.regression.inheritedmcall.AOPTester"/> + <test fork="yes" name="org.jboss.test.aop.regression.arraymethodparam.ArrayMethodParamTestCase"/> </junit> <junit printsummary="yes" fork="no" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/args/jboss-aop.xml"/> @@ -1360,6 +1363,7 @@ </classpath> <test fork="yes" name="org.jboss.test.aop.regression.annotatedIntroduction.AOPTester"/> <test fork="yes" name="org.jboss.test.aop.regression.statictest.AOPTester"/> + <test fork="yes" name="org.jboss.test.aop.regression.arraymethodparam.ArrayMethodParamTestCase"/> </junit> <junit printsummary="yes" fork="yes" haltonfailure="no" jvm="${jrockit.home}/bin/java"> <jvmarg value="-Xmanagement:class=org.jboss.aop.hook.JRockitClassPreProcessor"/> |
From: Kabir K. <kk...@jb...> - 2005-09-15 16:54:34
|
User: kkhan Date: 05/09/15 12:54:29 Modified: jboss-aop build.xml Log: JBAOP-167 Make it possible to have metadata method expressions taking array parameters and returning arrays Revision Changes Path 1.93 +6 -1 jboss-aop/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jboss-aop/build.xml,v retrieving revision 1.92 retrieving revision 1.93 diff -u -b -r1.92 -r1.93 --- build.xml 29 Aug 2005 15:49:11 -0000 1.92 +++ build.xml 15 Sep 2005 16:54:29 -0000 1.93 @@ -14,7 +14,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.92 2005/08/29 15:49:11 rloehr Exp $ --> +<!-- $Id: build.xml,v 1.93 2005/09/15 16:54:29 kkhan Exp $ --> <project default="main" name="JBoss/AOP"> @@ -656,6 +656,7 @@ </classpath> <test fork="yes" name="org.jboss.test.aop.regression.annotatedIntroduction.AOPTester"/> <test fork="yes" name="org.jboss.test.aop.regression.statictest.AOPTester"/> + <test fork="yes" name="org.jboss.test.aop.regression.arraymethodparam.ArrayMethodParamTestCase"/> </junit> </target> @@ -832,6 +833,7 @@ <test fork="yes" name="org.jboss.test.aop.regression.annotatedIntroduction.AOPTester"/> <test fork="yes" name="org.jboss.test.aop.regression.statictest.AOPTester"/> <test fork="yes" name="org.jboss.test.aop.regression.inheritedmcall.AOPTester"/> + <test fork="yes" name="org.jboss.test.aop.regression.arraymethodparam.ArrayMethodParamTestCase"/> </junit> <junit printsummary="yes" fork="no" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/args/jboss-aop.xml"/> @@ -1120,6 +1122,7 @@ <test fork="yes" name="org.jboss.test.aop.regression.annotatedIntroduction.AOPTester"/> <test fork="yes" name="org.jboss.test.aop.regression.statictest.AOPTester"/> <test fork="yes" name="org.jboss.test.aop.regression.inheritedmcall.AOPTester"/> + <test fork="yes" name="org.jboss.test.aop.regression.arraymethodparam.ArrayMethodParamTestCase"/> </junit> <junit printsummary="yes" fork="no" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/args/jboss-aop.xml"/> @@ -1362,6 +1365,7 @@ </classpath> <test fork="yes" name="org.jboss.test.aop.regression.annotatedIntroduction.AOPTester"/> <test fork="yes" name="org.jboss.test.aop.regression.statictest.AOPTester"/> + <test fork="yes" name="org.jboss.test.aop.regression.arraymethodparam.ArrayMethodParamTestCase"/> </junit> <junit printsummary="yes" fork="yes" haltonfailure="no" jvm="${jrockit.home}/bin/java"> <jvmarg value="-Xmanagement:class=org.jboss.aop.hook.JRockitClassPreProcessor"/> @@ -1957,6 +1961,7 @@ <test fork="yes" name="org.jboss.test.aop.regression.annotatedIntroduction.AOPTester"/> <test fork="yes" name="org.jboss.test.aop.regression.statictest.AOPTester"/> <test fork="yes" name="org.jboss.test.aop.regression.inheritedmcall.AOPTester"/> + <test fork="yes" name="org.jboss.test.aop.regression.arraymethodparam.ArrayMethodParamTestCase"/> </junit> <aopc compilerclasspathref="aop.task.classpath" instrumentor="org.jboss.aop.instrument.GeneratedAdvisorInstrumentor"> |
From: Kabir K. <kk...@jb...> - 2005-09-20 10:36:07
|
User: kkhan Date: 05/09/20 06:35:58 Modified: jboss-aop build.xml Log: Set up generated advisor wrappers for caller pointcuts, so I can implement the Joinpoint swapping. More tests for caller invocations Revision Changes Path 1.94 +58 -1 jboss-aop/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jboss-aop/build.xml,v retrieving revision 1.93 retrieving revision 1.94 diff -u -b -r1.93 -r1.94 --- build.xml 15 Sep 2005 16:54:29 -0000 1.93 +++ build.xml 20 Sep 2005 10:35:58 -0000 1.94 @@ -14,7 +14,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.93 2005/09/15 16:54:29 kkhan Exp $ --> +<!-- $Id: build.xml,v 1.94 2005/09/20 10:35:58 kkhan Exp $ --> <project default="main" name="JBoss/AOP"> @@ -800,6 +800,25 @@ <aoppath path="${source.res}/test/instanceofannotated/jboss-aop.xml"/> </aopc> + <aopc compilerclasspathref="aop.task.classpath"> + <classpath refid="aop.task.classpath"/> + <classpath path="${build.tests.classes}"/> + <src path="${build.tests.classes}"/> + <include name="org/jboss/test/aop/callerargs/**"/> + <aoppath path="${source.res}/test/callerargs/jboss-aop.xml"/> + </aopc> + + <junit printsummary="yes" fork="no" haltonfailure="no"> + <sysproperty key="jboss.aop.path" value="${source.res}/test/callerargs/jboss-aop.xml"/> + <classpath> + <path refid="test.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter type="plain"/> + <test fork="yes" name="org.jboss.test.aop.callerargs.CallerArgsTestCase"/> + </junit> + <junit printsummary="yes" fork="no" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/override/jboss-aop.xml"/> <classpath> @@ -1100,6 +1119,25 @@ <aoppath path="${source.res}/test/instanceofannotated/jboss-aop.xml"/> </aopc> + <aopc compilerclasspathref="aop.task.classpath"> + <classpath refid="aop.task.classpath"/> + <classpath path="${build.tests.classes}"/> + <src path="${build.tests.classes}"/> + <include name="org/jboss/test/aop/callerargs/**"/> + <aoppath path="${source.res}/test/callerargs/jboss-aop.xml"/> + </aopc> + + <junit printsummary="yes" fork="no" haltonfailure="no"> + <sysproperty key="jboss.aop.path" value="${source.res}/test/callerargs/jboss-aop.xml"/> + <classpath> + <path refid="test.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter type="plain"/> + <test fork="yes" name="org.jboss.test.aop.callerargs.CallerArgsTestCase"/> + </junit> + <junit printsummary="yes" fork="no" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/construction/jboss-aop.xml"/> <classpath> @@ -1852,6 +1890,25 @@ <classpath refid="aop.task.classpath"/> <classpath path="${build.tests.classes}"/> <src path="${build.tests.classes}"/> + <include name="org/jboss/test/aop/callerargs/**"/> + <aoppath path="${source.res}/test/callerargs/jboss-aop.xml"/> + </aopc> + + <junit printsummary="yes" fork="no" haltonfailure="no"> + <sysproperty key="jboss.aop.path" value="${source.res}/test/callerargs/jboss-aop.xml"/> + <classpath> + <path refid="test.classpath"/> + <pathelement location="${build.tests.classes}"/> + <pathelement location="docs"/> + </classpath> + <formatter type="plain"/> + <test fork="yes" name="org.jboss.test.aop.callerargs.CallerArgsTestCase"/> + </junit> + + <aopc compilerclasspathref="aop.task.classpath" instrumentor="org.jboss.aop.instrument.GeneratedAdvisorInstrumentor"> + <classpath refid="aop.task.classpath"/> + <classpath path="${build.tests.classes}"/> + <src path="${build.tests.classes}"/> <include name="org/jboss/test/aop/dynamicgenadvisor/**"/> <aoppath path="${source.res}/test/dynamicgenadvisor/jboss-aop.xml"/> </aopc> |