vmassol 2003/10/12 09:07:43
Modified: framework build.xml build.properties.sample
. build.properties.sample
documentation/docs/xdocs/participating howto_build.xml
documentation/docs/xdocs changes.xml
Log:
Updated to AspectJ 1.1.1
Revision Changes Path
1.67 +10 -11 jakarta-cactus/framework/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/build.xml,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- build.xml 21 Sep 2003 09:35:25 -0000 1.66
+++ build.xml 12 Oct 2003 16:07:43 -0000 1.67
@@ -75,10 +75,9 @@
<target name="init.aspectj">
<!-- Define the AspectJ tasks -->
- <taskdef name="ajc" classname="org.aspectj.tools.ant.taskdefs.Ajc">
+ <taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties">
<classpath>
<pathelement location="${aspectj-tools.jar}"/>
- <pathelement location="${aspectj-ant.jar}"/>
</classpath>
</taskdef>
@@ -224,16 +223,16 @@
<mkdir dir="${target.classes.java.dir}"/>
- <ajc destdir="${target.classes.java.dir}"
+ <iajc destdir="${target.classes.java.dir}" verbose="${verbose}"
debug="${debug}" deprecation="${deprecation}"
- optimize="${optimize}">
- <src path="${target.src.dir}"/>
- <src path="${src.java.specific.dir}"/>
- <src path="${src.aspect.dir}"/>
- <exclude name="**/package.html"/>
- <exclude name="**/overview.html"/>
+ sourceRootCopyFilter="**/CVS/*,**/*.java,**/*.html">
+ <sourceroots>
+ <pathelement location="${target.src.dir}"/>
+ <pathelement location="${src.java.specific.dir}"/>
+ <pathelement location="${src.aspect.dir}"/>
+ </sourceroots>
<classpath refid="project.classpath"/>
- </ajc>
+ </iajc>
<copy todir="${target.classes.java.dir}/org/apache/cactus/server"
file="${web.dir}/jspRedirector.jsp"/>
1.31 +3 -7 jakarta-cactus/framework/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/build.properties.sample,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- build.properties.sample 9 Aug 2003 13:16:48 -0000 1.30
+++ build.properties.sample 12 Oct 2003 16:07:43 -0000 1.31
@@ -45,15 +45,11 @@
# The location of the AspectJ runtime jar
# If not specified here, the jar must be present in ANTHOME/lib
-aspectjrt.jar = ${lib.repo}/aspectj/jars/aspectjrt-1.0.6.jar
+aspectjrt.jar = ${lib.repo}/aspectj/jars/aspectjrt-1.1.1.jar
# The location of the AspectJ tools jar
# If not specified here, the jar must be present in ANTHOME/lib
-aspectj-tools.jar = ${lib.repo}/aspectj/jars/aspectj-tools-1.0.6.jar
-
-# The location of the AspectJ Ant tasks jar
-# If not specified here, the jar must be present in ANTHOME/lib
-aspectj-ant.jar = ${lib.repo}/aspectj/jars/aspectj-ant-1.0.6.jar
+aspectj-tools.jar = ${lib.repo}/aspectj/jars/aspectjtools-1.1.1.jar
# Dependencies for Checkstyle code auditing
# If not specified here, the JARs must be present in ANTHOME/lib
1.83 +3 -7 jakarta-cactus/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-cactus/build.properties.sample,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- build.properties.sample 12 Sep 2003 11:56:44 -0000 1.82
+++ build.properties.sample 12 Oct 2003 16:07:43 -0000 1.83
@@ -40,7 +40,7 @@
commons.httpclient.jar =
${lib.repo}/commons-httpclient/jars/commons-httpclient-2.0-rc1.jar
# The location of the AspectJ runtime jar
-aspectjrt.jar = ${lib.repo}/aspectj/jars/aspectjrt-1.0.6.jar
+aspectjrt.jar = ${lib.repo}/aspectj/jars/aspectjrt-1.1.1.jar
# The location of the Junit jar
junit.jar = ${lib.repo}/junit/jars/junit-3.8.1.jar
@@ -121,11 +121,7 @@
# The location of the AspectJ tools jar
# If not specified here, the jar must be present in ANTHOME/lib
-aspectj-tools.jar = ${lib.repo}/aspectj/jars/aspectj-tools-1.0.6.jar
-
-# The location of the AspectJ Ant tasks jar
-# If not specified here, the jar must be present in ANTHOME/lib
-aspectj-ant.jar = ${lib.repo}/aspectj/jars/aspectj-ant-1.0.6.jar
+aspectj-tools.jar = ${lib.repo}/aspectj/jars/aspectjtools-1.1.1.jar
# Dependencies for Checkstyle code auditing
# If not specified here, the JARs must be present in ANTHOME/lib
1.11 +7 -16
jakarta-cactus/documentation/docs/xdocs/participating/howto_build.xml
Index: howto_build.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/documentation/docs/xdocs/participating/howto_build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- howto_build.xml 29 Jun 2003 11:13:56 -0000 1.10
+++ howto_build.xml 12 Oct 2003 16:07:43 -0000 1.11
@@ -63,7 +63,7 @@
<section title="Prerequisites">
<p>
To build Cactus from source, you'll need to have
- <link href="ext:ant">Ant</link> 1.5.1 (or later)
+ <link href="ext:ant">Ant</link> 1.5.3 (or later)
installed. Please make sure that the distribution also includes the JAR
containing the optional tasks (<code>optional.jar</code>). In addition,
please add an XSLT processor (like
@@ -95,7 +95,7 @@
<td nowrap="true">
<link href="ext:commons_logging">aspectjrt.jar</link>
</td>
- <td nowrap="true">1.0.6 or later</td>
+ <td nowrap="true">1.1.1 or later</td>
<td>
The AspectJ runtime.
</td>
@@ -104,25 +104,16 @@
<td nowrap="true">
<link href="ext:aspectj">aspectjtools.jar</link>
</td>
- <td nowrap="true">1.0.6 or later</td>
+ <td nowrap="true">1.1.0 or later</td>
<td>
The AspectJ compiler and other tools.
</td>
</tr>
<tr>
- <td><link href="ext:aspectj">aspectj-ant.jar</link></td>
- <td nowrap="true">1.0.6 or later</td>
- <td>
- The AspectJ Ant tasks.<br/>
- <em>Since version 1.1 of AspectJ, the Ant tasks are included
- in <code>aspectjtools.jar</code>.</em>
- </td>
- </tr>
- <tr>
<td nowrap="true">
<link href="ext:commons_httpclient">commons-httpclient.jar</link>
</td>
- <td nowrap="true">2.0 beta 1 or later</td>
+ <td nowrap="true">2.0 rc1 or later</td>
<td>
Jakarta Commons HttpClient.
</td>
@@ -131,7 +122,7 @@
<td nowrap="true">
<link href="ext:commons_logging">commons-logging.jar</link>
</td>
- <td nowrap="true">1.0 or later</td>
+ <td nowrap="true">1.0.3 or later</td>
<td>
Jakarta Commons Logging.
</td>
@@ -140,7 +131,7 @@
<td nowrap="true">
<link href="ext:junit">junit.jar</link>
</td>
- <td nowrap="true">3.7 or later</td>
+ <td nowrap="true">3.8.1 or later</td>
<td>
The JUnit framework.<br/>
<em>This JAR file must be placed in the <code>lib</code>
@@ -283,7 +274,7 @@
<td nowrap="true">
<link href="ext:taglibs_standard">standard.jar</link>
</td>
- <td nowrap="true">1.0 or later</td>
+ <td nowrap="true">1.0</td>
<td>
Jakarta Standard Taglib. Required for compiling and running the
servlet sample test suite on J2EE 1.3.
1.134 +8 -3 jakarta-cactus/documentation/docs/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/changes.xml,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- changes.xml 13 Sep 2003 12:29:40 -0000 1.133
+++ changes.xml 12 Oct 2003 16:07:43 -0000 1.134
@@ -68,14 +68,19 @@
</devs>
<release version="1.6dev" date="in CVS">
+ </release>
+
+ <release version="1.5-rc1" date="in CVS">
+ <action dev="VMA" type="update">
+ Updated to use AspectJ 1.1.1. When you upgrade to Cactus 1.5-rc1
+ make sure you update your <code>aspectjrt.jar</code> to version
+ 1.1.1 (the jar is provided in the Cactus distribution).
+ </action>
<action dev="VMA" type="add">
Added an EJB sample application to demonstrate how to perform EJB
unit testing with Cactus and how to automate it with the
Cactus/Ant integration.
</action>
- </release>
-
- <release version="1.5-rc1" date="in CVS">
<action dev="VMA" type="fix" due-to="Alexander Ananiev"
due-to-email="[EMAIL PROTECTED]">
When using the new <code>ServletTestSuite</code> wrapper around pure
JUnit test cases, the <code>setUp()</code> and
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
