jtaylor 02/02/16 11:23:34
Modified: . build-test.xml build.xml
Log:
Fixed aspectj target. Test build now excludes some 'Test' classes that are not
junit tests. All the unit tests it runs should now succeed.
Revision Changes Path
1.7 +7 -0 jakarta-turbine-stratum/build-test.xml
Index: build-test.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/build-test.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build-test.xml 14 Feb 2002 20:42:44 -0000 1.6
+++ build-test.xml 16 Feb 2002 19:23:34 -0000 1.7
@@ -62,6 +62,13 @@
<batchtest todir="${test.reportsDirectory}">
<fileset dir="${build.dest}">
<include name="**/*Test*.class"/>
+ <!-- None of these are JUnit tests -->
+ <exclude name="org/apache/stratum/jcs/access/TestCacheAccess.class"/>
+ <exclude
name="org/apache/stratum/jcs/engine/control/CompositeCacheManagerTester.class"/>
+ <exclude
name="org/apache/stratum/jcs/engine/control/CompositeCacheManagerTester.class"/>
+ <exclude
name="org/apache/stratum/jcs/auxiliary/remote/RemoteCacheClientTest.class"/>
+ <exclude
name="org/apache/stratum/jcs/auxiliary/lateral/http/broadcast/LateralCacheTester.class"/>
+ <exclude
name="org/apache/stratum/jcs/test/servlet/ListTestCacheServlet.class"/>
</fileset>
</batchtest>
</junit>
1.23 +3 -8 jakarta-turbine-stratum/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/build.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- build.xml 16 Feb 2002 19:06:34 -0000 1.22
+++ build.xml 16 Feb 2002 19:23:34 -0000 1.23
@@ -191,13 +191,6 @@
depends="prepare"
description="==> compiles the source code with aspects">
- <!-- Move aspects into the build cycle -->
- <copy todir="${build.src}" filtering="yes">
- <fileset dir="${src.dir}/aspect">
- <include name="**/Trace*.aj" if="build.includes.tracing.aspects"/>
- </fileset>
- </copy>
-
<taskdef
name="ajc"
classname="org.aspectj.tools.ant.taskdefs.Ajc"/>
@@ -208,8 +201,10 @@
optimize="${optimize}">
<src>
<pathelement location="${src.dir}/java"/>
- <pathelement location="${src.dir}/aspects"/>
+ <pathelement location="${src.dir}/aspect"/>
</src>
+ <include name="**/*.java"/>
+ <include name="**/Trace*.aj" if="build.includes.tracing.aspects"/>
<classpath refid="classpath"/>
</ajc>
</target>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
