[jboss-cvs] jboss-aop ...
Kabir Khan
kkhan at jboss.com
Fri Jul 14 06:06:33 EDT 2006
User: kkhan
Date: 06/07/14 06:06:33
Modified: jboss-aop build-tests-jdk14.xml build-retro.xml
Log:
Revision Changes Path
1.4 +21 -27 jboss-aop/build-tests-jdk14.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build-tests-jdk14.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/build-tests-jdk14.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- build-tests-jdk14.xml 10 Jul 2006 20:48:49 -0000 1.3
+++ build-tests-jdk14.xml 14 Jul 2006 10:06:33 -0000 1.4
@@ -14,7 +14,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build-tests-jdk14.xml,v 1.3 2006/07/10 20:48:49 kkhan Exp $ -->
+<!-- $Id: build-tests-jdk14.xml,v 1.4 2006/07/14 10:06:33 kkhan Exp $ -->
<project default="main" name="JBoss/AOP">
@@ -167,6 +167,11 @@
<pathelement path="${jboss.jbossretro.lib}/jbossretro-rt.jar"/>
</path>
+ <path id="jboss.aop.retro.classpath">
+ <path refid="jboss.aop.classpath"/>
+ <path refid="jbossretrort.classpath"/>
+ </path>
+
<!-- run against jdk 14 jar -->
<path id="test.classpath">
<path refid="thirdparty.classpath"/>
@@ -423,13 +428,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"/>
- <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-tests" inheritRefs="true">
@@ -456,13 +454,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"/>
- <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-tests" inheritRefs="true">
@@ -483,13 +474,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"/>
- <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-tests" inheritRefs="true">
@@ -518,7 +502,6 @@
</target>
<target name="precompiled-test" depends="init">
- <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/>
<antcall target="_run-precompiled-test" inheritRefs="true">
<param name="test" value="${test}"/>
<param name="caller" value="precompiled-tests"/>
@@ -526,7 +509,6 @@
</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"/>
@@ -534,6 +516,13 @@
</target>
<target name="_run-precompiled-test">
+ <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.retro.classpath"/>
+ <path id="aop.task.classpath">
+ <path refid="library.classpath"/>
+ <path refid="dependentmodule.classpath"/>
+ <path refid="jboss.aop.retro.classpath"/>
+ </path>
+
<!-- Check for jboss-aop.xml override for compiler -->
<condition property="aoppath" value="${aop.xml}">
@@ -643,7 +632,13 @@
<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"/>
+ <taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC" classpathref="jboss.aop.retro.classpath"/>
+ <path id="aop.task.classpath">
+ <path refid="library.classpath"/>
+ <path refid="dependentmodule.classpath"/>
+ <path refid="jboss.aop.retro.classpath"/>
+ </path>
+
<annotationc compilerclasspathref="aop.task.classpath" bytecode="true">
<classpath refid="aop.task.classpath"/>
<classpath path="${build.tests.retro}"/>
@@ -693,8 +688,7 @@
</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"/>
+ <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.retro.classpath"/>
<property name="test" value="memoryleaks"/>
<property name="caller" value="memoryleaks"/>
<property name="aoppath" value="${source.res}/test/${test}/jboss-aop.xml"/>
1.4 +1 -2 jboss-aop/build-retro.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build-retro.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/build-retro.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- build-retro.xml 13 Jul 2006 18:31:08 -0000 1.3
+++ build-retro.xml 14 Jul 2006 10:06:33 -0000 1.4
@@ -14,7 +14,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build-retro.xml,v 1.3 2006/07/13 18:31:08 kkhan Exp $ -->
+<!-- $Id: build-retro.xml,v 1.4 2006/07/14 10:06:33 kkhan Exp $ -->
<project default="main" name="JBoss/AOP">
@@ -565,5 +565,4 @@
<target name="help"
description="Show this help message."
depends="_buildmagic:help:standard"/>
- </target>
</project>
More information about the jboss-cvs-commits
mailing list