[jboss-cvs] JBossAS SVN: r57688 - in projects/aop/trunk: aop aop/src/main/org/jboss/aop aop/src/main/org/jboss/aop/advice aop/src/main/org/jboss/aop/annotation aop/src/main/org/jboss/aop/annotation/compiler aop/src/main/org/jboss/aop/ant aop/src/main/org/jboss/aop/instrument aop/src/main/org/jboss/aop/standalone aop/src/main/org/jboss/aspects aop/src/test/org/jboss/test/aop/annotatedcflow aop/src/test/org/jboss/test/aop/annotateddeclare aop/src/test/org/jboss/test/aop/annotatedparams aop/src/test/org/jboss/test/aop/annotationc aop/src/test/org/jboss/test/aop/implementz aop/src/test/org/jboss/test/aop/instanceofannotated aop/src/test/org/jboss/test/aop/perjoinpoint aop/src/test/org/jboss/test/aop/regression/jbaop248annotationoverride build
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Oct 16 20:16:30 EDT 2006
Author: kabir.khan at jboss.com
Date: 2006-10-16 20:16:03 -0400 (Mon, 16 Oct 2006)
New Revision: 57688
Added:
projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/AOPTransformer.java
projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/Agent.java
projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/InstrumentationAdapter.java
projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/PluggableInstrumentor.java
projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/StandaloneClassPool.java
projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/StandaloneClassPoolFactory.java
Modified:
projects/aop/trunk/aop/.classpath
projects/aop/trunk/aop/base-tests.xml
projects/aop/trunk/aop/build-tests-jdk14.xml
projects/aop/trunk/aop/build-tests-jdk50.xml
projects/aop/trunk/aop/build.xml
projects/aop/trunk/aop/src/main/org/jboss/aop/AnnotationIntroductionDef.java
projects/aop/trunk/aop/src/main/org/jboss/aop/Aspect.java
projects/aop/trunk/aop/src/main/org/jboss/aop/Bind.java
projects/aop/trunk/aop/src/main/org/jboss/aop/CFlowDef.java
projects/aop/trunk/aop/src/main/org/jboss/aop/CFlowStackDef.java
projects/aop/trunk/aop/src/main/org/jboss/aop/DeclareError.java
projects/aop/trunk/aop/src/main/org/jboss/aop/DeclareWarning.java
projects/aop/trunk/aop/src/main/org/jboss/aop/DynamicCFlowDef.java
projects/aop/trunk/aop/src/main/org/jboss/aop/InterceptorDef.java
projects/aop/trunk/aop/src/main/org/jboss/aop/Introduction.java
projects/aop/trunk/aop/src/main/org/jboss/aop/Mixin.java
projects/aop/trunk/aop/src/main/org/jboss/aop/PointcutDef.java
projects/aop/trunk/aop/src/main/org/jboss/aop/Precedence.java
projects/aop/trunk/aop/src/main/org/jboss/aop/PrecedenceAdvice.java
projects/aop/trunk/aop/src/main/org/jboss/aop/PrecedenceInterceptor.java
projects/aop/trunk/aop/src/main/org/jboss/aop/Prepare.java
projects/aop/trunk/aop/src/main/org/jboss/aop/TypeDef.java
projects/aop/trunk/aop/src/main/org/jboss/aop/advice/Scope.java
projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/AnnotationElement.java
projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/compiler/AnnotationDocletTagFactory.java
projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/compiler/ByteCodeAnnotationCompiler.java
projects/aop/trunk/aop/src/main/org/jboss/aop/ant/AnnotationC.java
projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/OptimizedConstructionTransformer.java
projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/OptimizedInvocations.java
projects/aop/trunk/aop/src/main/org/jboss/aspects/Threadbased.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedcflow/AnnotatedCaller.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedcflow/Annotation.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotateddeclare/DeclareAspect.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedparams/Param.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedparams/ParamType.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedparams/Return.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedparams/ReturnType.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotationc/ClassAnnotation.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotationc/MyEnum.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotationc/complex.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotationc/empty.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotationc/single.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/implementz/Annotated.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/implementz/ImplementsInterfaceAnnotated.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/instanceofannotated/AnnotatedInterface.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/instanceofannotated/ClassAnnotation.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/instanceofannotated/InterfaceAnnotation.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/instanceofannotated/Introduced.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/instanceofannotated/Introduced2.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/instanceofannotated/Introduced3.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/instanceofannotated/TypeAnnotation.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/perjoinpoint/ThreadbasedTest.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/regression/jbaop248annotationoverride/Introduced.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/regression/jbaop248annotationoverride/Override.java
projects/aop/trunk/build/
projects/aop/trunk/build/build-thirdparty.xml
Log:
[JBAOP-296] Get AOP build and tests working with JBoss retro.
To build and run tests using JDK 5:
$cd jboss-aop/aop
$build.sh
$build.sh -f build-tests-jdk14.xml tests
$build.sh -f build-tests-jdk50.xml tests
[JBAOP-296] Get AOP build and tests working with JBoss retro.
To build and run tests:
$cd jboss-aop/aop
$build.sh
$build.sh -f build-tests-jdk14.xml tests
$build.sh -f build-tests-jdk50.xml tests
[JBAOP-296] Get AOP build and tests working with JBoss retro.
SVN is broken, so do this in several steps
[JBAOP-296] Get AOP build and tests working with JBoss retro.
SVN is broken, so do this in several steps
Remove things that have been deleted[JBAOP-296] Get AOP build and tests working with JBoss retro.
To build and run tests:
$cd jboss-aop/aop
$build.sh
$build.sh -f build-tests-jdk14.xml tests
$build.sh -f build-tests-jdk50.xml tests
Modified: projects/aop/trunk/aop/.classpath
===================================================================
--- projects/aop/trunk/aop/.classpath 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/.classpath 2006-10-17 00:16:03 UTC (rev 57688)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry excluding="org/jboss/aop/AnnotationIntroductionDef.java|org/jboss/aop/Aspect.java|org/jboss/aop/Bind.java|org/jboss/aop/CFlowDef.java|org/jboss/aop/CFlowStackDef.java|org/jboss/aop/DeclareError.java|org/jboss/aop/DeclareWarning.java|org/jboss/aop/DynamicCFlowDef.java|org/jboss/aop/InterceptorDef.java|org/jboss/aop/Introduction.java|org/jboss/aop/Mixin.java|org/jboss/aop/PointcutDef.java|org/jboss/aop/Precedence.java|org/jboss/aop/PrecedenceAdvice.java|org/jboss/aop/PrecedenceInterceptor.java|org/jboss/aop/Prepare.java|org/jboss/aop/TypeDef.java|org/jboss/aop/advice/Scope.java|org/jboss/aop/annotation/AnnotationElement.java|org/jboss/aop/hook/JRockitClassPreProcessor.java|org/jboss/aop/hook/JRockitPluggableClassPreProcessor.java|org/jboss/aspects/Threadbased.java" kind="src" path="src/main"/>
- <classpathentry kind="src" path="src/jdk15"/>
+ <classpathentry excluding="org/jboss/aop/hook/JRockitClassPreProcessor.java|org/jboss/aop/hook/JRockitPluggableClassPreProcessor.java" kind="src" path="src/main"/>
<classpathentry kind="src" path="src/test"/>
<classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
<classpathentry kind="lib" path="/thirdparty/dom4j/lib/dom4j.jar"/>
Modified: projects/aop/trunk/aop/base-tests.xml
===================================================================
--- projects/aop/trunk/aop/base-tests.xml 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/base-tests.xml 2006-10-17 00:16:03 UTC (rev 57688)
@@ -67,14 +67,12 @@
<antcall target="${test-target}" inheritRefs="true">
<param name="test" value="callerargs"/>
</antcall>
+ <antcall target="${test-target}" inheritRefs="true">
+ <param name="test" value="field"/>
+ </antcall>
<!-- Tests with special requirements for parameters -->
<antcall target="${test-target}" inheritRefs="true">
- <param name="test" value="annotated"/>
- <param name="no.xml" value="true"/>
- <param name="use.annotations" value="true"/>
- </antcall>
- <antcall target="${test-target}" inheritRefs="true">
<param name="test" value="jdk15annotated"/>
<param name="no.xml" value="true"/>
<param name="use.annotations" value="true"/>
Modified: projects/aop/trunk/aop/build-tests-jdk14.xml
===================================================================
--- projects/aop/trunk/aop/build-tests-jdk14.xml 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/build-tests-jdk14.xml 2006-10-17 00:16:03 UTC (rev 57688)
@@ -79,18 +79,22 @@
&modules;
<!-- The combined library classpath -->
<path id="library.classpath">
+ <path refid="apache.ant.classpath"/>
<path refid="apache.log4j.classpath"/>
+ <path refid="javassist.classpath"/>
+ <path refid="jboss.profiler.jvmti.classpath"/>
+ <path refid="jboss/common.core.classpath"/>
+ <path refid="jboss/common.logging.log4j.classpath"/>
+ <path refid="jboss/common.logging.jdk.classpath"/>
+ <path refid="jboss/common.logging.spi.classpath"/>
+ <!--<path refid="jboss.microcontainer.classpath"/>-->
+ <path refid="jboss.test14.classpath"/>
+ <path refid="junit.junit.classpath"/>
+ <path refid="oswego.concurrent.classpath"/>
<path refid="qdox.classpath"/>
- <path refid="javassist.classpath"/>
<path refid="trove.classpath"/>
<path refid="xdoclet.xdoclet.classpath"/>
- <path refid="apache.ant.classpath"/>
- <path refid="oswego.concurrent.classpath"/>
- <path refid="junit.junit.classpath"/>
- <path refid="jboss.profiler.jvmti.classpath"/>
- <path refid="jboss.microcontainer.classpath"/>
- <pathelement path="../tools/lib/*.jar"/>
- </path>
+ </path>
<!-- Defines jrockit.home and jdk14.home -->
<property file="local.properties"/>
@@ -106,11 +110,6 @@
<!-- The combined dependent module classpath -->
<path id="dependentmodule.classpath">
- <path refid="jboss.common.core.classpath"/>
- <path refid="jboss.common.logging.spi.classpath"/>
- <path refid="jboss.common.logging.log4j.classpath"/>
- <path refid="jboss.common.logging.jdk.classpath"/>
- <path refid="jboss.test.classpath"/>
</path>
<!-- ===== -->
@@ -119,7 +118,6 @@
<!-- Where source files live -->
<property name="source.tests.java" value="${module.source}/test"/>
- <property name="source15.java" value="${module.source}/jdk15"/>
<property name="source.res" value="${module.source}/resources"/>
<property name="source.stylesheets" value="../testsuite/src/stylesheets"/>
@@ -155,6 +153,7 @@
<pathelement path="${classpath}"/>
<pathelement path="${local.classpath}"/>
<path refid="thirdparty.classpath"/>
+ <path refid="jboss.microcontainer.classpath"/>
<pathelement path="${build.lib}/jboss-aop-jdk50.jar"/>
</path>
@@ -171,7 +170,7 @@
</path>
<path id="jboss.aop.retro.classpath">
- <path refid="jboss.aop.classpath"/>
+ <path refid="jboss.aop14.classpath"/>
<path refid="jbossretrort.classpath"/>
</path>
@@ -179,7 +178,7 @@
<path id="test.classpath">
<path refid="thirdparty.classpath"/>
<path refid="jbossretrort.classpath"/>
- <pathelement path="${build.lib}/jboss-aop.jar"/>
+ <path refid="jboss.aop14.classpath"/>
</path>
<!-- Packages to include when generating api documentation -->
@@ -218,7 +217,9 @@
<include name="**/*.java"/>
<exclude name="org/jboss/test/aop/memoryleaks/**/*.java"/>
</javac>
-
+ </target>
+
+ <target name="retroweave" depends="compile-test-classes">
<mkdir dir="${build.tests.retro}"/>
<taskdef name="retro" classname="org.jboss.ant.tasks.retro.Retro" classpathref="jbossretro.classpath"/>
@@ -295,7 +296,7 @@
<!-- ==================================================================================== -->
<!-- BOOTCLASSPATH-TESTS (JDK 1.4) -->
<!-- ==================================================================================== -->
- <target name="bootclasspath-tests" depends="compile">
+ <target name="bootclasspath-tests" depends="retroweave">
<delete dir="${build.bootclasspath}"/>
<java fork="yes" classname="org.jboss.aop.hook.GenerateInstrumentedClassLoader" jvm="${java14}">
<classpath>
@@ -321,7 +322,7 @@
<!-- ==================================================================================== -->
<!-- GENERATED ADVISOR BOOTCLASSPATH-TESTS (JDK 1.4) -->
<!-- ==================================================================================== -->
- <target name="bootclasspath-genadvisor-tests" depends="compile-test-classes">
+ <target name="bootclasspath-genadvisor-tests" depends="retroweave">
<delete dir="${build.bootclasspath}"/>
<java fork="yes" classname="org.jboss.aop.hook.GenerateInstrumentedClassLoader" jvm="${java14}">
<classpath>
@@ -365,20 +366,20 @@
<property name="bootclasspath" refid="bootclasspath"/>
<!-- Check for jboss-aop.xml override -->
- <condition property="jboss.aop.path" value="-Djboss.aop.path=${aop.xml}">
+ <condition property="jboss.aop.path" value="${aop.xml}">
<isset property="aop.xml"/>
</condition>
<condition property="jboss.aop.path" value="">
<isset property="no.xml"/>
</condition>
- <condition property="jboss.aop.path" value="-Djboss.aop.path=${source.res}/test/${test}/jboss-aop.xml">
+ <condition property="jboss.aop.path" value="${source.res}/test/${test}/jboss-aop.xml">
<not>
<isset property="aop.xml"/>
</not>
</condition>
<!-- Get -Djboss.aop.class.path from passed in parameters -->
- <condition property="jboss.aop.class.path" value="-Djboss.aop.class.path=${build.tests.classes}">
+ <condition property="jboss.aop.class.path" value="${build.tests.classes}">
<isset property="use.annotations"/>
</condition>
<condition property="jboss.aop.class.path" value="">
@@ -400,8 +401,8 @@
<mkdir dir="${build.reports}"/>
<junit printsummary="yes" fork="yes" haltonfailure="no" jvm="${java14}">
<jvmarg value="-Xbootclasspath/p:${bootclasspath}"/>
- <jvmarg value="${jboss.aop.class.path}"/>
- <jvmarg value="${jboss.aop.path}"/>
+ <sysproperty key="jboss.aop.path" value="${jboss.aop.path}"/>
+ <sysproperty key="jboss.aop.class.path" value="${jboss.aop.class.path}"/>
<sysproperty key="jboss.aop.instrumentor" value="${instrumentor}"/>
<sysproperty key="jboss.aop.debug.classes" value="true"/>
<formatter type="plain" extension="-${caller}.txt"/>
@@ -430,7 +431,7 @@
<!-- OPTIMIZED PRECOMPILED TESTS (JDK 1.4) -->
<!-- ==================================================================================== -->
- <target name="precompiled-tests" depends="compile-test-classes">
+ <target name="precompiled-tests" depends="retroweave">
<!-- Add tests in _base-precompiled-tests unless they should only be run in this weaving mode -->
<antcall target="_base-tests" inheritRefs="true">
@@ -456,7 +457,7 @@
<!-- NON OPTIMIZED PRECOMPILED TESTS (JDK 1.4) -->
<!-- ==================================================================================== -->
- <target name="non-optimized-precompiled-tests" depends="compile-test-classes">
+ <target name="non-optimized-precompiled-tests" depends="retroweave">
<!-- Add tests in _base-precompiled-tests unless they should only be run in this weaving mode -->
<antcall target="_base-tests" inheritRefs="true">
@@ -476,7 +477,7 @@
<!-- JDK 1.4 GENERATED ADVISOR PRECOMPILED TESTS -->
<!-- ==================================================================================== -->
- <target name="precompiled-genadvisor-tests" depends="compile-test-classes">
+ <target name="precompiled-genadvisor-tests" depends="retroweave">
<!-- Add tests in _base-precompiled-tests unless they should only be run in this weaving mode -->
<antcall target="_base-tests" inheritRefs="true">
@@ -575,20 +576,20 @@
</aopc>
<!-- Get -Djboss.aop.path from passed in parameters -->
- <condition property="jboss.aop.path" value="-Djboss.aop.path=${aop.xml}">
+ <condition property="jboss.aop.path" value="${aop.xml}">
<isset property="aop.xml"/>
</condition>
<condition property="jboss.aop.path" value="">
<isset property="no.xml"/>
</condition>
- <condition property="jboss.aop.path" value="-Djboss.aop.path=${source.res}/test/${test}/jboss-aop.xml">
+ <condition property="jboss.aop.path" value="${source.res}/test/${test}/jboss-aop.xml">
<not>
<isset property="aop.xml"/>
</not>
</condition>
<!-- Get -Djboss.aop.class.path from passed in parameters -->
- <condition property="jboss.aop.class.path" value="-Djboss.aop.class.path=${build.tests.retro}">
+ <condition property="jboss.aop.class.path" value="${build.tests.retro}">
<isset property="use.annotations"/>
</condition>
<condition property="jboss.aop.class.path" value="">
@@ -601,8 +602,8 @@
<mkdir dir="${build.reports}"/>
<junit printsummary="yes" fork="yes" haltonfailure="no" jvm="${java14}">
- <jvmarg value="${jboss.aop.path}"/>
- <jvmarg value="${jboss.aop.class.path}"/>
+ <sysproperty key="jboss.aop.path" value="${jboss.aop.path}"/>
+ <sysproperty key="jboss.aop.class.path" value="${jboss.aop.class.path}"/>
<formatter type="plain" extension="-${caller}.txt"/>
<formatter type="xml" extension="-${caller}.xml"/>
<classpath>
@@ -632,7 +633,7 @@
<!-- NON-WOVEN TESTS -->
<!-- ==================================================================================== -->
- <target name="not-woven-tests" depends="compile-test-classes">
+ <target name="not-woven-tests" depends="retroweave">
<mkdir dir="${build.reports}"/>
<taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC" classpathref="jboss.aop.retro.classpath"/>
Modified: projects/aop/trunk/aop/build-tests-jdk50.xml
===================================================================
--- projects/aop/trunk/aop/build-tests-jdk50.xml 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/build-tests-jdk50.xml 2006-10-17 00:16:03 UTC (rev 57688)
@@ -78,16 +78,21 @@
&modules;
<!-- The combined library classpath -->
<path id="library.classpath">
+ <path refid="apache.ant.classpath"/>
<path refid="apache.log4j.classpath"/>
+ <path refid="javassist.classpath"/>
+ <path refid="jboss.profiler.jvmti.classpath"/>
+ <path refid="jboss/common.core.classpath"/>
+ <path refid="jboss/common.logging.log4j.classpath"/>
+ <path refid="jboss/common.logging.jdk.classpath"/>
+ <path refid="jboss/common.logging.spi.classpath"/>
+ <!--<path refid="jboss.microcontainer.classpath"/>-->
+ <path refid="jboss.test.classpath"/>
+ <path refid="junit.junit.classpath"/>
+ <path refid="oswego.concurrent.classpath"/>
<path refid="qdox.classpath"/>
- <path refid="javassist.classpath"/>
<path refid="trove.classpath"/>
<path refid="xdoclet.xdoclet.classpath"/>
- <path refid="apache.ant.classpath"/>
- <path refid="oswego.concurrent.classpath"/>
- <path refid="junit.junit.classpath"/>
- <path refid="jboss.profiler.jvmti.classpath"/>
- <path refid="jboss.microcontainer.classpath"/>
</path>
<!-- Defines jrockit.home -->
@@ -101,11 +106,6 @@
<!-- The combined dependent module classpath -->
<path id="dependentmodule.classpath">
- <path refid="jboss.common.core.classpath"/>
- <path refid="jboss.common.logging.spi.classpath"/>
- <path refid="jboss.common.logging.log4j.classpath"/>
- <path refid="jboss.common.logging.jdk.classpath"/>
- <path refid="jboss.test.classpath"/>
</path>
<!-- ===== -->
@@ -211,6 +211,7 @@
<classpath refid="test.classpath"/>
<include name="**/*.java"/>
<exclude name="org/jboss/test/aop/memoryleaks/**/*.java"/>
+ <exclude name="**/methodhashing/*"/>
</javac>
</target>
@@ -273,7 +274,9 @@
<delete dir="${build.tests.classes}"/>
<antcall target="non-optimized-precompiled-tests" inheritRefs="true"/>
-
+ </target>
+
+ <target name="all-tests" depends="tests">
<!-- Should move the remaining tests into something similar to _base-tests.xml and run them from the main targets once JBAOP-268 has been done -->
<delete dir="${build.tests.classes}/org/jboss/test"/>
<antcall target="jdk15-loadtime-tests" inheritRefs="true"/>
@@ -284,7 +287,6 @@
<delete dir="${build.tests.classes}"/>
<antcall target="jrockit-tests" inheritRefs="true"/>
<antcall target="jrockit-genadvisor-tests" inheritRefs="true"/>
-
</target>
<!-- ==================================================================================== -->
@@ -307,6 +309,14 @@
</target>
+ <target name="loadtime-test" depends="init">
+ <antcall target="_run-javaagent-test" inheritRefs="true">
+ <param name="test" value="${test}"/>
+ <param name="caller" value="javaagent-tests"/>
+ </antcall>
+ </target>
+
+
<!-- ==================================================================================== -->
<!-- GENERATED ADVISOR JAVAGENT TESTS (JDK 5.0) -->
<!-- ==================================================================================== -->
@@ -326,36 +336,36 @@
</antcall>
</target>
+ <target name="loadtime-ga-test" depends="init">
+ <antcall target="_run-javaagent-test" inheritRefs="true">
+ <param name="test" value="${test}"/>
+ <param name="caller" value="javaagent-genadvisor-tests"/>
+ </antcall>
+ </target>
+
<!-- ==================================================================================== -->
<!-- JDK 5.0 JAVAAGENT TEST COMMONS -->
<!-- These targets should not be called directly, use bootclasspath-tests or -->
<!-- bootclasspath-genadvisor-tests -->
<!-- ==================================================================================== -->
- <target name="loadtime-test" depends="init">
- <antcall target="_run-javaagent-test" inheritRefs="true">
- <param name="test" value="${test}"/>
- <param name="caller" value="javaagent-tests"/>
- </antcall>
- </target>
-
<target name="_run-javaagent-test">
<!-- Check for jboss-aop.xml override -->
- <condition property="jboss.aop.path" value="-Djboss.aop.path=${aop.xml}">
+ <condition property="jboss.aop.path" value="${aop.xml}">
<isset property="aop.xml"/>
</condition>
<condition property="jboss.aop.path" value="">
<isset property="no.xml"/>
</condition>
- <condition property="jboss.aop.path" value="-Djboss.aop.path=${source.res}/test/${test}/jboss-aop.xml">
+ <condition property="jboss.aop.path" value="${source.res}/test/${test}/jboss-aop.xml">
<not>
<isset property="aop.xml"/>
</not>
</condition>
<!-- Get -Djboss.aop.class.path from passed in parameters -->
- <condition property="jboss.aop.class.path" value="-Djboss.aop.class.path=${build.tests.classes}">
+ <condition property="jboss.aop.class.path" value="${build.tests.classes}">
<isset property="use.annotations"/>
</condition>
<condition property="jboss.aop.class.path" value="">
@@ -375,20 +385,19 @@
<echo>Running ${test} with instrumentor ${instrumentor}</echo>
<mkdir dir="${build.reports}"/>
- <junit printsummary="yes" fork="no" haltonfailure="no">
+ <junit printsummary="yes" fork="yes" haltonfailure="no">
<jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar"/>
- <jvmarg value="${jboss.aop.class.path}"/>
- <jvmarg value="${jboss.aop.path}"/>
+ <sysproperty key="jboss.aop.path" value="${jboss.aop.path}"/>
+ <sysproperty key="jboss.aop.class.path" value="${jboss.aop.class.path}"/>
<sysproperty key="jboss.aop.instrumentor" value="${instrumentor}"/>
<sysproperty key="jboss.aop.debug.classes" value="true"/>
<formatter type="plain" extension="-${caller}.txt"/>
<classpath refid="test.classpath"/>
- <formatter type="xml" extension="-${caller}.xml"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" extension="-${caller}.xml"/>
<classpath>
<pathelement location="${build.tests.classes}"/>
</classpath>
<batchtest todir="${build.reports}"
- haltonerror="false"
haltonfailure="false"
fork="true">
<fileset dir="${build.tests.classes}">
@@ -410,7 +419,6 @@
<target name="precompiled-tests" depends="compile-test-classes">
<taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/>
- <taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC" classpathref="jboss.aop.classpath"/>
<path id="aop.task.classpath">
<path refid="library.classpath"/>
<path refid="dependentmodule.classpath"/>
@@ -443,7 +451,6 @@
<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"/>
@@ -470,7 +477,6 @@
<target name="precompiled-genadvisor-tests" depends="compile-test-classes">
<taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/>
- <taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC" classpathref="jboss.aop.classpath"/>
<path id="aop.task.classpath">
<path refid="library.classpath"/>
<path refid="dependentmodule.classpath"/>
@@ -569,20 +575,20 @@
</aopc>
<!-- Get -Djboss.aop.path from passed in parameters -->
- <condition property="jboss.aop.path" value="-Djboss.aop.path=${aop.xml}">
+ <condition property="jboss.aop.path" value="${aop.xml}">
<isset property="aop.xml"/>
</condition>
<condition property="jboss.aop.path" value="">
<isset property="no.xml"/>
</condition>
- <condition property="jboss.aop.path" value="-Djboss.aop.path=${source.res}/test/${test}/jboss-aop.xml">
+ <condition property="jboss.aop.path" value="${source.res}/test/${test}/jboss-aop.xml">
<not>
<isset property="aop.xml"/>
</not>
</condition>
<!-- Get -Djboss.aop.class.path from passed in parameters -->
- <condition property="jboss.aop.class.path" value="-Djboss.aop.class.path=${build.tests.classes}">
+ <condition property="jboss.aop.class.path" value="${build.tests.classes}">
<isset property="use.annotations"/>
</condition>
<condition property="jboss.aop.class.path" value="">
@@ -595,10 +601,10 @@
<mkdir dir="${build.reports}"/>
<junit printsummary="yes" fork="yes" haltonfailure="no">
- <jvmarg value="${jboss.aop.path}"/>
- <jvmarg value="${jboss.aop.class.path}"/>
+ <sysproperty key="jboss.aop.path" value="${jboss.aop.path}"/>
+ <sysproperty key="jboss.aop.class.path" value="${jboss.aop.class.path}"/>
<formatter type="plain" extension="-${caller}-jdk50.txt"/>
- <formatter type="xml" extension="-${caller}-jdk50.xml"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" extension="-${caller}-jdk50.xml"/>
<classpath>
<path refid="test.classpath"/>
<pathelement location="${build.tests.classes}"/>
@@ -630,23 +636,25 @@
<mkdir dir="${build.reports}"/>
<taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC" classpathref="jboss.aop.classpath"/>
+ <path id="aop.task.classpath">
+ <path refid="test.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"/>
+ <src path="${source.tests.java}/org/jboss/test/aop/annotationc"/>
</annotationc>
<echo>org/jboss/test/aop/methodhashing/MethodHashingTestCase will fail until the microcontainer has been updated in the repository</echo>
<junit printsummary="yes" fork="no" haltonfailure="no" >
<classpath>
- <path refid="test.classpath"/>
+ <path refid="javac.classpath"/>
<pathelement location="${build.tests.classes}"/>
<pathelement location="docs"/>
</classpath>
<formatter type="plain" extension="-jdk50.txt"/>
- <formatter type="xml" extension="-jdk50.xml"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" extension="-jdk50.xml"/>
<batchtest todir="${build.reports}"
haltonerror="false"
@@ -1124,20 +1132,20 @@
<target name="_run-jrockit-test">
<!-- Check for jboss-aop.xml override -->
- <condition property="jboss.aop.path" value="-Djboss.aop.path=${aop.xml}">
+ <condition property="jboss.aop.path" value="${aop.xml}">
<isset property="aop.xml"/>
</condition>
<condition property="jboss.aop.path" value="">
<isset property="no.xml"/>
</condition>
- <condition property="jboss.aop.path" value="-Djboss.aop.path=${source.res}/test/${test}/jboss-aop.xml">
+ <condition property="jboss.aop.path" value="${source.res}/test/${test}/jboss-aop.xml">
<not>
<isset property="aop.xml"/>
</not>
</condition>
<!-- Get -Djboss.aop.class.path from passed in parameters -->
- <condition property="jboss.aop.class.path" value="-Djboss.aop.class.path=${build.tests.classes}">
+ <condition property="jboss.aop.class.path" value="${build.tests.classes}">
<isset property="use.annotations"/>
</condition>
<condition property="jboss.aop.class.path" value="">
@@ -1159,13 +1167,13 @@
<mkdir dir="${build.reports}"/>
<junit printsummary="yes" fork="yes" haltonfailure="no" jvm="${jrockit.home}/bin/java">
<jvmarg value="-Xmanagement:class=org.jboss.aop.hook.JRockitClassPreProcessor"/>
- <jvmarg value="${jboss.aop.class.path}"/>
- <jvmarg value="${jboss.aop.path}"/>
+ <sysproperty key="jboss.aop.path" value="${jboss.aop.path}"/>
+ <sysproperty key="jboss.aop.class.path" value="${jboss.aop.class.path}"/>
<sysproperty key="jboss.aop.instrumentor" value="${instrumentor}"/>
<sysproperty key="jboss.aop.debug.classes" value="true"/>
<formatter type="plain" extension="-${caller}.txt"/>
<classpath refid="test.classpath"/>
- <formatter type="xml" extension="-${caller}.xml"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" extension="-${caller}.xml"/>
<classpath>
<path refid="test.jrockit.classpath"/>
<pathelement location="${build.tests.classes}"/>
@@ -1243,8 +1251,9 @@
<pathelement location="${build.tests.classes}"/>
<pathelement location="docs"/>
</classpath>
- <formatter type="plain"/>
- <test fork="yes" name="org.jboss.test.aop.basic.AOPTester"/>
+ <formatter type="plain" extension="-system-classloader-jdk50.txt"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" extension="-system-classloader-jdk50.xml"/>
+ <test fork="yes" name="org.jboss.test.aop.basic.AOPTester" todir="${build.reports}"/>
</junit>
</target>
Modified: projects/aop/trunk/aop/build.xml
===================================================================
--- projects/aop/trunk/aop/build.xml 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/build.xml 2006-10-17 00:16:03 UTC (rev 57688)
@@ -57,7 +57,7 @@
-->
<target name="configure" unless="configure.disable">
- <property name="aop.version" value="jboss-aop-2.0.0.alpha1"/>
+ <property name="aop.version" value="jboss-aop-1.5.0.GA"/>
<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="2.0.0.alpha1"/>
+ <property name="module.version" value="1.5.0.GA"/>
<!-- ========= -->
<!-- Libraries -->
@@ -85,9 +85,11 @@
<path refid="apache.ant.classpath"/>
<path refid="oswego.concurrent.classpath"/>
<path refid="junit.junit.classpath"/>
- <path refid="jboss/common.core.classpath"/>
<path refid="jboss.profiler.jvmti.classpath"/>
- <path refid="jboss/common.logging.spi.classpath"/>
+ <path refid="jboss/common.core.classpath"/>
+ <path refid="jboss/common.logging.log4j.classpath"/>
+ <path refid="jboss/common.logging.jdk.classpath"/>
+ <path refid="jboss/common.logging.spi.classpath"/>
<!--<path refid="jboss.microcontainer.classpath"/>-->
<path refid="jboss.test.classpath"/>
</path>
@@ -111,7 +113,6 @@
<!-- Where source files live -->
<property name="source.java" value="${module.source}/main"/>
- <property name="source.tests.java" value="${module.source}/test"/>
<property name="source15.java" value="${module.source}/jdk15"/>
<property name="source.etc" value="${module.source}/etc"/>
<property name="source.res" value="${module.source}/resources"/>
@@ -121,9 +122,8 @@
<property name="build.reports" value="${module.output}/reports"/>
<property name="build.stylesheets" value="${module.output}/stylesheets"/>
<property name="build.classes" value="${module.output}/classes"/>
- <property name="build.tests.classes" value="${module.output}/tests.classes"/>
+ <property name="build.classes.retro" value="${module.output}/classes-retro"/>
<property name="build15.classes" value="${module.output}/classes15"/>
- <property name="build15.tests.classes" value="${module.output}/tests.classes15"/>
<property name="build.lib" value="${module.output}/lib"/>
<property name="build.api" value="${module.output}/api"/>
<property name="build.etc" value="${module.output}/etc"/>
@@ -162,28 +162,6 @@
<path path="${jrockit.home}/jre/lib/managementapi.jar"/>
</path>
- <path id="test.classpath">
- <path refid="thirdparty.classpath"/>
- <pathelement path="${build.lib}/jboss-aop.jar"/>
- <path refid="jboss/common.logging.spi.classpath"/>
- <path refid="jboss/common.logging.log4j.classpath"/>
- <path refid="jboss/common.logging.jdk.classpath"/>
- </path>
-
- <path id="test.jrockit.classpath">
- <path refid="test.classpath"/>
- <path path="${jrockit.home}/jre/lib/managementapi.jar"/>
- </path>
-
- <path id="test15.classpath">
- <path refid="thirdparty.classpath"/>
- <pathelement path="${build.lib}/jboss-aop-jdk50.jar"/>
- <path refid="jboss/common.logging.spi.classpath"/>
- <path refid="jboss/common.logging.log4j.classpath"/>
- <path refid="jboss/common.logging.jdk.classpath"/>
- </path>
-
-
<path id="javac15.classpath">
<pathelement path="${build.classes}"/>
<path refid="javac.classpath"/>
@@ -192,14 +170,17 @@
<path id="javadoc.classpath">
<path refid="javac.classpath"/>
</path>
+
+ <path id="jbossretro.classpath">
+ <path refid="apache.ant.classpath"/>
+ <path refid="javassist.classpath"/>
+ <path refid="jboss.jbossretro.classpath"/>
+ <path refid="jboss/backport.concurrent.classpath"/>
+ </path>
+
<!-- Packages to include when generating api documentation -->
<property name="javadoc.packages" value="org.jbos.aop.*"/>
-
- <!-- Override JUnit defaults -->
- <property name="junit.timeout" value="240000"/> <!-- 4 minutes -->
- <property name="junit.batchtest.todir" value="${build.reports}"/>
- <property name="junit.jvm.options" value="-Ddummy"/>
</target>
@@ -245,16 +226,15 @@
<target name="compile"
description="Compile all source files."
- depends="compile-classes, compile-classes15,
- compile-etc, compile-jrockit-classes"/>
+ depends="compile-classes, compile-etc, compile-jrockit-classes, retrotranslate"/>
<!-- Compile all class files -->
<target name="compile-classes" depends="init">
<mkdir dir="${build.classes}"/>
<javac destdir="${build.classes}"
optimize="${javac.optimize}"
- target="1.4"
- source="1.4"
+ target="1.5"
+ source="1.5"
debug= "${javac.debug}"
depend="${javac.depend}"
verbose="${javac.verbose}"
@@ -267,6 +247,7 @@
<src path="${source.java}"/>
<exclude name="org/jboss/aop/definition/**"/>
<exclude name="org/jboss/aop/hook/JRockit*"/>
+ <exclude name="**/methodhashing/*"/>
<classpath refid="javac.classpath"/>
</javac>
</target>
@@ -303,23 +284,18 @@
</copy>
</target>
+ <target name="retrotranslate" depends="compile-classes">
+ <mkdir dir="${build.classes.retro}"/>
- <target name="compile-classes15" depends="init" if="HAVE_JDK_1.5">
- <mkdir dir="${build15.classes}"/>
- <javac destdir="${build15.classes}"
- optimize="${javac.optimize}"
- target="1.5"
- source="1.5"
- debug="${javac.debug}"
- depend="${javac.depend}"
- verbose="${javac.verbose}"
- deprecation="${javac.deprecation}"
- includeAntRuntime="${javac.include.ant.runtime}"
- includeJavaRuntime="${javac.include.java.runtime}"
- failonerror="${javac.fail.onerror}">
- <src path="${source15.java}"/>
+ <taskdef name="retro" classname="org.jboss.ant.tasks.retro.Retro" classpathref="jbossretro.classpath"/>
+ <retro compilerclasspathref="jbossretro.classpath" destdir="${build.classes.retro}">
+ <classpath refid="jbossretro.classpath"/>
<classpath refid="javac15.classpath"/>
- </javac>
+ <classpath>
+ <pathelement path="${build.classes}"/>
+ </classpath>
+ <src path="${build.classes}"/>
+ </retro>
</target>
<!-- ================================================================== -->
@@ -340,7 +316,7 @@
<!-- Build the jnpserver.jar -->
<jar jarfile="${build.lib}/jboss-aop.jar"
manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
+ <fileset dir="${build.classes.retro}">
<!-- Include everything else -->
<include name="org/jboss/aop/**"/>
<include name="org/jboss/lang/**"/>
@@ -351,7 +327,7 @@
<jar jarfile="${build.lib}/jdk14-pluggable-instrumentor.jar"
manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
+ <fileset dir="${build.classes.retro}">
<!-- Include everything else -->
<include name="org/jboss/aop/hook/JDK14*.class"/>
</fileset>
@@ -376,7 +352,7 @@
</target>
<target name="jars15" description="Builds all jar files."
- depends="compile-classes15" if="HAVE_JDK_1.5">
+ depends="compile-classes">
<mkdir dir="${build.lib}"/>
@@ -384,42 +360,13 @@
<jar jarfile="${build.lib}/jboss-aop-jdk50.jar"
manifest="${build.etc}/default.mf">
<fileset dir="${build.classes}">
- <!-- Include everything else -->
- <include name="org/jboss/aop/**"/>
- <include name="org/jboss/lang/**"/>
- <include name="org/jboss/aspects/**"/>
- <exclude name="org/jboss/aop/annotation/AnnotationElement.class"/>
- <exclude name="org/jboss/aop/advice/Scope.class"/>
- <exclude name="org/jboss/aop/Aspect.class"/>
- <exclude name="org/jboss/aop/AnnotationIntroductionDef.class"/>
- <exclude name="org/jboss/aop/Bind.class"/>
- <exclude name="org/jboss/aop/CFlowDef.class"/>
- <exclude name="org/jboss/aop/CFlowStackDef.class"/>
- <exclude name="org/jboss/aop/DeclareError.class"/>
- <exclude name="org/jboss/aop/DeclareWarning.class"/>
- <exclude name="org/jboss/aop/DynamicCFlowDef.class"/>
- <exclude name="org/jboss/aop/Mixin.class"/>
- <exclude name="org/jboss/aop/InterceptorDef.class"/>
- <exclude name="org/jboss/aop/Introduction.class"/>
- <exclude name="org/jboss/aop/PointcutDef.class"/>
- <exclude name="org/jboss/aop/Precedence.class"/>
- <exclude name="org/jboss/aop/PrecedenceAdvice.class"/>
- <exclude name="org/jboss/aop/PrecedenceInterceptor.class"/>
- <exclude name="org/jboss/aop/Prepare.class"/>
- <exclude name="org/jboss/aop/TypeDef.class"/>
- <exclude name="org/jboss/aspects/Threadbased.class"/>
- </fileset>
- <fileset dir="${build15.classes}">
- <!-- Include everything else -->
- <include name="org/jboss/aop/**"/>
- <include name="org/jboss/aspects/**"/>
<exclude name="org/jboss/aop/standalone/PluggableInstrumentor.class"/>
</fileset>
<fileset file="docs/jboss-aop_1_0.dtd"/>
</jar>
<jar jarfile="${build.lib}/pluggable-instrumentor.jar"
manifest="${build.etc}/pluggable-instrumentor.mf">
- <fileset dir="${build15.classes}">
+ <fileset dir="${build.classes}">
<!-- Include everything else -->
<include name="org/jboss/aop/standalone/PluggableInstrumentor.class"/>
</fileset>
@@ -465,10 +412,6 @@
<include name="org/jboss/aop/util/MethodHashing*.class"/>
<include name="org/jboss/aop/util/PayloadKey*.class"/>
</fileset>
- <!--<fileset dir="${build15.classes}">
- <include name="org/jboss/aop/*.class"/>
- </fileset>
- <fileset file="docs/jboss-aop_1_0.dtd"/>-->
</jar>
</target>
@@ -487,6 +430,17 @@
</fileset>
</copy>
<copy todir="${build.lib}" filtering="no">
+ <fileset dir="${jboss.jbossretro.lib}">
+ <include name="jbossretro.jar"/>
+ <include name="jbossretro-rt.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${build.lib}" filtering="no">
+ <fileset dir="${jboss/backport.concurrent.lib}">
+ <include name="jboss-backport-concurrent.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${build.lib}" filtering="no">
<fileset dir="${javassist.lib}">
<include name="javassist.jar"/>
</fileset>
@@ -524,6 +478,7 @@
<zipfileset dir="." prefix="${aop.version}">
<include name="docs/api/**"/>
<include name="docs/**/*.html"/>
+ <include name="docs/**/*.pdf"/>
<include name="docs/**/*.jpg"/>
<include name="docs/**/*.pdf"/>
<include name="docs/**/*.css"/>
@@ -536,7 +491,7 @@
<include name="src/jdk15/**/*.java"/>
<include name="src/main/**/*.java"/>
<include name="src/main/**/*.jjt"/>
- <include name="src/test/**/*.java"/>
+ <include name="src/test/**/*.java"/>
<include name="src/resources/test/**/*.xml"/>
<include name="src/resources/bin/**/*"/>
<include name="src/resources/xdoclet/META-INF/*.xml"/>
@@ -577,13 +532,8 @@
<target name="clean"
description="Cleans up most generated files."
depends="_buildmagic:clean">
- <delete dir="${build.tests.classes}"/>
</target>
- <target name="clean-tests" depends="init">
- <delete dir="${build.tests.classes}"/>
- </target>
-
<!-- Clean up all generated files -->
<target name="clobber"
description="Cleans up all generated files."
@@ -607,1528 +557,4 @@
<target name="help"
description="Show this help message."
depends="_buildmagic:help:standard"/>
-
- <!-- ==================================================================================== -->
- <!-- JDK 1.4 TESTS -->
- <!-- ==================================================================================== -->
- <target name="compile-test-classes" depends="init">
- <mkdir dir="${build.tests.classes}"/>
- <javac destdir="${build.tests.classes}"
- optimize="${javac.optimize}"
- target="1.4"
- source="1.4"
- debug="${javac.debug}"
- depend="${javac.depend}"
- verbose="${javac.verbose}"
- deprecation="${javac.deprecation}"
- includeAntRuntime="${javac.include.ant.runtime}"
- includeJavaRuntime="${javac.include.java.runtime}"
- failonerror="${javac.fail.onerror}">
- <src path="${source.tests.java}"/>
- <classpath refid="test.classpath"/>
- <include name="**/*.java"/>
- <exclude name="org/jboss/test/aop/jdk15*/**/*.java"/>
- <exclude name="org/jboss/test/aop/memoryleaks/**/*.java"/>
- <exclude name="org/jboss/test/aop/methodoverride/*.java"/>
- <exclude name="**/methodhashing/*"/>
- </javac>
- </target>
-
- <target name="tests" depends="main">
-
- <delete dir="${build.tests.classes}"/>
- <antcall target="bootclasspath-genadvisor-tests" inheritRefs="true"/>
- <antcall target="bootclasspath-tests" inheritRefs="true"/>
- <antcall target="system-classloader-test" inheritRefs="true"/>
- <antcall target="not-woven-tests" inheritRefs="true"/>
-
- <delete dir="${build.tests.classes}"/>
- <antcall target="jrockit-loadtime-tests" inheritRefs="true"/>
-
- <delete dir="${build.tests.classes}"/>
- <antcall target="precompiled-tests" inheritRefs="true"/>
-
- <delete dir="${build.tests.classes}"/>
- <antcall target="precompiled-genadvisor-tests" inheritRefs="true"/>
-
- <delete dir="${build.tests.classes}"/>
- <antcall target="non-optimized-precompiled-tests" inheritRefs="true"/>
- </target>
-
- <!-- ==================================================================================== -->
- <!-- BOOTCLASSPATH-TESTS (JDK 1.4) -->
- <!-- ==================================================================================== -->
- <target name="bootclasspath-tests" depends="compile-test-classes">
- <delete dir="${build.bootclasspath}"/>
- <java classname="org.jboss.aop.hook.GenerateInstrumentedClassLoader">
- <classpath>
- <path refid="test.classpath"/>
- </classpath>
- <arg value="${build.bootclasspath}"/>
- </java>
-
- <!-- Tests only applicable for this weaving mode -->
- <antcall target="_run-bootclasspath-test" inheritRefs="true">
- <param name="test" value="override"/>
- <param name="caller" value="bootclasspath-tests"/>
- <param name="exclude" value="**/GenAdvisorOverrideTestCase.class"/>
- </antcall>
-
- <!-- Add tests in _base-bootclasspath-tests unless they should only be run in this weaving mode -->
- <antcall target="_base-bootclasspath-tests" inheritRefs="true">
- <param name="caller" value="bootclasspath-tests"/>
- </antcall>
- </target>
-
- <!-- ==================================================================================== -->
- <!-- GENERATED ADVISOR BOOTCLASSPATH-TESTS (JDK 1.4) -->
- <!-- ==================================================================================== -->
- <target name="bootclasspath-genadvisor-tests" depends="compile-test-classes">
- <delete dir="${build.bootclasspath}"/>
- <java classname="org.jboss.aop.hook.GenerateInstrumentedClassLoader">
- <classpath>
- <path refid="test.classpath"/>
- </classpath>
- <arg value="${build.bootclasspath}"/>
- </java>
-
- <!-- Tests only applicable for this weaving mode -->
- <antcall target="_run-bootclasspath-test" inheritRefs="true">
- <param name="test" value="override"/>
- <param name="caller" value="bootclasspath-genadvisor-tests"/>
- <param name="exclude" value="**/OverrideTestCase.class"/>
- </antcall>
-
- <!-- Add tests in _base-bootclasspath-tests unless they should only be run in this weaving mode -->
- <antcall target="_base-bootclasspath-tests" inheritRefs="true">
- <param name="caller" value="bootclasspath-genadvisor-tests"/>
- </antcall>
-
- </target>
-
- <!-- ==================================================================================== -->
- <!-- JDK 1.4 BOOTCLASSPATH TEST COMMONS -->
- <!-- These targets should not be called directly, use bootclasspath-tests or -->
- <!-- bootclasspath-genadvisor-tests -->
- <!-- ==================================================================================== -->
- <target name="_base-bootclasspath-tests">
- <taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC" classpathref="jboss.aop.classpath"/>
-
- <annotationc compilerclasspathref="aop.task.classpath" bytecode="true">
- <classpath refid="aop.task.classpath"/>
- <classpath path="${build.tests.classes}"/>
- <src path="${source.tests.java}"/>
- <include name="org/jboss/test/aop/annotatedcflow/*.java"/>
- <include name="org/jboss/test/aop/annotatedparams/*.java"/>
- <include name="org/jboss/test/aop/perjoinpoint/*.java"/>
- <include name="org/jboss/test/aop/annotated/*.java"/>
- <include name="org/jboss/test/aop/instanceofannotated/*.java"/>
- <include name="org/jboss/test/aop/implementz/*.java"/>
- </annotationc>
-
- <antcall target="_run-bootclasspath-test" inheritRefs="true">
- <param name="test" value="extender"/>
- </antcall>
- <antcall target="_run-bootclasspath-test" inheritRefs="true">
- <param name="test" value="stress/simple"/>
- </antcall>
- <antcall target="_run-bootclasspath-test" inheritRefs="true">
- <param name="test" value="invoketarget"/>
- </antcall>
- <antcall target="_run-bootclasspath-test" inheritRefs="true">
- <param name="test" value="instanceofintroduced"/>
- </antcall>
- <antcall target="_run-bootclasspath-test" inheritRefs="true">
- <param name="test" value="implementz"/>
- </antcall>
- <antcall target="_run-bootclasspath-test" inheritRefs="true">
- <param name="test" value="annotatedcflow"/>
- </antcall>
- <antcall target="_run-bootclasspath-test" inheritRefs="true">
- <param name="test" value="scope"/>
- </antcall>
- <antcall target="_run-bootclasspath-test" inheritRefs="true">
- <param name="test" value="construction"/>
- </antcall>
- <antcall target="_run-bootclasspath-test" inheritRefs="true">
- <param name="test" value="constructortarget"/>
- </antcall>
- <antcall target="_run-bootclasspath-test" inheritRefs="true">
- <param name="test" value="basic"/>
- </antcall>
- <antcall target="_run-bootclasspath-test" inheritRefs="true">
- <param name="test" value="marshalling"/>
- </antcall>
- <antcall target="_run-bootclasspath-test" inheritRefs="true">
- <param name="test" value="annotatedparams"/>
- </antcall>
- <antcall target="_run-bootclasspath-test" inheritRefs="true">
- <param name="test" value="callerscope"/>
- </antcall>
- <antcall target="_run-bootclasspath-test" inheritRefs="true">
- <param name="test" value="reflection"/>
- </antcall>
- <antcall target="_run-bootclasspath-test" inheritRefs="true">
- <param name="test" value="regression"/>
- </antcall>
- <antcall target="_run-bootclasspath-test" inheritRefs="true">
- <param name="test" value="perjoinpoint"/>
- </antcall>
- <antcall target="_run-bootclasspath-test" inheritRefs="true">
- <param name="test" value="beanstyleconfig"/>
- </antcall>
- <antcall target="_run-bootclasspath-test" inheritRefs="true">
- <param name="test" value="precedence"/>
- </antcall>
- <antcall target="_run-bootclasspath-test" inheritRefs="true">
- <param name="test" value="dotinpointcutname"/>
- </antcall>
- <antcall target="_run-bootclasspath-test" inheritRefs="true">
- <param name="test" value="instanceofannotated"/>
- </antcall>
- <antcall target="_run-bootclasspath-test" inheritRefs="true">
- <param name="test" value="callerargs"/>
- </antcall>
- <antcall target="_run-bootclasspath-test" inheritRefs="true">
- <param name="test" value="field"/>
- </antcall>
-
- <!-- Tests with special requirements for parameters -->
- <antcall target="_run-bootclasspath-test" inheritRefs="true">
- <param name="test" value="annotated"/>
- <param name="no.xml" value="true"/>
- <param name="use.annotations" value="true"/>
- </antcall>
- <antcall target="_run-bootclasspath-test" inheritRefs="true">
- <param name="test" value="introduction"/>
- <param name="aop.xml" value="${source.res}/test/introduction/introduction-aop.xml"/>
- </antcall>
- </target>
-
- <target name="loadtime-test" depends="init">
- <antcall target="_run-bootclasspath-test" inheritRefs="true">
- <param name="test" value="${test}"/>
- <param name="caller" value="bootclasspath-tests"/>
- </antcall>
- </target>
-
- <target name="loadtime-ga-test" depends="init">
- <antcall target="_run-bootclasspath-test" inheritRefs="true">
- <param name="test" value="${test}"/>
- <param name="caller" value="bootclasspath-genadvisor-tests"/>
- </antcall>
- </target>
-
- <target name="_run-bootclasspath-test">
- <path id="bootclasspath">
- <pathelement location="${build.bootclasspath}"/>
- <path refid="test.classpath"/>
- </path>
- <property name="bootclasspath" refid="bootclasspath"/>
-
- <!-- Check for jboss-aop.xml override -->
- <condition property="jboss.aop.path" value="${aop.xml}">
- <isset property="aop.xml"/>
- </condition>
- <condition property="jboss.aop.path" value="">
- <isset property="no.xml"/>
- </condition>
- <condition property="jboss.aop.path" value="${source.res}/test/${test}/jboss-aop.xml">
- <not>
- <isset property="aop.xml"/>
- </not>
- </condition>
-
- <!-- Get -Djboss.aop.class.path from passed in parameters -->
- <condition property="jboss.aop.class.path" value="${build.tests.classes}">
- <isset property="use.annotations"/>
- </condition>
- <condition property="jboss.aop.class.path" value="">
- <not>
- <isset property="use.annotations"/>
- </not>
- </condition>
-
- <!-- Set the weaving mode and instrumentor to use-->
- <condition property="instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor">
- <equals arg1="${caller}" arg2="bootclasspath-tests"/>
- </condition>
- <condition property="instrumentor" value="org.jboss.aop.instrument.GeneratedAdvisorInstrumentor">
- <equals arg1="${caller}" arg2="bootclasspath-genadvisor-tests"/>
- </condition>
-
- <echo>Running ${test} with instrumentor ${instrumentor}</echo>
-
- <mkdir dir="${build.reports}"/>
- <junit printsummary="yes" fork="yes" haltonfailure="no">
- <jvmarg value="-Xbootclasspath/p:${bootclasspath}"/>
- <sysproperty key="jboss.aop.path" value="${jboss.aop.path}"/>
- <sysproperty key="jboss.aop.class.path" value="${jboss.aop.class.path}"/>
- <sysproperty key="jboss.aop.instrumentor" value="${instrumentor}"/>
- <formatter type="plain" extension="-${caller}.txt"/>
- <formatter type="xml" extension="-${caller}.xml"/>
- <classpath>
- <pathelement location="${build.tests.classes}"/>
- </classpath>
- <batchtest todir="${build.reports}"
- haltonerror="false"
- haltonfailure="false"
- fork="true">
- <fileset dir="${build.tests.classes}">
- <include name="org/jboss/test/aop/${test}/**/*TestCase.class"/>
- <include name="org/jboss/test/aop/${test}/**/*Tester.class"/>
- <exclude name="${exclude}"/>
-
- <!-- These are not test cases, and so they will fail when junit tries to run them. Should really rename all tests to *TestCase -->
- <exclude name="org/jboss/test/aop/reflection/ReflectionAspectTester.class"/>
- <exclude name="org/jboss/test/aop/basic/POJOAspectTester.class"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
- <!-- ==================================================================================== -->
- <!-- OPTIMIZED PRECOMPILED TESTS (JDK 1.4) -->
- <!-- ==================================================================================== -->
-
- <target name="precompiled-tests" depends="compile-test-classes">
- <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/>
- <taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC" classpathref="jboss.aop.classpath"/>
- <path id="aop.task.classpath">
- <path refid="library.classpath"/>
- <path refid="dependentmodule.classpath"/>
- <path refid="jboss.aop.classpath"/>
- </path>
-
- <!-- Add tests in _base-precompiled-tests unless they should only be run in this weaving mode -->
- <antcall target="_base-precompiled-tests" inheritRefs="true">
- <param name="caller" value="precompiled-tests"/>
- </antcall>
-
- <!-- Tests only applicable for this weaving mode -->
-
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="args"/>
- <param name="caller" value="precompiled-tests"/>
- </antcall>
-
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="override"/>
- <param name="caller" value="precompiled-tests"/>
- <param name="exclude" value="**/GenAdvisorOverrideTestCase.class"/>
- </antcall>
- </target>
-
- <!-- ==================================================================================== -->
- <!-- NON OPTIMIZED PRECOMPILED TESTS (JDK 1.4) -->
- <!-- ==================================================================================== -->
-
- <target name="non-optimized-precompiled-tests" depends="compile-test-classes">
- <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/>
- <taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC" classpathref="jboss.aop.classpath"/>
- <path id="aop.task.classpath">
- <path refid="library.classpath"/>
- <path refid="dependentmodule.classpath"/>
- <path refid="jboss.aop.classpath"/>
- </path>
-
- <!-- Add tests in _base-precompiled-tests unless they should only be run in this weaving mode -->
- <antcall target="_base-precompiled-tests" inheritRefs="true">
- <param name="caller" value="non-optimized-precompiled-tests"/>
- </antcall>
-
- <!-- Tests only applicable for this weaving mode -->
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="override"/>
- <param name="caller" value="non-optimized-precompiled-tests"/>
- <param name="exclude" value="**/GenAdvisorOverrideTestCase.class"/>
- </antcall>
- </target>
-
- <!-- ==================================================================================== -->
- <!-- JDK 1.4 GENERATED ADVISOR PRECOMPILED TESTS -->
- <!-- ==================================================================================== -->
-
- <target name="precompiled-genadvisor-tests" depends="compile-test-classes">
- <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/>
- <taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC" classpathref="jboss.aop.classpath"/>
- <path id="aop.task.classpath">
- <path refid="library.classpath"/>
- <path refid="dependentmodule.classpath"/>
- <path refid="jboss.aop.classpath"/>
- </path>
-
- <!-- Add tests in _base-precompiled-tests unless they should only be run in this weaving mode -->
- <antcall target="_base-precompiled-tests" inheritRefs="true">
- <param name="caller" value="precompiled-genadvisor-tests"/>
- </antcall>
-
- <!-- Tests only applicable for this weaving mode -->
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="args"/>
- <param name="caller" value="precompiled-genadvisor-tests"/>
- </antcall>
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="beforeafter"/>
- <param name="caller" value="precompiled-genadvisor-tests"/>
- </antcall>
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="dynamicgenadvisor"/>
- <param name="caller" value="precompiled-genadvisor-tests"/>
- </antcall>
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="override"/>
- <param name="caller" value="precompiled-genadvisor-tests"/>
- <param name="exclude" value="**/OverrideTestCase.class"/>
- </antcall>
- </target>
-
-
- <!-- ==================================================================================== -->
- <!-- JDK 1.4 PRECOMPILED TEST COMMONS -->
- <!-- These targets should not be called directly, use precompiled-tests, -->
- <!-- non-optimized-precompiled-tests or precompiled-genadvisor-tests -->
- <!-- bootclasspath-genadvisor-tests -->
- <!-- ==================================================================================== -->
-
- <target name="_base-precompiled-tests">
- <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/annotatedcflow/*.java"/>
- <include name="org/jboss/test/aop/annotatedparams/*.java"/>
- <include name="org/jboss/test/aop/perjoinpoint/*.java"/>
- <include name="org/jboss/test/aop/annotated/*.java"/>
- <include name="org/jboss/test/aop/instanceofannotated/*.java"/>
- <include name="org/jboss/test/aop/implementz/*.java"/>
- </annotationc>
-
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="extender"/>
- </antcall>
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="invoketarget"/>
- </antcall>
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="stress/simple"/>
- </antcall>
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="instanceofintroduced"/>
- </antcall>
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="implementz"/>
- </antcall>
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="annotatedcflow"/>
- </antcall>
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="scope"/>
- </antcall>
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="construction"/>
- </antcall>
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="constructortarget"/>
- </antcall>
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="basic"/>
- </antcall>
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="marshalling"/>
- </antcall>
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="annotatedparams"/>
- </antcall>
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="callerscope"/>
- </antcall>
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="reflection"/>
- </antcall>
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="regression"/>
- </antcall>
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="perjoinpoint"/>
- </antcall>
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="beanstyleconfig"/>
- </antcall>
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="precedence"/>
- </antcall>
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="dotinpointcutname"/>
- </antcall>
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="instanceofannotated"/>
- </antcall>
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="callerargs"/>
- </antcall>
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="field"/>
- </antcall>
-
- <!-- Tests with special requirements for parameters -->
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="annotated"/>
- <param name="no.xml" value="true"/>
- <param name="use.annotations" value="true"/>
- </antcall>
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="introduction"/>
- <param name="aop.xml" value="${source.res}/test/introduction/introduction-aop.xml"/>
- </antcall>
- </target>
-
- <target name="precompiled-test" depends="init">
- <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/>
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="${test}"/>
- <param name="caller" value="precompiled-tests"/>
- </antcall>
- </target>
-
- <target name="precompiled-genadvisor-test" depends="init">
- <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/>
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="args"/>
- <param name="caller" value="precompiled-genadvisor-tests"/>
- </antcall>
- </target>
-
- <target name="_run-precompiled-test">
-
- <!-- Check for jboss-aop.xml override for compiler -->
- <condition property="aoppath" value="${aop.xml}">
- <isset property="aop.xml"/>
- </condition>
- <condition property="aoppath" value="">
- <isset property="no.xml"/>
- </condition>
- <condition property="aoppath" value="${source.res}/test/${test}/jboss-aop.xml">
- <not>
- <isset property="aop.xml"/>
- </not>
- </condition>
-
- <!-- Set the weaving mode and instrumentor to use-->
- <condition property="optimized" value="true">
- <or>
- <equals arg1="${caller}" arg2="precompiled-tests"/>
- <equals arg1="${caller}" arg2="precompiled-genadvisor-tests"/>
- </or>
- </condition>
- <condition property="optimized" value="false">
- <equals arg1="${caller}" arg2="non-optimized-precompiled-tests"/>
- </condition>
- <condition property="instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor">
- <not>
- <equals arg1="${caller}" arg2="precompiled-genadvisor-tests"/>
- </not>
- </condition>
- <condition property="instrumentor" value="org.jboss.aop.instrument.GeneratedAdvisorInstrumentor">
- <equals arg1="${caller}" arg2="precompiled-genadvisor-tests"/>
- </condition>
-
- <echo>Compiling ${test} with optimized=${optimized} and instrumentor ${instrumentor}</echo>
-
- <!-- aopc -->
- <aopc optimized="${optimized}" compilerclasspathref="aop.task.classpath">
- <classpath refid="aop.task.classpath"/>
- <classpath refid="thirdparty.classpath"/>
- <classpath path="${build.tests.classes}"/>
- <aoppath path="${aoppath}"/>
- <sysproperty key="jboss.aop.instrumentor" value="${instrumentor}"/>
- <sysproperty key="jboss.aop.debug.classes" value="true"/>
- <src path="${build.tests.classes}"/>
- <include name="org/jboss/test/aop/${test}/**"/>
- <exclude name="${exclude}"/>
- <aopclasspath path="${build.tests.classes}"/>
- </aopc>
-
- <!-- Get -Djboss.aop.path from passed in parameters -->
- <condition property="jboss.aop.path" value="${aop.xml}">
- <isset property="aop.xml"/>
- </condition>
- <condition property="jboss.aop.path" value="">
- <isset property="no.xml"/>
- </condition>
- <condition property="jboss.aop.path" value="${source.res}/test/${test}/jboss-aop.xml">
- <not>
- <isset property="aop.xml"/>
- </not>
- </condition>
-
- <!-- Get -Djboss.aop.class.path from passed in parameters -->
- <condition property="jboss.aop.class.path" value="${build.tests.classes}">
- <isset property="use.annotations"/>
- </condition>
- <condition property="jboss.aop.class.path" value="">
- <not>
- <isset property="use.annotations"/>
- </not>
- </condition>
-
- <!-- determine output directory from weaving mode -->
- <mkdir dir="${build.reports}"/>
-
- <junit printsummary="yes" fork="yes" haltonfailure="no">
- <sysproperty key="jboss.aop.path" value="${jboss.aop.path}"/>
- <sysproperty key="jboss.aop.class.path" value="${jboss.aop.class.path}"/>
- <formatter type="plain" extension="-${caller}.txt"/>
- <formatter type="xml" extension="-${caller}.xml"/>
- <classpath>
- <path refid="test.classpath"/>
- <pathelement location="${build.tests.classes}"/>
- <pathelement location="docs"/>
- </classpath>
- <batchtest todir="${build.reports}"
- haltonerror="false"
- haltonfailure="false"
- fork="true">
- <fileset dir="${build.tests.classes}">
- <include name="org/jboss/test/aop/${test}/**/*TestCase.class"/>
- <include name="org/jboss/test/aop/${test}/**/*Tester.class"/>
- <exclude name="${exclude}"/>
-
- <!-- These are not test cases, and so they will fail when junit tries to run them. Should really rename all tests to *TestCase -->
- <exclude name="org/jboss/test/aop/reflection/ReflectionAspectTester.class"/>
- <exclude name="org/jboss/test/aop/basic/POJOAspectTester.class"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
-
- <!-- ==================================================================================== -->
- <!-- NON-WOVEN TESTS -->
- <!-- ==================================================================================== -->
-
- <target name="not-woven-tests" depends="compile-test-classes">
- <mkdir dir="${build.reports}"/>
-
- <taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC" classpathref="jboss.aop.classpath"/>
- <annotationc compilerclasspathref="aop.task.classpath" bytecode="true">
- <classpath refid="aop.task.classpath"/>
- <classpath path="${build.tests.classes}"/>
- <src path="${source.tests.java}"/>
- <include name="org/jboss/test/aop/annotationc/*.java"/>
- </annotationc>
-
- <junit printsummary="yes" fork="yes" haltonfailure="no" >
- <classpath>
- <path refid="test.classpath"/>
- <pathelement location="${build.tests.classes}"/>
- <pathelement location="docs"/>
- </classpath>
- <formatter type="plain"/>
- <formatter type="xml"/>
-
- <batchtest todir="${build.reports}"
- haltonerror="false"
- haltonfailure="false"
- fork="true">
- <fileset dir="${build.tests.classes}">
- <include name="org/jboss/test/aop/proxy/ProxyTestCase.class"/>
- <include name="org/jboss/test/aop/methodhashing/MethodHashingTestCase.class"/>
- <include name="org/jboss/test/aop/annotationc/AnnotationTester.class"/>
- </fileset>
- </batchtest>
-
- </junit>
- </target>
-
- <!-- ==================================================================================== -->
- <!-- JDK 5 TESTS -->
- <!-- ==================================================================================== -->
- <target name="compile-jdk15-tests" depends="jars15">
- <delete dir="${build.tests.classes}"/>
- <mkdir dir="${build.tests.classes}"/>
- <!-- for some reason, jdk15 and Junit do not mix so compile the AOPTester with JDK 1.4 -->
- <javac destdir="${build.tests.classes}"
- source="1.5"
- debug="on">
- <src path="${source.tests.java}"/>
- <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">
- <delete dir="${build.tests.classes}/org/jboss/test"/>
- <antcall target="jdk15-loadtime-tests" inheritRefs="true"/>
-
- <delete dir="${build.tests.classes}/org/jboss/test"/>
- <antcall target="jdk15-precompiled-tests" inheritRefs="true"/>
- </target>
-
- <target name="jdk15-loadtime-tests" depends="compile-jdk15-tests">
-
- <property name="report.dir" value="${build.reports}"/>
- <mkdir dir="${report.dir}"/>
-
- <junit printsummary="yes" fork="no" haltonfailure="no">
- <sysproperty key="jboss.aop.path" value="${source.res}/test/regression/jboss-aop.xml"/>
- <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar"/>
- <classpath refid="test15.classpath"/>
- <classpath path="${build.tests.classes}"/>
- <formatter usefile="true" type="plain" extension="-jdk15-loadtime-tests.txt"/>
- <formatter usefile="true" type="xml" extension="-jdk15-loadtime-tests.xml"/>
- <test fork="yes" todir="${report.dir}" name="org.jboss.test.aop.regression.jbaop206inheritadvised.AOPTester"/>
- <test fork="yes" todir="${report.dir}" name="org.jboss.test.aop.regression.jbaop194_undeploy.UndeployTester"/>
- <test fork="yes" todir="${report.dir}" name="org.jboss.test.aop.regression.jbaop197.OwnConstructorTestCase"/>
- <test fork="yes" todir="${report.dir}" name="org.jboss.test.aop.regression.jbaop110.InnerClassTestCase"/>
- <test fork="yes" todir="${report.dir}" name="org.jboss.test.aop.regression.annotatedIntroduction.AOPTester"/>
- <test fork="yes" todir="${report.dir}" name="org.jboss.test.aop.regression.statictest.AOPTester"/>
- <test fork="yes" todir="${report.dir}" name="org.jboss.test.aop.regression.inheritedmcall.AOPTester"/>
- <test fork="yes" todir="${report.dir}" name="org.jboss.test.aop.regression.arraymethodparam.ArrayMethodParamTestCase"/>
- <test fork="yes" todir="${report.dir}" name="org.jboss.test.aop.regression.inheritedfield.InheritedFieldTestCase"/>
- <test fork="yes" todir="${report.dir}" name="org.jboss.test.aop.regression.ejbthree315.UnderscoreMethodTester"/>
- <test fork="yes" todir="${report.dir}" name="org.jboss.test.aop.regression.jbaop137.ExtenderTestCase"/>
- </junit>
- <junit printsummary="yes" fork="yes" haltonfailure="no">
- <sysproperty key="jboss.aop.path" value="${source.res}/test/field/jboss-aop.xml"/>
- <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar"/>
- <classpath>
- <path refid="test15.classpath"/>
- <pathelement location="${build.tests.classes}"/>
- <pathelement location="docs"/>
- </classpath>
- <formatter usefile="true" type="plain" extension="-jdk15-loadtime-tests.txt"/>
- <formatter usefile="true" type="xml" extension="-jdk15-loadtime-tests.xml"/>
- <test todir="${report.dir}" name="org.jboss.test.aop.field.FieldTestCase" />
- </junit>
- <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>
- <path refid="test15.classpath"/>
- <pathelement location="${build.tests.classes}"/>
- <pathelement location="docs"/>
- </classpath>
- <formatter usefile="true" type="plain" extension="-jdk15-loadtime-tests.txt"/>
- <formatter usefile="true" type="xml" extension="-jdk15-loadtime-tests.xml"/>
- <test todir="${report.dir}" name="org.jboss.test.aop.basic.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>
- <path refid="test15.classpath"/>
- <pathelement location="${build.tests.classes}"/>
- <pathelement location="docs"/>
- </classpath>
- <formatter usefile="true" type="plain" extension="-jdk15-loadtime-tests.txt"/>
- <formatter usefile="true" type="xml" extension="-jdk15-loadtime-tests.xml"/>
- <test todir="${report.dir}" name="org.jboss.test.aop.jdk15.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>
- <path refid="test15.classpath"/>
- <pathelement location="${build.tests.classes}"/>
- <pathelement location="docs"/>
- </classpath>
- <formatter usefile="true" type="plain" extension="-jdk15-loadtime-tests.txt"/>
- <formatter usefile="true" type="xml" extension="-jdk15-loadtime-tests.xml"/>
- <test todir="${report.dir}" name="org.jboss.test.aop.jdk15.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>
- <path refid="test15.classpath"/>
- <pathelement location="${build.tests.classes}"/>
- <pathelement location="docs"/>
- </classpath>
- <formatter usefile="true" type="plain" extension="-jdk15-loadtime-tests.txt"/>
- <formatter usefile="true" type="xml" extension="-jdk15-loadtime-tests.xml"/>
- <test todir="${report.dir}" name="org.jboss.test.aop.jdk15.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="scenario.jar" value="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario.jar"/>
- <sysproperty key="java5Agent" value="true"/>
- <sysproperty key="jboss.aop.instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor"/>
- <!-- 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"/>
- <pathelement location="${build.tests.classes}"/>
- <pathelement location="docs"/>
- </classpath>
- <formatter usefile="true" type="plain" extension="-jdk15-loadtime-tests.txt"/>
- <formatter usefile="true" type="xml" extension="-jdk15-loadtime-tests.xml"/>
- <test todir="${report.dir}" name="org.jboss.test.aop.jdk15.dynamic.prepareAll.HotSwapDisabledTester" />
- </junit>
-
- <junit printsummary="yes" fork="yes" haltonfailure="no">
- <sysproperty key="jboss.aop.path" value="${source.res}/test/jdk15/dynamic/prepareConstructor/jboss-aop.xml"/>
- <sysproperty key="scenario.jar" value="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario.jar"/>
- <sysproperty key="java5Agent" value="true"/>
- <sysproperty key="jboss.aop.instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor"/>
- <sysproperty key="jboss.aop.prune" value="false"/>
- <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar"/>
- <classpath>
- <path refid="test15.classpath"/>
- <pathelement location="${build.tests.classes}"/>
- <pathelement location="docs"/>
- </classpath>
- <formatter usefile="true" type="plain" extension="-jdk15-loadtime-tests.txt"/>
- <formatter usefile="true" type="xml" extension="-jdk15-loadtime-tests.xml"/>
- <test todir="${report.dir}" name="org.jboss.test.aop.jdk15.dynamic.prepareConstructor.HotSwapDisabledTester" />
- </junit>
- <junit printsummary="yes" fork="yes" haltonfailure="no">
- <sysproperty key="jboss.aop.path" value="${source.res}/test/jdk15/dynamic/prepareMethod/jboss-aop.xml"/>
- <sysproperty key="scenario.jar" value="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario.jar"/>
- <sysproperty key="java5Agent" value="true"/>
- <sysproperty key="jboss.aop.prune" value="false"/>
- <sysproperty key="jboss.aop.instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor"/>
- <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar"/>
- <classpath>
- <path refid="test15.classpath"/>
- <pathelement location="${build.tests.classes}"/>
- <pathelement location="docs"/>
- </classpath>
- <formatter usefile="true" type="plain" extension="-jdk15-loadtime-tests.txt"/>
- <formatter usefile="true" type="xml" extension="-jdk15-loadtime-tests.xml"/>
- <test todir="${report.dir}" name="org.jboss.test.aop.jdk15.dynamic.prepareMethod.HotSwapDisabledTester" />
- </junit>
- <junit printsummary="yes" fork="yes" haltonfailure="no">
- <sysproperty key="jboss.aop.path" value="${source.res}/test/jdk15/dynamic/prepareField/jboss-aop.xml"/>
- <sysproperty key="scenario.jar" value="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario.jar"/>
- <sysproperty key="java5Agent" value="true"/>
- <sysproperty key="jboss.aop.instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor"/>
- <sysproperty key="jboss.aop.prune" value="false"/>
- <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar"/>
- <classpath>
- <path refid="test15.classpath"/>
- <pathelement location="${build.tests.classes}"/>
- <pathelement location="docs"/>
- </classpath>
- <formatter usefile="true" type="plain" extension="-jdk15-loadtime-tests.txt"/>
- <formatter usefile="true" type="xml" extension="-jdk15-loadtime-tests.xml"/>
- <test todir="${report.dir}" name="org.jboss.test.aop.jdk15.dynamic.prepareField.HotSwapDisabledTester" />
- </junit>
- <junit printsummary="yes" fork="yes" haltonfailure="no">
- <sysproperty key="jboss.aop.path" value="${source.res}/test/jdk15/dynamic/prepareFieldGet/jboss-aop.xml"/>
- <sysproperty key="scenario.jar" value="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario.jar"/>
- <sysproperty key="java5Agent" value="true"/>
- <sysproperty key="jboss.aop.instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor"/>
- <sysproperty key="jboss.aop.prune" value="false"/>
- <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar"/>
- <classpath>
- <path refid="test15.classpath"/>
- <pathelement location="${build.tests.classes}"/>
- <pathelement location="docs"/>
- </classpath>
- <formatter usefile="true" type="plain" extension="-jdk15-loadtime-tests.txt"/>
- <formatter usefile="true" type="xml" extension="-jdk15-loadtime-tests.xml"/>
- <test todir="${report.dir}" name="org.jboss.test.aop.jdk15.dynamic.prepareFieldGet.HotSwapDisabledTester" />
- </junit>
- <junit printsummary="yes" fork="yes" haltonfailure="no">
- <sysproperty key="jboss.aop.path" value="${source.res}/test/jdk15/dynamic/prepareFieldSet/jboss-aop.xml"/>
- <sysproperty key="scenario.jar" value="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario.jar"/>
- <sysproperty key="java5Agent" value="true"/>
- <sysproperty key="jboss.aop.instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor"/>
- <sysproperty key="jboss.aop.prune" value="false"/>
- <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar"/>
- <classpath>
- <path refid="test15.classpath"/>
- <pathelement location="${build.tests.classes}"/>
- <pathelement location="docs"/>
- </classpath>
- <formatter usefile="true" type="plain" extension="-jdk15-loadtime-tests.txt"/>
- <formatter usefile="true" type="xml" extension="-jdk15-loadtime-tests.xml"/>
- <test todir="${report.dir}" name="org.jboss.test.aop.jdk15.dynamic.prepareFieldSet.HotSwapDisabledTester" />
- </junit>
- </target>
-
- <target name="methodoverride" depends="jars15">
-
- <javac destdir="${build.tests.classes}"
- source="1.5"
- debug="on">
- <src path="${source.tests.java}"/>
- <include name="org/jboss/test/aop/**"/>
- <!-- just to make the tests compile -->
- <exclude name="org/jboss/test/aop/methodhashing/*"/>
- <classpath refid="test15.classpath"/>
- </javac>
-
-
- <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/>
- <path id="aop.task.classpath">
- <path refid="test15.classpath"/>
- <pathelement location="${build.tests.classes}"/>
- <pathelement location="docs"/>
- </path>
-
- <aopc compilerclasspathref="aop.task.classpath">
- <sysproperty key="jboss.aop.debug.classes" value="true"/>
- <classpath refid="aop.task.classpath"/>
- <classpath path="${build.tests.classes}"/>
- <src path="${build.tests.classes}"/>
- <include name="org/jboss/test/aop/methodoverride/*"/>
- <!--
- <aoppath path="${source.res}/test/methodoverride/jboss-aop.xml"/>
- -->
- <aopclasspath path="${build.tests.classes}"/>
- </aopc>
- <property name="report.dir" value="${build.reports}"/>
- <mkdir dir="${report.dir}"/>
- <junit printsummary="yes" fork="yes" haltonfailure="no">
- <sysproperty key="jboss.aop.class.path" value="${build.tests.classes}"/>
-
- <!--
- <sysproperty key="jboss.aop.path" value="${source.res}/test/methodoverride/jboss-aop.xml"/>
- <sysproperty key="jboss.aop.verbose" value="true"/>
- <sysproperty key="jboss.aop.debug.classes" value="false"/>
- <sysproperty key="jboss.aop.instrumentor" value="org.jboss.aop.instrument.GeneratedAdvisorInstrumentor"/>
- -->
- <sysproperty key="jboss.aop.instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor"/>
- <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar"/>
- <classpath>
- <path refid="test15.classpath"/>
- <pathelement location="${build.tests.classes}"/>
- <pathelement location="docs"/>
- </classpath>
- <formatter usefile="true" type="plain" extension="-jdk15-loadtime-tests.txt"/>
- <formatter usefile="true" type="xml" extension="-jdk15-loadtime-tests.xml"/>
- <test todir="${report.dir}" name="org.jboss.test.aop.methodoverride.MethodOverrideTestCase" />
- </junit>
- </target>
-
-
- <target name="jdk15-precompiled-tests" depends="compile-jdk15-tests">
-
- <property name="report.dir" value="${build.reports}"/>
- <mkdir dir="${report.dir}"/>
-
- <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/>
- <path id="aop.task.classpath">
- <path refid="test15.classpath"/>
- <pathelement location="${build.tests.classes}"/>
- <pathelement location="docs"/>
- </path>
-
- <aopc compilerclasspathref="aop.task.classpath">
- <classpath refid="aop.task.classpath"/>
- <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>
-
- <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>
- <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">
- <sysproperty key="jboss.aop.instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor"/>
- <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>
- <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">
- <sysproperty key="jboss.aop.instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor"/>
- <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>
- <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">
- <sysproperty key="jboss.aop.instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor"/>
- <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>
- <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">
- <sysproperty key="jboss.aop.instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor"/>
- <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>
- <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">
- <sysproperty key="jboss.aop.instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor"/>
- <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>
- <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">
- <sysproperty key="jboss.aop.instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor"/>
- <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}"/>
- <classpath>
- <path refid="test15.classpath"/>
- <pathelement location="${build.tests.classes}"/>
- <pathelement location="docs"/>
- </classpath>
- <formatter usefile="true" type="plain" extension="-jdk15-precompiled-tests.txt"/>
- <formatter usefile="true" type="xml" extension="-jdk15-precompiled-tests.xml"/>
- <test todir="${report.dir}" name="org.jboss.test.aop.jdk15.AOPTester"/>
- <test todir="${report.dir}" 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/basic/jboss-aop.xml"/>
- <sysproperty key="jboss.aop.class.path" value="${build.tests.classes}"/>
- <classpath>
- <path refid="test15.classpath"/>
- <pathelement location="${build.tests.classes}"/>
- <pathelement location="docs"/>
- </classpath>
- <formatter usefile="true" type="plain" extension="-jdk15-precompiled-tests.txt"/>
- <formatter usefile="true" type="xml" extension="-jdk15-precompiled-tests.xml"/>
- <test todir="${report.dir}" name="org.jboss.test.aop.basic.AOPTester"/>
- </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="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}"/>
- <pathelement location="docs"/>
- </classpath>
- <formatter usefile="true" type="plain" extension="-jdk15-precompiled-tests.txt"/>
- <formatter usefile="true" type="xml" extension="-jdk15-precompiled-tests.xml"/>
- <test todir="${report.dir}" name="org.jboss.test.aop.jdk15.dynamic.prepareAll.HotSwapDisabledTester" />
- </junit>
- <junit printsummary="yes" fork="yes" haltonfailure="no">
- <sysproperty key="jboss.aop.path" value="${source.res}/test/jdk15/dynamic/prepareConstructor/jboss-aop.xml"/>
- <sysproperty key="scenario.jar"
- value="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenarioAopcPrepareConstructor.jar"/>
- <classpath>
- <path refid="test15.classpath"/>
- <pathelement location="${build.tests.classes}"/>
- <pathelement location="docs"/>
- </classpath>
- <formatter usefile="true" type="plain" extension="-jdk15-precompiled-tests.txt"/>
- <formatter usefile="true" type="xml" extension="-jdk15-precompiled-tests.xml"/>
- <test todir="${report.dir}" name="org.jboss.test.aop.jdk15.dynamic.prepareConstructor.HotSwapDisabledTester" />
- </junit>
- <junit printsummary="yes" fork="yes" haltonfailure="no">
- <sysproperty key="jboss.aop.path" value="${source.res}/test/jdk15/dynamic/prepareField/jboss-aop.xml"/>
- <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}"/>
- <pathelement location="docs"/>
- </classpath>
- <formatter usefile="true" type="plain" extension="-jdk15-precompiled-tests.txt"/>
- <formatter usefile="true" type="xml" extension="-jdk15-precompiled-tests.xml"/>
- <test todir="${report.dir}" name="org.jboss.test.aop.jdk15.dynamic.prepareField.HotSwapDisabledTester" />
- </junit>
- <junit printsummary="yes" fork="yes" haltonfailure="no">
- <sysproperty key="jboss.aop.path" value="${source.res}/test/jdk15/dynamic/prepareFieldGet/jboss-aop.xml"/>
- <sysproperty key="scenario.jar"
- value="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenarioAopcPrepareFieldGet.jar"/>
- <classpath>
- <path refid="test15.classpath"/>
- <pathelement location="${build.tests.classes}"/>
- <pathelement location="docs"/>
- </classpath>
- <formatter usefile="true" type="plain" extension="-jdk15-precompiled-tests.txt"/>
- <formatter usefile="true" type="xml" extension="-jdk15-precompiled-tests.xml"/>
- <test todir="${report.dir}" name="org.jboss.test.aop.jdk15.dynamic.prepareFieldGet.HotSwapDisabledTester" />
- </junit>
- <junit printsummary="yes" fork="yes" haltonfailure="no">
- <sysproperty key="jboss.aop.path" value="${source.res}/test/jdk15/dynamic/prepareFieldSet/jboss-aop.xml"/>
- <sysproperty key="scenario.jar"
- value="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenarioAopcPrepareFieldSet.jar"/>
- <classpath>
- <path refid="test15.classpath"/>
- <pathelement location="${build.tests.classes}"/>
- <pathelement location="docs"/>
- </classpath>
- <formatter usefile="true" type="plain" extension="-jdk15-precompiled-tests.txt"/>
- <formatter usefile="true" type="xml" extension="-jdk15-precompiled-tests.xml"/>
- <test todir="${report.dir}" 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="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}"/>
- <pathelement location="docs"/>
- </classpath>
- <formatter usefile="true" type="plain" extension="-jdk15-precompiled-tests.txt"/>
- <formatter usefile="true" type="xml" extension="-jdk15-precompiled-tests.xml"/>
- <test todir="${report.dir}" name="org.jboss.test.aop.jdk15.dynamic.prepareMethod.HotSwapDisabledTester" />
- </junit>
- </target>
- <target name="jdk15-hotswap-tests" depends="compile-jdk15-tests">
-
- <property name="report.dir" value="${build.reports}/jdk15-hotswap-tests"/>
- <mkdir dir="${report.dir}"/>
-
- <junit printsummary="yes" fork="yes" haltonfailure="no">
- <sysproperty key="jboss.aop.path" value="${source.res}/test/jdk15/dynamic/prepareAll/jboss-aop.xml"/>
- <sysproperty key="scenario.jar" value="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario.jar"/>
- <!-- 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"/>
- <formatter usefile="true" type="xml"/>
- <test todir="${report.dir}" 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"/>
- <formatter usefile="true" type="xml"/>
- <test todir="${report.dir}" 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"/>
- <formatter usefile="true" type="xml"/>
- <test todir="${report.dir}" 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"/>
- <formatter usefile="true" type="xml"/>
- <test todir="${report.dir}" 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"/>
- <formatter usefile="true" type="xml"/>
- <test todir="${report.dir}" 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"/>
- <formatter usefile="true" type="xml"/>
- <test todir="${report.dir}" name="org.jboss.test.aop.jdk15.dynamic.prepareFieldSet.HotSwapEnabledTester" />
- </junit>
- </target>
-
- <target name="jrockit-loadtime-tests" depends="compile-test-classes" if="JROCKIT_AVAILABLE">
-
- <property name="report.dir" value="${build.reports}/jroockit-loadtime-tests"/>
- <mkdir dir="${report.dir}"/>
-
- <junit printsummary="yes" fork="yes" haltonfailure="no" jvm="${jrockit.home}/bin/java">
- <sysproperty key="jboss.aop.path" value="${source.res}/test/basic/jboss-aop.xml"/>
- <sysproperty key="verbose" value="true"/>
- <jvmarg value="-Xmanagement:class=org.jboss.aop.hook.JRockitClassPreProcessor"/>
- <classpath refid="test.jrockit.classpath"/>
- <classpath path="${build.tests.classes}"/>
- <formatter usefile="true" type="plain"/>
- <formatter usefile="true" type="xml"/>
- <test todir="${report.dir}" name="org.jboss.test.aop.basic.AOPTester" />
- </junit>
- <junit printsummary="yes" fork="yes" haltonfailure="no" jvm="${jrockit.home}/bin/java">
- <jvmarg value="-Xmanagement:class=org.jboss.aop.hook.JRockitClassPreProcessor"/>
- <sysproperty key="jboss.aop.path" value="${source.res}/test/reflection/jboss-aop.xml"/>
- <classpath>
- <path refid="test.jrockit.classpath"/>
- <pathelement location="${build.tests.classes}"/>
- </classpath>
- <formatter type="plain"/>
- <formatter usefile="true" type="xml"/>
- <test todir="${report.dir}" fork="yes" name="org.jboss.test.aop.reflection.ReflectionTester"/>
- </junit>
- <junit printsummary="yes" fork="yes" haltonfailure="no" jvm="${jrockit.home}/bin/java">
- <jvmarg value="-Xmanagement:class=org.jboss.aop.hook.JRockitClassPreProcessor"/>
- <sysproperty key="jboss.aop.path" value="${source.res}/test/dotinpointcutname/jboss-aop.xml"/>
- <classpath>
- <path refid="test.jrockit.classpath"/>
- <pathelement location="${build.tests.classes}"/>
- </classpath>
- <formatter type="plain"/>
- <formatter usefile="true" type="xml"/>
- <test todir="${report.dir}" fork="yes" name="org.jboss.test.aop.dotinpointcutname.DotInPointcutNameTestCase"/>
- </junit>
- <junit printsummary="yes" fork="yes" haltonfailure="no" jvm="${jrockit.home}/bin/java">
- <jvmarg value="-Xmanagement:class=org.jboss.aop.hook.JRockitClassPreProcessor"/>
- <sysproperty key="jboss.aop.path" value="${source.res}/test/introduction/introduction-aop.xml"/>
- <formatter type="plain"/>
- <formatter usefile="true" type="xml"/>
- <classpath>
- <path refid="test.jrockit.classpath"/>
- <pathelement location="${build.tests.classes}"/>
- </classpath>
- <test todir="${report.dir}" fork="yes" name="org.jboss.test.aop.introduction.IntroductionTester"/>
- </junit>
- <junit printsummary="yes" fork="yes" haltonfailure="no" jvm="${jrockit.home}/bin/java">
- <jvmarg value="-Xmanagement:class=org.jboss.aop.hook.JRockitClassPreProcessor"/>
- <sysproperty key="jboss.aop.path" value="${source.res}/test/precedence/jboss-aop.xml"/>
- <classpath>
- <path refid="test.jrockit.classpath"/>
- <pathelement location="${build.tests.classes}"/>
- <pathelement location="docs"/>
- </classpath>
- <formatter type="plain"/>
- <formatter usefile="true" type="xml"/>
- <test todir="${report.dir}" fork="yes" name="org.jboss.test.aop.precedence.PrecedenceTester"/>
- </junit>
- <junit printsummary="yes" fork="yes" haltonfailure="no" jvm="${jrockit.home}/bin/java">
- <jvmarg value="-Xmanagement:class=org.jboss.aop.hook.JRockitClassPreProcessor"/>
- <sysproperty key="jboss.aop.path" value="${source.res}/test/regression/jboss-aop.xml"/>
- <formatter type="plain"/>
- <formatter usefile="true" type="xml"/>
- <classpath>
- <path refid="test.jrockit.classpath"/>
- <pathelement location="${build.tests.classes}"/>
- </classpath>
- <test todir="${report.dir}" fork="yes" name="org.jboss.test.aop.regression.jbaop206inheritadvised.AOPTester"/>
- <test todir="${report.dir}" fork="yes" name="org.jboss.test.aop.regression.jbaop194_undeploy.UndeployTester"/>
- <test todir="${report.dir}" fork="yes" name="org.jboss.test.aop.regression.jbaop197.OwnConstructorTestCase"/>
- <test todir="${report.dir}" fork="yes" name="org.jboss.test.aop.regression.jbaop110.InnerClassTestCase"/>
- <test todir="${report.dir}" fork="yes" name="org.jboss.test.aop.regression.annotatedIntroduction.AOPTester"/>
- <test todir="${report.dir}" fork="yes" name="org.jboss.test.aop.regression.statictest.AOPTester"/>
- <test todir="${report.dir}" fork="yes" name="org.jboss.test.aop.regression.inheritedmcall.AOPTester"/>
- <test todir="${report.dir}" fork="yes" name="org.jboss.test.aop.regression.arraymethodparam.ArrayMethodParamTestCase"/>
- <test todir="${report.dir}" fork="yes" name="org.jboss.test.aop.regression.inheritedfield.InheritedFieldTestCase"/>
- <test todir="${report.dir}" fork="yes" name="org.jboss.test.aop.regression.ejbthree315.UnderscoreMethodTester"/>
- <test todir="${report.dir}" fork="yes" name="org.jboss.test.aop.regression.jbaop137.ExtenderTestCase"/>
- </junit>
- </target>
-
- <target name="compiletime-declare" depends="compile-test-classes">
- <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/>
- <taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC" classpathref="jboss.aop.classpath"/>
- <path id="aop.task.classpath">
- <path refid="library.classpath"/>
- <path refid="dependentmodule.classpath"/>
- <path refid="jboss.aop.classpath"/>
- </path>
-
- <annotationc compilerclasspathref="aop.task.classpath" bytecode="true">
- <classpath refid="aop.task.classpath"/>
- <classpath path="${build.tests.classes}"/>
- <src path="${source.tests.java}"/>
- <include name="org/jboss/test/aop/annotated/declare/*.java"/>
- </annotationc>
-
- <echo>
- ===== The output of the aopc task should look as follows: ====
- 4 x This is an expected warning: Cannot call business layer from datalayer.
- 1 x This is an expected warning: CAR should be mentioned in msg
- 1 x This is an expected warning: Cannot call business layer from Car.badMethod()
- 1 x This is an expected warning: FOURWHEELER should be mentioned in msg
- 1 x This is an expected warning: TRUCK should be mentioned in msg
- 1 x Expected annotated warning
- </echo>
-
- <echo>
- =======================================================
-
- RUNNING AOPC TASK
- </echo>
-
- <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/declare/**"/>
- <include name="org/jboss/test/aop/annotated/declare/**"/>
- <aoppath path="${source.res}/test/declare/jboss-aop.xml"/>
- <aopclasspath path="${build.tests.classes}"/>
- </aopc>
- </target>
-
-
- <target name="system-classloader-test" depends="compile-test-classes">
- <!-- Even though this is deprecated we should still make sure it works from time to time -->
- <junit printsummary="yes" fork="no" haltonfailure="false">
- <sysproperty key="java.system.class.loader" value="org.jboss.aop.standalone.SystemClassLoader"/>
- <sysproperty key="jboss.aop.path" value="${source.res}/test/basic/jboss-aop.xml"/>
- <sysproperty key="jboss.aop.instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor"/>
- <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>
- </target>
-
-
- <target name="original-memory-test" depends="compile-test-classes" description="Execute MemoryLeakTestCase">
- <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"/>
- <property name="test" value="memoryleaks"/>
- <property name="caller" value="memoryleaks"/>
- <property name="aoppath" value="${source.res}/test/${test}/jboss-aop.xml"/>
- <property name="optimized" value="yes"/>
- <echo>Source=${build.tests.classes}</echo>
- <echo message="aoppath=${aoppath}"/>
-
- <!-- aopc -->
- <aopc compilerclasspathref="aop.task.classpath">
- <classpath refid="aop.task.classpath"/>
- <classpath path="${build.tests.classes}"/>
- <aoppath path="${aoppath}"/>
- <src path="${build.tests.classes}"/>
- <include name="org/jboss/test/aop/${test}/**"/>
- <aopclasspath path="${build.tests.classes}"/>
- </aopc>
-
- <junit printsummary="yes" fork="yes" haltonfailure="no">
- <sysproperty key="jboss.aop.path" value="${aoppath}"/>
- <classpath refid="test15.classpath"/>
- <classpath path="${build.tests.classes}"/>
- <jvmarg value="-agentlib:jbossAgent"/>
- <formatter usefile="true" type="xml"/>
- <formatter usefile="true" type="plain"/>
- <test fork="yes" name="org.jboss.test.aop.memoryleaks.MemoryLeakTester"/>
- </junit>
- </target>
-
- <target name="memory-tests" depends="compile-test-classes, compile-jdk15-tests">
- <taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC" classpathref="jboss.aop.classpath"/>
- <annotationc compilerclasspathref="aop.task.classpath" bytecode="true">
- <classpath refid="aop.task.classpath"/>
- <classpath path="${build.tests.classes}"/>
- <src path="${source.tests.java}"/>
- <include name="org/jboss/test/aop/annotatedcflow/*.java"/>
- <include name="org/jboss/test/aop/annotatedparams/*.java"/>
- <include name="org/jboss/test/aop/perjoinpoint/*.java"/>
- <include name="org/jboss/test/aop/annotated/*.java"/>
- <include name="org/jboss/test/aop/instanceofannotated/*.java"/>
- <include name="org/jboss/test/aop/implementz/*.java"/>
- </annotationc>
-
- <antcall target="memory-test" inheritRefs="true">
- <param name="test" value="annotatedcflow"/>
- <param name="case" value="AnnotatedCFlowTestCase"/>
- </antcall>
- <antcall target="memory-test" inheritRefs="true">
- <param name="test" value="annotatedparams"/>
- <param name="case" value="AnnotatedParamsTester"/>
- </antcall>
- <antcall target="memory-test" inheritRefs="true">
- <param name="test" value="args"/>
- <param name="case" value="ArgsTestCase"/>
- </antcall>
- <antcall target="memory-test" inheritRefs="true">
- <param name="test" value="basic"/>
- <param name="case" value="AOPTester"/>
- </antcall>
- <antcall target="memory-test" inheritRefs="true">
- <param name="test" value="beanstyleconfig"/>
- <param name="case" value="ConfigTester"/>
- </antcall>
- <antcall target="memory-test" inheritRefs="true">
- <param name="test" value="callerargs"/>
- <param name="case" value="CallerArgsTestCase"/>
- </antcall>
- <antcall target="memory-test" inheritRefs="true">
- <param name="test" value="callerscope"/>
- <param name="case" value="CallerScopeTestCase"/>
- </antcall>
- <antcall target="memory-test" inheritRefs="true">
- <param name="test" value="construction"/>
- <param name="case" value="ConstructionTester"/>
- </antcall>
- <antcall target="memory-test" inheritRefs="true">
- <param name="test" value="constructortarget"/>
- <param name="case" value="ConstructorTargetTester"/>
- </antcall>
- <antcall target="memory-test" inheritRefs="true">
- <param name="test" value="dotinpointcutname"/>
- <param name="case" value="DotInPointcutNameTestCase"/>
- </antcall>
- <antcall target="memory-test" inheritRefs="true">
- <param name="test" value="implementz"/>
- <param name="case" value="ImplementsTester"/>
- </antcall>
- <antcall target="memory-test" inheritRefs="true">
- <param name="test" value="instanceofannotated"/>
- <param name="case" value="InstanceOfAnnotatedTester"/>
- </antcall>
- <antcall target="memory-test" inheritRefs="true">
- <param name="test" value="introduction"/>
- <param name="case" value="IntroductionTester"/>
- </antcall>
- <antcall target="memory-test" inheritRefs="true">
- <param name="test" value="override"/>
- <param name="case" value="OverrideTestCase"/>
- </antcall>
- <antcall target="memory-test" inheritRefs="true">
- <param name="test" value="perjoinpoint"/>
- <param name="case" value="PerJoinpointTester"/>
- </antcall>
- <antcall target="memory-test" inheritRefs="true">
- <param name="test" value="scope"/>
- <param name="case" value="ScopeTestCase"/>
- </antcall>
- </target>
-
- <target name="memory-test" depends="init">
- <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/>
- <property name="aoppath" value="${source.res}/test/${test}/jboss-aop.xml"/>
- <property name="testcase" value="org.jboss.test.aop.${test}.${case}"/>
-
-
- <aopc compilerclasspathref="aop.task.classpath">
- <classpath refid="aop.task.classpath"/>
- <classpath path="${build.tests.classes}"/>
- <aoppath path="${aoppath}"/>
- <src path="${build.tests.classes}"/>
- <include name="org/jboss/test/aop/${test}/**"/>
- <aopclasspath path="${build.tests.classes}"/>
- </aopc>
-
- <property name="report.dir" value="${build.reports}"/>
- <mkdir dir="${report.dir}/memory-tests"/>
-
- <echo>${testcase}</echo>
- <junit printsummary="yes" fork="yes" haltonfailure="no">
- <sysproperty key="jboss.aop.path" value="${aoppath}"/>
- <sysproperty key="test.to.run" value="${testcase}"/>
- <sysproperty key="leak.report.dir" value="${report.dir}"/>
- <classpath refid="test.classpath"/>
- <classpath path="${build.tests.classes}"/>
- <jvmarg value="-agentlib:jbossAgent"/>
- <formatter usefile="true" type="xml" extension="-${testcase}.xml"/>
- <formatter usefile="true" type="plain" extension="-${testcase}.txt"/>
- <test fork="yes" name="org.jboss.test.aop.memoryleaks.MemoryLeakTestCase" todir="${report.dir}"/>
- </junit>
- </target>
-
- <target name="compile-stylesheets" depends="configure">
- <mkdir dir="${build.stylesheets}"/>
- <copy todir="${build.stylesheets}" filtering="yes">
- <fileset dir="${source.stylesheets}">
- <include name="**/*"/>
- </fileset>
- </copy>
- </target>
-
- <target name="tests-report-html" depends="compile-stylesheets">
- <mkdir dir="${build.reports}/html"/>
-
- <junitreport todir="${build.reports}">
- <fileset dir="${build.reports}">
- <include name="TEST-*.xml"/>
- </fileset>
- <report format="frames"
- todir="${build.reports}/html"
- styledir="${build.stylesheets}"
- />
- </junitreport>
- </target>
-
</project>
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/AnnotationIntroductionDef.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/AnnotationIntroductionDef.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/AnnotationIntroductionDef.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -21,12 +21,18 @@
*/
package org.jboss.aop;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
/**
*
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
* @version $Revision$
*/
-public interface AnnotationIntroductionDef
+ at Target (ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME)
+ public @interface AnnotationIntroductionDef
{
String expr();
boolean invisible();
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/Aspect.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/Aspect.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/Aspect.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -23,13 +23,19 @@
import org.jboss.aop.advice.Scope;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
/**
* Annotation for specifying an $lt;aspect>
*
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
* @version $Revision$
*/
-public interface Aspect
+ at Target({ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME)
+ public @interface Aspect
{
- Scope scope();
+ Scope scope() default Scope.PER_VM;
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/Bind.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/Bind.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/Bind.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -21,15 +21,21 @@
*/
package org.jboss.aop;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
/**
- * Annotation to bind an advice to a pointcut
+ * Comment
*
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
* @version $Revision$
*/
-public interface Bind
+ at Target({ElementType.METHOD, ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME)
+ public @interface Bind
{
String pointcut();
- String cflow();
+ String cflow() default "";
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/CFlowDef.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/CFlowDef.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/CFlowDef.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -22,12 +22,13 @@
package org.jboss.aop;
/**
- *
- * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision$
+ * Created by IntelliJ IDEA.
+ * User: Kab
+ * Date: 04-Oct-2004
+ * Time: 18:40:22
+ * To change this template use File | Settings | File Templates.
*/
-public interface CFlowDef
-{
- boolean called();
- String expr();
+public @interface CFlowDef {
+ boolean called();
+ String expr();
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/CFlowStackDef.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/CFlowStackDef.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/CFlowStackDef.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -21,12 +21,18 @@
*/
package org.jboss.aop;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
/**
*
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
* @version $Revision$
*/
-public interface CFlowStackDef
+ at Target({ElementType.FIELD}) @Retention(RetentionPolicy.RUNTIME)
+ public @interface CFlowStackDef
{
CFlowDef[] cflows();
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/DeclareError.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/DeclareError.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/DeclareError.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -21,12 +21,17 @@
*/
package org.jboss.aop;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
*
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
* @version $Revision$
*/
-public interface DeclareError
+ at Target({ElementType.FIELD}) @Retention(RetentionPolicy.RUNTIME)
+public @interface DeclareError
{
String expr();
String msg();
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/DeclareWarning.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/DeclareWarning.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/DeclareWarning.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -21,12 +21,17 @@
*/
package org.jboss.aop;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
*
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
* @version $Revision$
*/
-public interface DeclareWarning
+ at Target({ElementType.FIELD}) @Retention(RetentionPolicy.RUNTIME)
+public @interface DeclareWarning
{
String expr();
String msg();
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/DynamicCFlowDef.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/DynamicCFlowDef.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/DynamicCFlowDef.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -21,11 +21,17 @@
*/
package org.jboss.aop;
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
/**
*
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
* @version $Revision$
*/
-public interface DynamicCFlowDef
+ at Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME)
+public @interface DynamicCFlowDef
{
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/InterceptorDef.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/InterceptorDef.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/InterceptorDef.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -21,6 +21,12 @@
*/
package org.jboss.aop;
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+
import org.jboss.aop.advice.Scope;
/**
@@ -28,7 +34,8 @@
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
* @version $Revision$
*/
-public interface InterceptorDef
+ at Target({ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME)
+public @interface InterceptorDef
{
- Scope scope();
+ Scope scope() default Scope.PER_VM;
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/Introduction.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/Introduction.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/Introduction.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -21,14 +21,21 @@
*/
package org.jboss.aop;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
/**
*
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
* @version $Revision$
*/
-public interface Introduction
+
+ at Target({ElementType.FIELD}) @Retention(RetentionPolicy.RUNTIME)
+public @interface Introduction
{
- Class target();
- String typeExpression();
+ Class target() default java.lang.Class.class;
+ String typeExpression() default "";
Class[] interfaces();
-}
+}
\ No newline at end of file
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/Mixin.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/Mixin.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/Mixin.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -21,16 +21,21 @@
*/
package org.jboss.aop;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
/**
*
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
* @version $Revision$
*/
-public interface Mixin //extends Introduction
+ at Target({ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME)
+public @interface Mixin
{
- Class target();
- String typeExpression();
+ Class target() default java.lang.Class.class;
+ String typeExpression() default "";
Class[] interfaces();
- boolean isTransient();
-}
-
+ boolean isTransient() default true;
+}
\ No newline at end of file
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/PointcutDef.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/PointcutDef.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/PointcutDef.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -21,13 +21,19 @@
*/
package org.jboss.aop;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
/**
- * Annotation
+ * Comment
*
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
* @version $Revision$
*/
-public interface PointcutDef
+ at Target({ElementType.FIELD}) @Retention(RetentionPolicy.RUNTIME)
+ public @interface PointcutDef
{
String value();
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/Precedence.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/Precedence.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/Precedence.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -21,11 +21,16 @@
*/
package org.jboss.aop;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
*
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
* @version $Revision$
*/
-public interface Precedence
+ at Target({ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME)
+public @interface Precedence
{
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/PrecedenceAdvice.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/PrecedenceAdvice.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/PrecedenceAdvice.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -21,12 +21,18 @@
*/
package org.jboss.aop;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
/**
*
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
* @version $Revision$
*/
-public interface PrecedenceAdvice
+ at Target({ElementType.FIELD}) @Retention(RetentionPolicy.RUNTIME)
+public @interface PrecedenceAdvice
{
String value();
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/PrecedenceInterceptor.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/PrecedenceInterceptor.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/PrecedenceInterceptor.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -21,11 +21,17 @@
*/
package org.jboss.aop;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
/**
*
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
* @version $Revision$
*/
-public interface PrecedenceInterceptor
+ at Target({ElementType.FIELD}) @Retention(RetentionPolicy.RUNTIME)
+public @interface PrecedenceInterceptor
{
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/Prepare.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/Prepare.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/Prepare.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -21,12 +21,19 @@
*/
package org.jboss.aop;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
/**
- *
+ * If annotating a field, that field should be in a class annotated
+ * as @Aspect or @InterceptorDef
+ * If annotating a POJO, that POJO becomes prepared
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
* @version $Revision$
*/
-public interface Prepare
-{
- String value();
+ at Target({ElementType.TYPE, ElementType.FIELD}) @Retention(RetentionPolicy.RUNTIME)
+ public @interface Prepare {
+ String value() default "";
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/TypeDef.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/TypeDef.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/TypeDef.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -21,12 +21,17 @@
*/
package org.jboss.aop;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
/**
*
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
* @version $Revision$
*/
-public interface TypeDef
-{
- String value();
+ at Target({ElementType.FIELD}) @Retention(RetentionPolicy.RUNTIME)
+public @interface TypeDef {
+ String value();
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/advice/Scope.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/Scope.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/Scope.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -21,33 +21,13 @@
*/
package org.jboss.aop.advice;
-import java.io.ObjectStreamException;
-
/**
* Defines the lifecycle of an aspect or interceptor instance
*
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
* @version $Revision$
*/
-public class Scope extends org.jboss.lang.Enum
+public enum Scope
{
- static final long serialVersionUID = 7873910692644730377L;
-
- private Scope(String name, int v)
- {
- super(name, v);
- }
-
- public static final Scope PER_VM = new Scope("PER_VM", 0);
- public static final Scope PER_CLASS = new Scope("PER_CLASS", 1);
- public static final Scope PER_INSTANCE = new Scope("PER_INSTANCE", 2);
- public static final Scope PER_JOINPOINT = new Scope("PER_JOINPOINT", 3);
- public static final Scope PER_CLASS_JOINPOINT = new Scope("PER_CLASS_JOINPOINT", 4);
- private static final Scope[] values = {PER_VM, PER_CLASS, PER_INSTANCE, PER_JOINPOINT, PER_CLASS_JOINPOINT};
-
- Object readResolve() throws ObjectStreamException
- {
- return values[ordinal];
- }
-
+ PER_VM, PER_CLASS, PER_INSTANCE, PER_JOINPOINT, PER_CLASS_JOINPOINT
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/AnnotationElement.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/AnnotationElement.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/AnnotationElement.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -21,18 +21,7 @@
*/
package org.jboss.aop.annotation;
-import javassist.CtConstructor;
-import javassist.CtField;
-import javassist.CtMethod;
-import javassist.bytecode.AnnotationsAttribute;
-import javassist.bytecode.ClassFile;
-import javassist.bytecode.FieldInfo;
-import javassist.bytecode.MethodInfo;
-import javassist.bytecode.annotation.Annotation;
-
-import org.jboss.aop.annotation.PortableAnnotationElement;
-import org.jboss.aop.util.ReflectToJavassist;
-
+import java.lang.annotation.Annotation;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
@@ -47,7 +36,6 @@
*/
public class AnnotationElement extends PortableAnnotationElement
{
- private final static Object[] EMPTY_OBJECT_ARRAY = new Object[0];
/**
* Get a visible annotation for a particle Method. If this is JDK 1.5
* then this is a wrapper for Method.getAnnotation
@@ -58,23 +46,7 @@
*/
public static Object getVisibleAnnotation(Method method, Class annotation)
{
- try
- {
- CtMethod ctMethod = ReflectToJavassist.methodToJavassist(method);
- if (ctMethod == null)
- {
- return null;
- }
- MethodInfo mi = ctMethod.getMethodInfo2();
-
- AnnotationsAttribute visible = (AnnotationsAttribute) mi.getAttribute(AnnotationsAttribute.visibleTag);
- if (visible == null) return null;
- return create(visible, annotation);
- }
- catch (Exception e)
- {
- throw new RuntimeException(e); //To change body of catch statement use Options | File Templates.
- }
+ return method.getAnnotation(annotation);
}
/**
@@ -87,23 +59,7 @@
*/
public static Object getVisibleAnnotation(Constructor con, Class annotation)
{
- try
- {
- CtConstructor ctMethod = ReflectToJavassist.constructorToJavassist(con);
- if (ctMethod == null)
- {
- return null;
- }
- MethodInfo mi = ctMethod.getMethodInfo2();
-
- AnnotationsAttribute visible = (AnnotationsAttribute) mi.getAttribute(AnnotationsAttribute.visibleTag);
- if (visible == null) return null;
- return create(visible, annotation);
- }
- catch (Exception e)
- {
- throw new RuntimeException(e); //To change body of catch statement use Options | File Templates.
- }
+ return con.getAnnotation(annotation);
}
/**
@@ -116,19 +72,7 @@
*/
public static Object getVisibleAnnotation(Field field, Class annotation)
{
- try
- {
- CtField ctField = ReflectToJavassist.fieldToJavassist(field);
- FieldInfo mi = ctField.getFieldInfo2();
-
- AnnotationsAttribute visible = (AnnotationsAttribute) mi.getAttribute(AnnotationsAttribute.visibleTag);
- if (visible == null) return null;
- return create(visible, annotation);
- }
- catch (Exception e)
- {
- throw new RuntimeException(e); //To change body of catch statement use Options | File Templates.
- }
+ return field.getAnnotation(annotation);
}
/**
@@ -141,114 +85,46 @@
*/
public static Object getVisibleAnnotation(Class clazz, Class annotation)
{
- try
- {
- ClassFile cf = getClassFile(clazz);
-
- AnnotationsAttribute visible = (AnnotationsAttribute) cf.getAttribute(AnnotationsAttribute.visibleTag);
- if (visible == null) return null;
- return create(visible, annotation);
- }
- catch (Exception e)
- {
- throw new RuntimeException(e); //To change body of catch statement use Options | File Templates.
- }
+ return clazz.getAnnotation(annotation);
}
- public static boolean isVisibleAnnotationPresent(Field field, Class annotation) throws Exception
+ public static boolean isVisibleAnnotationPresent(Class clazz, Class annotation)
{
- CtField ctMethod = ReflectToJavassist.fieldToJavassist(field);
- return isVisibleAnnotationPresent(ctMethod, annotation.getName());
+ return clazz.isAnnotationPresent(annotation);
}
- public static boolean isVisibleAnnotationPresent(Class clazz, Class annotation) throws Exception
+ public static boolean isVisibleAnnotationPresent(Method m, Class annotation)
{
- ClassFile cf = getClassFile(clazz);
-
- AnnotationsAttribute visible = (AnnotationsAttribute) cf.getAttribute(AnnotationsAttribute.visibleTag);
- if (visible == null) return false;
- return visible.getAnnotation(annotation.getName()) != null;
+ return m.isAnnotationPresent(annotation);
}
- public static boolean isVisibleAnnotationPresent(Constructor con, Class annotation) throws Exception
+ public static boolean isVisibleAnnotationPresent(Field f, Class annotation)
{
- CtConstructor ctMethod = ReflectToJavassist.constructorToJavassist(con);
- return isVisibleAnnotationPresent(ctMethod, annotation.getName());
-
-
+ return f.isAnnotationPresent(annotation);
}
- public static boolean isVisibleAnnotationPresent(Method method, Class annotation) throws Exception
+ public static boolean isVisibleAnnotationPresent(Constructor con, Class annotation)
{
- CtMethod ctMethod = ReflectToJavassist.methodToJavassist(method);
- if (ctMethod == null) return false;
- MethodInfo mi = ctMethod.getMethodInfo2();
-
-
- AnnotationsAttribute visible = (AnnotationsAttribute) mi.getAttribute(AnnotationsAttribute.visibleTag);
- if (visible == null) return false;
- return visible.getAnnotation(annotation.getName()) != null;
+ return con.isAnnotationPresent(annotation);
}
public static Object[] getVisibleAnnotations(Class clazz) throws Exception
{
- try
- {
- ClassFile cf = getClassFile(clazz);
-
- AnnotationsAttribute visible = (AnnotationsAttribute) cf.getAttribute(AnnotationsAttribute.visibleTag);
- if (visible == null) return EMPTY_OBJECT_ARRAY;
- return getVisibleAnnotations(visible);
- }
- catch (Exception e)
- {
- throw new RuntimeException(e); //To change body of catch statement use Options | File Templates.
- }
+ return clazz.getAnnotations();
}
public static Object[] getVisibleAnnotations(Method m) throws Exception
{
- CtMethod ctMethod = ReflectToJavassist.methodToJavassist(m);
- if (ctMethod == null) return EMPTY_OBJECT_ARRAY;
- MethodInfo mi = ctMethod.getMethodInfo2();
-
- AnnotationsAttribute visible = (AnnotationsAttribute) mi.getAttribute(AnnotationsAttribute.visibleTag);
- if (visible == null) return EMPTY_OBJECT_ARRAY;
- return getVisibleAnnotations(visible);
+ return m.getAnnotations();
}
public static Object[] getVisibleAnnotations(Field f) throws Exception
{
- CtField ctField = ReflectToJavassist.fieldToJavassist(f);
- if (ctField == null) return EMPTY_OBJECT_ARRAY;
- FieldInfo fi = ctField.getFieldInfo2();
-
- AnnotationsAttribute visible = (AnnotationsAttribute) fi.getAttribute(AnnotationsAttribute.visibleTag);
- if (visible == null) return EMPTY_OBJECT_ARRAY;
- return getVisibleAnnotations(visible);
+ return f.getAnnotations();
}
public static Object[] getVisibleAnnotations(Constructor c) throws Exception
{
- CtConstructor ctConstructor = ReflectToJavassist.constructorToJavassist(c);
- if (ctConstructor == null) return EMPTY_OBJECT_ARRAY;
- MethodInfo ci = ctConstructor.getMethodInfo2();
-
- AnnotationsAttribute visible = (AnnotationsAttribute) ci.getAttribute(AnnotationsAttribute.visibleTag);
- if (visible == null) return EMPTY_OBJECT_ARRAY;
- return getVisibleAnnotations(visible);
+ return c.getAnnotations();
}
-
- private static Object[] getVisibleAnnotations(AnnotationsAttribute visible) throws Exception
- {
- Annotation[] annotations = visible.getAnnotations();
- Object[] returnedAnnotations = new Object[annotations.length];
- for (int i = 0 ; i < annotations.length ; i++)
- {
- String name = annotations[i].getTypeName();
- Class annotation = Thread.currentThread().getContextClassLoader().loadClass(name);
- returnedAnnotations[i] = create(visible, annotation);
- }
- return returnedAnnotations;
- }
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/compiler/AnnotationDocletTagFactory.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/compiler/AnnotationDocletTagFactory.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/compiler/AnnotationDocletTagFactory.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -21,6 +21,7 @@
*/
package org.jboss.aop.annotation.compiler;
+import com.thoughtworks.qdox.model.AbstractJavaEntity;
import com.thoughtworks.qdox.model.DocletTag;
import com.thoughtworks.qdox.model.DocletTagFactory;
@@ -35,13 +36,13 @@
{
private static final long serialVersionUID = 1L;
- public DocletTag createDocletTag(String s, String s1, int i)
+ public DocletTag createDocletTag(String s, String s1)
{
- return new AnnotationDocletTag(s, s1, i);
+ return new AnnotationDocletTag(s, s1);
}
- public DocletTag createDocletTag(String s, String s1)
+ public DocletTag createDocletTag(String tag, String text, AbstractJavaEntity arg2, int arg3)
{
- return new AnnotationDocletTag(s, s1);
+ return new AnnotationDocletTag(tag, text);
}
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/compiler/ByteCodeAnnotationCompiler.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/compiler/ByteCodeAnnotationCompiler.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/compiler/ByteCodeAnnotationCompiler.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -80,7 +80,14 @@
if (args[i].equals("-o")) continue;
if (args[i].equals("-xml")) continue;
File f = new File(args[i]).getCanonicalFile();
- builder.addSource(new FileReader(f));
+ try
+ {
+ builder.addSource(new FileReader(f));
+ }
+ catch (RuntimeException e)
+ {
+ throw new RuntimeException("Error adding source for file " + f, e);
+ }
}
for (int i = 0; i < builder.getSources().length; i++)
@@ -234,9 +241,9 @@
}
//if there are inner classes: fetch them and call compileClass recursive.
- for (int i = 0; i < clazz.getInnerClasses().length; i++)
+ for (int i = 0; i < clazz.getNestedClasses().length; i++)
{
- JavaClass innerClass = clazz.getInnerClasses()[i];
+ JavaClass innerClass = clazz.getNestedClasses()[i];
compileClass(innerClass);
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/ant/AnnotationC.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/ant/AnnotationC.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/ant/AnnotationC.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -298,6 +298,7 @@
// scan source directories and dest directory to build up
// compile lists
String[] list = compileSourcepath.list();
+
ArrayList compilingFiles = new ArrayList();
for (int i = 0; i < list.length; i++)
{
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/OptimizedConstructionTransformer.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/OptimizedConstructionTransformer.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/OptimizedConstructionTransformer.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -43,6 +43,7 @@
protected void insertInterception(CtConstructor constructor, int index) throws Exception
{
CtClass type = constructor.getDeclaringClass();
+
OptimizedConstructionInvocations.createOptimizedInvocationClass(instrumentor, type, constructor, index);
createWrapper(type, constructor, constructor.getDeclaringClass(), index);
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/OptimizedInvocations.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/OptimizedInvocations.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/OptimizedInvocations.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -40,17 +40,13 @@
{
public static void defrostClassIfExists(AOPClassPool pool, String className)
{
- try
+ //In some cases we get a class frozen exception. I guess if the invocation class
+ //existed, method was unwrapped and the wrapped again
+ CtClass existing = pool.getCached(className);
+ if (existing != null)
{
- //In some cases we get a class frozen exception. I guess if the invocation class
- //existed, method was unwrapped and the wrapped again
- CtClass existing = pool.get(className);
existing.defrost();
}
- catch (NotFoundException e)
- {
- //Ignore, we are creating the class the first time
- }
}
/**
Added: projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/AOPTransformer.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/AOPTransformer.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/AOPTransformer.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -0,0 +1,95 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.aop.standalone;
+
+import org.jboss.aop.AspectManager;
+
+import java.lang.instrument.ClassFileTransformer;
+import java.lang.instrument.IllegalClassFormatException;
+import java.security.ProtectionDomain;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision: 44099 $
+ */
+public class AOPTransformer implements ClassFileTransformer
+{
+ public boolean isNonAdvisableClassName(String classname)
+ {
+ return (classname.startsWith("org.jboss.aop") ||
+ classname.endsWith("$aop") ||
+ classname.startsWith("javassist") ||
+ classname.startsWith("org.jboss.util.") ||
+ classname.startsWith("gnu.trove.") ||
+ classname.startsWith("EDU.oswego.cs.dl.util.concurrent.") ||
+ // System classes
+ classname.startsWith("org.apache.crimson") ||
+ classname.startsWith("org.apache.xalan") ||
+ classname.startsWith("org.apache.xml") ||
+ classname.startsWith("org.apache.xpath") ||
+ classname.startsWith("org.ietf.") ||
+ classname.startsWith("org.omg.") ||
+ classname.startsWith("org.w3c.") ||
+ classname.startsWith("org.xml.sax.") ||
+ classname.startsWith("sunw.") ||
+ classname.startsWith("sun.") ||
+ classname.startsWith("java.") ||
+ classname.startsWith("javax.") ||
+ classname.startsWith("com.sun.")
+ );
+ }
+
+ public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws IllegalClassFormatException
+ {
+ className = className.replace('/', '.');
+ //System.out.println("<<< loading " + className);
+ try
+ {
+ if (classBeingRedefined != null || isNonAdvisableClassName(className))
+ {
+ //System.out.println(" ignoring");
+ return null;
+ }
+ //System.out.println(" transforming");
+ return aspectTransform(className, loader, classBeingRedefined, protectionDomain, classfileBuffer);
+ }
+ finally
+ {
+ //System.out.println("finished " + className + ">>>");
+ }
+ }
+
+ private byte[] aspectTransform(String className, ClassLoader loader, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer)
+ {
+ try
+ {
+ //Make sure that we use the correct classloader, in order to get the correct domain if it is a scoped loader
+ return AspectManager.instance(loader).transform(loader, className, classBeingRedefined, protectionDomain, classfileBuffer);
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+}
Added: projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/Agent.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/Agent.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/Agent.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.aop.standalone;
+
+import org.jboss.aop.AspectManager;
+import org.jboss.aop.DynamicAOPStrategy;
+import org.jboss.aop.HotSwapStrategy;
+
+import java.lang.instrument.Instrumentation;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision: 46253 $
+ */
+public class Agent
+{
+
+ public static void premain(String agentArgs, Instrumentation inst)
+ {
+ StandaloneClassPoolFactory factory = new StandaloneClassPoolFactory();
+ AspectManager.setClassPoolFactory(factory);
+ // necessary for configuration
+ AspectManager.instance();
+ if (agentArgs != null && agentArgs.indexOf("-hotSwap") != -1)
+ {
+ // setting dynamic aop strategy: hot swap classes through InstrumentationAdapter
+ DynamicAOPStrategy strategy = new HotSwapStrategy(new InstrumentationAdapter(inst));
+ AspectManager.instance().setDynamicAOPStrategy(strategy);
+ AspectManager.setPrune(false); // no prune
+ }
+ inst.addTransformer(new AOPTransformer());
+ }
+}
\ No newline at end of file
Added: projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/InstrumentationAdapter.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/InstrumentationAdapter.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/InstrumentationAdapter.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -0,0 +1,88 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.aop.standalone;
+
+import java.lang.instrument.ClassDefinition;
+import java.lang.instrument.Instrumentation;
+import java.lang.instrument.UnmodifiableClassException;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.jboss.aop.instrument.HotSwapper;
+
+/**
+ * This class is an adapter to <code>java.lang.instrument.Instrumentation
+ * </code> and is used to enable hot swap in JBoss AOP through Java 5 agents.
+ *
+ * @author Flavia Rainone
+ */
+class InstrumentationAdapter implements HotSwapper
+{
+
+ private Instrumentation instrumentation; // delegate
+ private Collection<ClassDefinition> classDefinitions;
+
+ /**
+ * Constructor.
+ * @param instrumentation
+ */
+ public InstrumentationAdapter(Instrumentation instrumentation)
+ {
+ this.instrumentation = instrumentation;
+ this.classDefinitions = new ArrayList<ClassDefinition>();
+ }
+
+ /**
+ * Register class' byte codes redefinitions.
+ * @param clazz the clazz to be redefined.
+ * @param classCode the new byte code implementation of <code>clazz</code>.
+ */
+ public synchronized void registerChange(Class clazz, byte[] classCode)
+ {
+ ClassDefinition classDef = new ClassDefinition(clazz, classCode);
+ this.classDefinitions.add(classDef);
+ }
+
+ /**
+ * Hot swaps previously registered changes.
+ * All classes' byte codes registered through <code>register</code>
+ * are redefined in the system only when <code>hotSwap</code> is invoked.
+ */
+ public synchronized void hotSwap()
+ {
+ ClassDefinition[] definitions = new ClassDefinition[this.classDefinitions.size()];
+ definitions = (ClassDefinition[]) this.classDefinitions.toArray(definitions);
+ try
+ {
+ instrumentation.redefineClasses(definitions);
+ }
+ catch(ClassNotFoundException e)
+ {
+ throw new RuntimeException(e);
+ }
+ catch(UnmodifiableClassException e)
+ {
+ throw new RuntimeException(e);
+ }
+ this.classDefinitions.clear();
+ }
+}
\ No newline at end of file
Added: projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/PluggableInstrumentor.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/PluggableInstrumentor.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/PluggableInstrumentor.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.aop.standalone;
+
+import java.lang.instrument.Instrumentation;
+
+/**
+ * Expose the Instrumentation interface to JVM.
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision: 37406 $
+ */
+public class PluggableInstrumentor
+{
+ private static Instrumentation instrumentor;
+
+ public static Instrumentation getInstrumentor()
+ {
+ return instrumentor;
+ }
+
+ public static void premain(String agentArgs, Instrumentation inst)
+ {
+ instrumentor = inst;
+ }
+}
Added: projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/StandaloneClassPool.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/StandaloneClassPool.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/StandaloneClassPool.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -0,0 +1,88 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.aop.standalone;
+
+import javassist.CannotCompileException;
+import javassist.ClassPool;
+import javassist.CtClass;
+import javassist.NotFoundException;
+import javassist.scopedpool.ScopedClassPoolRepository;
+
+import org.jboss.aop.classpool.AOPClassPool;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision: 46253 $
+ * @deprecated Will be removed when Javassist is upgraded past 3.0 beta2
+ */
+public class StandaloneClassPool extends AOPClassPool
+{
+ public StandaloneClassPool(ClassLoader cl, ClassPool src, ScopedClassPoolRepository repository)
+ {
+ super(cl, src, repository);
+ }
+
+ public StandaloneClassPool(ClassPool src, ScopedClassPoolRepository repository)
+ {
+ super(src, repository);
+ }
+
+ //KAB: removed NotFoundException, IOException from throws clause, as
+ //they are not defined by javassist.ClassPool
+ public Class toClass(CtClass ctClass) throws CannotCompileException/*, NotFoundException, IOException*/
+ {
+ try
+ {
+ byte[] b = ctClass.toBytecode();
+ Class cl = Class.forName("java.lang.ClassLoader");
+ java.lang.reflect.Method method
+ = cl.getDeclaredMethod("defineClass",
+ new Class[]{String.class, byte[].class,
+ int.class, int.class});
+ method.setAccessible(true);
+ Object[] args = new Object[]{ctClass.getName(), b, new Integer(0),
+ new Integer(b.length)};
+ Class clazz = (Class) method.invoke(getClassLoader(), args);
+ method.setAccessible(false);
+ return clazz;
+ }
+ catch (RuntimeException e)
+ {
+ throw e;
+ }
+ catch (java.lang.reflect.InvocationTargetException e)
+ {
+ throw new CannotCompileException(e);
+ }
+ catch (Exception e)
+ {
+ throw new CannotCompileException(e);
+ }
+ }
+
+ public synchronized CtClass getLocally(String classname) throws NotFoundException
+ {
+ return super.getLocally(classname);
+ }
+}
Added: projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/StandaloneClassPoolFactory.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/StandaloneClassPoolFactory.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/StandaloneClassPoolFactory.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.aop.standalone;
+
+import org.jboss.aop.classpool.AOPClassPoolFactory;
+
+import javassist.ClassPool;
+import javassist.scopedpool.ScopedClassPool;
+import javassist.scopedpool.ScopedClassPoolRepository;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision: 46253 $
+ */
+public class StandaloneClassPoolFactory extends AOPClassPoolFactory
+{
+ public ScopedClassPool create(ClassLoader cl, ClassPool src, ScopedClassPoolRepository repository)
+ {
+ return new StandaloneClassPool(cl, src, repository);
+ }
+
+ public ScopedClassPool create(ClassPool src, ScopedClassPoolRepository repository)
+ {
+ return new StandaloneClassPool(src, repository);
+ }
+}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aspects/Threadbased.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aspects/Threadbased.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/main/org/jboss/aspects/Threadbased.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -21,12 +21,19 @@
*/
package org.jboss.aspects;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
/**
* Annotation for declaring a field that behaves like a ThreadLocal
*
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
* @version $Revision$
*/
-public interface Threadbased
+
+ at Target({ElementType.FIELD}) @Retention(RetentionPolicy.RUNTIME)
+ public @interface Threadbased
{
}
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedcflow/AnnotatedCaller.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedcflow/AnnotatedCaller.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedcflow/AnnotatedCaller.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -26,8 +26,8 @@
* @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
* @version $Revision$
*
- * @@org.jboss.test.aop.annotatedcflow.Annotation
*/
+ at Annotation
public class AnnotatedCaller
{
private POJO pojo;
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedcflow/Annotation.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedcflow/Annotation.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedcflow/Annotation.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -26,7 +26,7 @@
* @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
* @version $Revision$
*/
-public interface Annotation
+public @interface Annotation
{
}
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotateddeclare/DeclareAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotateddeclare/DeclareAspect.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotateddeclare/DeclareAspect.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -31,14 +31,10 @@
*/
public class DeclareAspect
{
- /**
- * @@org.jboss.aop.DeclareError (expr="call(* org.jboss.test.aop.annotated.declare.POJO->someMethod()) AND withincode(* org.jboss.test.aop.annotated.declare.POJO->otherMethod())", msg="Should not happen")
- */
+ @org.jboss.aop.DeclareError (expr="call(* org.jboss.test.aop.annotated.declare.POJO->someMethod()) AND withincode(* org.jboss.test.aop.annotated.declare.POJO->otherMethod())", msg="Should not happen")
Pointcut error;
- /**
- * @@org.jboss.aop.DeclareWarning (expr="call(* org.jboss.test.aop.annotated.declare.POJO->otherMethod()) AND withincode(* org.jboss.test.aop.annotated.declare.POJO->someMethod())", msg="Expected annotated warning")
- */
+ @org.jboss.aop.DeclareWarning (expr="call(* org.jboss.test.aop.annotated.declare.POJO->otherMethod()) AND withincode(* org.jboss.test.aop.annotated.declare.POJO->someMethod())", msg="Expected annotated warning")
Pointcut warning;
}
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedparams/Param.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedparams/Param.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedparams/Param.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -21,12 +21,18 @@
*/
package org.jboss.test.aop.annotatedparams;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
/**
*
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
* @version $Revision$
*/
-public interface Param
+ at Target(ElementType.TYPE)@Retention(RetentionPolicy.RUNTIME)
+public @interface Param
{
}
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedparams/ParamType.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedparams/ParamType.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedparams/ParamType.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -25,9 +25,8 @@
*
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
* @version $Revision$
- *
- * @@org.jboss.test.aop.annotatedparams.Param
*/
+ at Param
public class ParamType
{
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedparams/Return.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedparams/Return.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedparams/Return.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -21,12 +21,18 @@
*/
package org.jboss.test.aop.annotatedparams;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
/**
*
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
* @version $Revision$
*/
-public interface Return
+ at Target(ElementType.TYPE)@Retention(RetentionPolicy.RUNTIME)
+public @interface Return
{
}
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedparams/ReturnType.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedparams/ReturnType.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedparams/ReturnType.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -25,8 +25,8 @@
*
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
* @version $Revision$
- * @@org.jboss.test.aop.annotatedparams.Return
*/
+ at Return
public class ReturnType
{
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotationc/ClassAnnotation.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotationc/ClassAnnotation.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotationc/ClassAnnotation.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -21,13 +21,19 @@
*/
package org.jboss.test.aop.annotationc;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
/**
* Comment
*
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
* @version $Revision$
*/
-public interface ClassAnnotation
+ at Target(ElementType.TYPE)@Retention(RetentionPolicy.RUNTIME)
+public @interface ClassAnnotation
{
Class value();
}
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotationc/MyEnum.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotationc/MyEnum.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotationc/MyEnum.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -27,22 +27,7 @@
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
* @version $Revision$
*/
-public class MyEnum extends org.jboss.lang.Enum
+public enum MyEnum
{
- /** The serialVersionUID */
- private static final long serialVersionUID = 1L;
- public static final MyEnum ONE = new MyEnum("ONE", 0);
- public static final MyEnum TWO = new MyEnum("TWO", 1);
-
- private static MyEnum[] values = {ONE, TWO};
-
- private MyEnum(String name, int ordinal)
- {
- super(name, ordinal);
- }
-
- Object readResolve() throws java.io.ObjectStreamException
- {
- return values[ordinal];
- }
+ ONE, TWO;
}
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotationc/complex.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotationc/complex.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotationc/complex.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -21,13 +21,19 @@
*/
package org.jboss.test.aop.annotationc;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
/**
* Comment
*
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
* @version $Revision$
*/
-public interface complex
+ at Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR})@Retention(RetentionPolicy.RUNTIME)
+public @interface complex
{
char ch();
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotationc/empty.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotationc/empty.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotationc/empty.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -21,12 +21,18 @@
*/
package org.jboss.test.aop.annotationc;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
/**
* Comment
*
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
* @version $Revision$
*/
-public interface empty
+ at Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR})@Retention(RetentionPolicy.RUNTIME)
+public @interface empty
{
}
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotationc/single.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotationc/single.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotationc/single.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -21,13 +21,19 @@
*/
package org.jboss.test.aop.annotationc;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
/**
* Comment
*
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
* @version $Revision$
*/
-public interface single
+ at Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR})@Retention(RetentionPolicy.RUNTIME)
+public @interface single
{
String value();
}
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/implementz/Annotated.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/implementz/Annotated.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/implementz/Annotated.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -20,12 +20,19 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.jboss.test.aop.implementz;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
/**
*
* @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
* @version $Revision$
*/
-public interface Annotated
+ at Target(ElementType.TYPE)@Retention(RetentionPolicy.RUNTIME)
+public @interface Annotated
{
}
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/implementz/ImplementsInterfaceAnnotated.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/implementz/ImplementsInterfaceAnnotated.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/implementz/ImplementsInterfaceAnnotated.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -25,8 +25,8 @@
*
* @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
* @version $Revision$
- * @@org.jboss.test.aop.implementz.Annotated
*/
+ at Annotated
public interface ImplementsInterfaceAnnotated
{
void methodAnnotated();
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/instanceofannotated/AnnotatedInterface.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/instanceofannotated/AnnotatedInterface.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/instanceofannotated/AnnotatedInterface.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -27,6 +27,7 @@
* @version $Revision$
* @@org.jboss.test.aop.instanceofannotated.InterfaceAnnotation
*/
+ at InterfaceAnnotation
public interface AnnotatedInterface
{
public void annotatedMethod();
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/instanceofannotated/ClassAnnotation.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/instanceofannotated/ClassAnnotation.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/instanceofannotated/ClassAnnotation.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -21,12 +21,18 @@
*/
package org.jboss.test.aop.instanceofannotated;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
/**
*
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
* @version $Revision$
*/
-public interface ClassAnnotation
+ at Target({ElementType.TYPE})@Retention(RetentionPolicy.RUNTIME)
+public @interface ClassAnnotation
{
}
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/instanceofannotated/InterfaceAnnotation.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/instanceofannotated/InterfaceAnnotation.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/instanceofannotated/InterfaceAnnotation.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -21,12 +21,18 @@
*/
package org.jboss.test.aop.instanceofannotated;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
/**
*
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
* @version $Revision$
*/
-public interface InterfaceAnnotation
+ at Target({ElementType.TYPE})@Retention(RetentionPolicy.RUNTIME)
+public @interface InterfaceAnnotation
{
}
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/instanceofannotated/Introduced.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/instanceofannotated/Introduced.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/instanceofannotated/Introduced.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -21,11 +21,17 @@
*/
package org.jboss.test.aop.instanceofannotated;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
/**
*
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
* @version $Revision$
*/
-public interface Introduced
+ at Target({ElementType.TYPE})@Retention(RetentionPolicy.RUNTIME)
+public @interface Introduced
{
}
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/instanceofannotated/Introduced2.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/instanceofannotated/Introduced2.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/instanceofannotated/Introduced2.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -21,12 +21,18 @@
*/
package org.jboss.test.aop.instanceofannotated;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
/**
*
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
* @version $Revision$
*/
-public interface Introduced2
+ at Target({ElementType.TYPE})@Retention(RetentionPolicy.RUNTIME)
+public @interface Introduced2
{
}
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/instanceofannotated/Introduced3.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/instanceofannotated/Introduced3.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/instanceofannotated/Introduced3.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -21,12 +21,18 @@
*/
package org.jboss.test.aop.instanceofannotated;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
/**
*
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
* @version $Revision$
*/
-public interface Introduced3
+ at Target({ElementType.TYPE})@Retention(RetentionPolicy.RUNTIME)
+public @interface Introduced3
{
}
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/instanceofannotated/TypeAnnotation.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/instanceofannotated/TypeAnnotation.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/instanceofannotated/TypeAnnotation.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -21,12 +21,18 @@
*/
package org.jboss.test.aop.instanceofannotated;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
/**
*
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
* @version $Revision$
*/
-public interface TypeAnnotation
+ at Target({ElementType.TYPE})@Retention(RetentionPolicy.RUNTIME)
+public @interface TypeAnnotation
{
}
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/perjoinpoint/ThreadbasedTest.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/perjoinpoint/ThreadbasedTest.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/perjoinpoint/ThreadbasedTest.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.aop.perjoinpoint;
+import org.jboss.aspects.Threadbased;
+
/**
* Comment
*
@@ -29,23 +31,15 @@
*/
public class ThreadbasedTest
{
- /**
- * @@org.jboss.aspects.Threadbased
- */
+ @Threadbased
public static int staticCounter;
- /**
- * @@org.jboss.aspects.Threadbased
- */
+ @Threadbased
public int counter;
- /**
- * @@org.jboss.aspects.Threadbased
- */
+ @Threadbased
public static int staticCounter2;
- /**
- * @@org.jboss.aspects.Threadbased
- */
+ @Threadbased
public int counter2;
}
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/regression/jbaop248annotationoverride/Introduced.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/regression/jbaop248annotationoverride/Introduced.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/regression/jbaop248annotationoverride/Introduced.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -21,12 +21,18 @@
*/
package org.jboss.test.aop.regression.jbaop248annotationoverride;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
/**
*
* @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
* @version $Revision$
*/
-public interface Introduced
+ at Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR})@Retention(RetentionPolicy.RUNTIME)
+public @interface Introduced
{
int value();
}
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/regression/jbaop248annotationoverride/Override.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/regression/jbaop248annotationoverride/Override.java 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/regression/jbaop248annotationoverride/Override.java 2006-10-17 00:16:03 UTC (rev 57688)
@@ -21,12 +21,18 @@
*/
package org.jboss.test.aop.regression.jbaop248annotationoverride;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
/**
*
* @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
* @version $Revision$
*/
-public interface Override
+ at Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR})@Retention(RetentionPolicy.RUNTIME)
+public @interface Override
{
int value();
}
Property changes on: projects/aop/trunk/build
___________________________________________________________________
Name: svn:ignore
- output
+ output
build.log
Modified: projects/aop/trunk/build/build-thirdparty.xml
===================================================================
--- projects/aop/trunk/build/build-thirdparty.xml 2006-10-17 00:09:59 UTC (rev 57687)
+++ projects/aop/trunk/build/build-thirdparty.xml 2006-10-17 00:16:03 UTC (rev 57688)
@@ -45,19 +45,22 @@
-->
<componentref name="apache-log4j" version="1.2.8"/>
<componentref name="dom4j" version="1.6.1jboss"/>
- <componentref name="sun-javacc" version="3.2"/>
<componentref name="javassist" version="snapshot"/>
+ <componentref name="jboss/backport-concurrent" version="2.1.0.GA"/>
<componentref name="jboss/common-core" version="2.0.1.GA"/>
<componentref name="jboss/common-logging-jdk" version="2.0.1.GA"/>
<componentref name="jboss/common-logging-log4j" version="2.0.1.GA"/>
<componentref name="jboss/common-logging-spi" version="2.0.1.GA"/>
+ <componentref name="jboss/jbossretro" version="1.0.4.GA"/>
<componentref name="jboss/microcontainer" version="snapshot"/>
<componentref name="jboss/microcontainer14" version="snapshot"/>
<componentref name="jboss/profiler/jvmti" version="1.0.0.CR5"/>
<componentref name="jboss/test" version="snapshot"/>
+ <componentref name="jboss/test14" version="snapshot"/>
<componentref name="junit" version="3.8.1"/>
<componentref name="oswego-concurrent" version="1.3.4"/>
- <componentref name="qdox" version="1.4"/>
+ <componentref name="qdox" version="1.6"/>
+ <componentref name="sun-javacc" version="3.2"/>
<componentref name="trove" version="1.0.2"/>
<componentref name="xdoclet" version="1.2b3"/>
</build>
More information about the jboss-cvs-commits
mailing list