cmlenz 2002/12/25 06:40:05
Modified: . build.properties.sample
framework build.xml
Log:
Make the dependancy on the AspectJ explicit, and let the user set the
location of the required JARs.
Revision Changes Path
1.32 +7 -1 jakarta-cactus/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-cactus/build.properties.sample,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- build.properties.sample 15 Dec 2002 09:53:12 -0000 1.31
+++ build.properties.sample 25 Dec 2002 14:40:05 -0000 1.32
@@ -46,6 +46,12 @@
# The location of the AspectJ runtime jar
aspectjrt.jar = ${lib.repo}/aspectj/jars/aspectjrt-1.0.6.jar
+# The location of the AspectJ tools jar
+aspectj-tools.jar = ${lib.repo}/aspectj/jars/aspectj-tools-1.0.6.jar
+
+# The location of the AspectJ Ant tasks jar
+aspectj-ant.jar = ${lib.repo}/aspectj/jars/aspectj-ant-1.0.6.jar
+
# The location of the Junit jar
junit.jar = ${lib.repo}/junit/jars/junit-3.8.1.jar
1.34 +24 -5 jakarta-cactus/framework/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/build.xml,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- build.xml 9 Dec 2002 22:37:42 -0000 1.33
+++ build.xml 25 Dec 2002 14:40:05 -0000 1.34
@@ -151,6 +151,7 @@
<path id="project.class.path">
<pathelement location="${j2ee.jar}"/>
+ <pathelement location="${aspectjrt.jar}"/>
<pathelement location="${log4j.jar}"/>
<pathelement location="${commons.logging.jar}"/>
<pathelement location="${commons.httpclient.jar}"/>
@@ -257,17 +258,35 @@
<!--
========================================================================
+ Initialize AspectJ
+ ========================================================================
+ -->
+ <target name="init.aspectj">
+
+ <path id="aspectj.classpath">
+ <pathelement location="${aspectjrt.jar}"/>
+ <pathelement location="${aspectj-tools.jar}"/>
+ <pathelement location="${aspectj-ant.jar}"/>
+ <pathelement location="${java.class.path}"/>
+ </path>
+
+ <!-- AspectJ task definition -->
+ <taskdef name="ajc" classname="org.aspectj.tools.ant.taskdefs.Ajc">
+ <classpath refid="aspectj.classpath"/>
+ </taskdef>
+
+ </target>
+
+ <!--
+ ========================================================================
Initialize the build. Must be called by all targets
========================================================================
-->
<target name="init"
- depends="display.properties,check.properties,load.properties,init.clover">
+ depends="display.properties, check.properties, load.properties,
+ init.clover, init.aspectj">
<tstamp/>
-
- <!-- AspectJ task definition -->
- <taskdef name="ajc" classname="org.aspectj.tools.ant.taskdefs.Ajc"/>
- <taskdef name="ajdoc" classname="org.aspectj.tools.ant.taskdefs.Ajdoc"/>
</target>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
