jmitchell 2003/03/28 21:58:14
Modified: . build.properties.sample build.xml
Log:
-Changes to support new taglib html report generator.
-I also added the correct references for running the cactus tests on various
versions (with dependencies) of cactus. I hope this will clear up any confusion of
which versions work. I'm currently using 13-1.4.1 and it works fine.
Revision Changes Path
1.33 +89 -12 jakarta-struts/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-struts/build.properties.sample,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- build.properties.sample 6 Mar 2003 04:20:49 -0000 1.32
+++ build.properties.sample 29 Mar 2003 05:58:14 -0000 1.33
@@ -115,22 +115,102 @@
# contrib library (although it doesn't prevent you from building it directly in
# "contrib/struts-el".
-jstl.jar = ${apache.home}/jakarta-taglibs/jstl-1.0/lib/jstl.jar
-jstl-standard.jar = ${apache.home}/jakarta-taglibs/jstl-1.0/lib/standard.jar
+jstl.home =${apache.home}/jakarta-taglibs/standard-1.0
+jstl.jar =${jstl.home}/lib/jstl.jar
+jstl-standard.jar =${jstl.home}/lib/standard.jar
# Properties related to Struts unit testing
+# Choose your Cactus!
# -----------------------------------------
+# Cactus 12-1.3 home
+#cactus.home=${apache.home}/jakarta-cactus-12-1.3
+#cactus.lib=${cactus.home}/lib
-# Cactus home
-cactus.home=${apache.home}/jakarta-cactus-12-1.3
+# Cactus jar for the Servlet API corresponding to the servlet.jar file
+# selected above (either 2.2 or 2.3)
+#cactus.jar = ${cactus.lib}/cactus.jar
+
+# Cactus Ant custom tasks jar
+#cactus.ant.jar = ${cactus.lib}/cactus-ant.jar
+
+# AspectJ from Cactus distribution
+#aspectjrt.jar = ${cactus.lib}/aspectjrt.jar
+
+# The httpunit runtime jar
+httpunit.jar = ${cactus.lib}/httpunit.jar
+
+# -----------------------------------------
+# Cactus 12-1.4 home
+#cactus.home=${apache.home}/jakarta-cactus-12-1.4
+#cactus.lib=${cactus.home}/lib
+
+# Cactus jar for the Servlet API corresponding to the servlet.jar file
+# selected above (either 2.2 or 2.3)
+#cactus.jar = ${cactus.lib}/cactus-1.4.jar
+
+# Cactus Ant custom tasks jar
+#cactus.ant.jar = ${cactus.lib}/cactus-ant-1.4.jar
+
+# AspectJ from Cactus distribution
+#aspectjrt.jar = ${cactus.lib}/aspectjrt-1.0.5.jar
+
+# The httpunit runtime jar
+httpunit.jar = ${cactus.lib}/httpunit-1.4.1.jar
+
+# -----------------------------------------
+# Cactus 12-1.4.1 home
+#cactus.home=${apache.home}/jakarta-cactus-12-1.4.1
+#cactus.lib=${cactus.home}/lib
+
+# Cactus jar for the Servlet API corresponding to the servlet.jar file
+# selected above (either 2.2 or 2.3)
+#cactus.jar = ${cactus.lib}/cactus-1.4.1.jar
+
+# Cactus Ant custom tasks jar
+#cactus.ant.jar = ${cactus.lib}/cactus-ant-1.4.1.jar
+
+# AspectJ from Cactus distribution
+#aspectjrt.jar = ${cactus.lib}/aspectjrt-1.0.5.jar
+
+# The httpunit runtime jar
+httpunit.jar = ${cactus.lib}/httpunit-1.4.1.jar
+
+# -----------------------------------------
+# Cactus 13-1.3 home
+#cactus.home=${apache.home}/jakarta-cactus-13-1.3
+#cactus.lib=${cactus.home}/lib
+
+# Cactus jar for the Servlet API corresponding to the servlet.jar file
+# selected above (either 2.2 or 2.3)
+#cactus.jar = ${cactus.lib}/cactus.jar
+
+# Cactus Ant custom tasks jar
+#cactus.ant.jar = ${cactus.lib}/cactus-ant.jar
+
+# AspectJ from Cactus distribution
+#aspectjrt.jar = ${cactus.lib}/aspectjrt.jar
+
+# The httpunit runtime jar
+httpunit.jar = ${cactus.lib}/httpunit.jar
+
+# -----------------------------------------
+# Cactus 13-1.4.1 home
+cactus.home=${apache.home}/jakarta-cactus-13-1.4.1
cactus.lib=${cactus.home}/lib
# Cactus jar for the Servlet API corresponding to the servlet.jar file
# selected above (either 2.2 or 2.3)
-cactus.jar = ${cactus.lib}/cactus.jar
+cactus.jar = ${cactus.lib}/cactus-1.4.1.jar
# Cactus Ant custom tasks jar
-cactus.ant.jar = ${cactus.lib}/cactus-ant.jar
+cactus.ant.jar = ${cactus.lib}/cactus-ant-1.4.1.jar
+
+# AspectJ from Cactus distribution
+aspectjrt.jar = ${cactus.lib}/aspectjrt-1.0.5.jar
+
+# The httpunit runtime jar
+httpunit.jar = ${cactus.lib}/httpunit-1.4.1.jar
+
# URL used to run tests for cactus, change to non standard port
# if container is already running on that port.
@@ -141,11 +221,8 @@
# Ant Optional Jars for Junit task
ant.optional.jar = ${apache.home}/jakarta-ant-1.5.1/lib/optional.jar
-# AspectJ from Cactus distribution
-aspectjrt.jar = ${cactus.lib}/aspectjrt.jar
-
-# The httpunit runtime jar
-httpunit.jar = ${cactus.lib}/httpunit.jar
+# Ant Jar for optional taglib documentation task
+ant.jar=${apache.home}/apache-ant-1.5.2/lib/ant.jar
# Httpclient from Jakarta-Commons
commons-httpclient.jar = ${commons-lib.home}/httpclient/dist/commons-httpclient.jar
1.103 +24 -0 jakarta-struts/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/build.xml,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- build.xml 6 Mar 2003 04:20:49 -0000 1.102
+++ build.xml 29 Mar 2003 05:58:14 -0000 1.103
@@ -94,6 +94,11 @@
to copy. This is required only when
executing the "deploy.catalina" target.
+ ant.jar (optional) The path to the ant.jar that
+ is being used to build from this script
+ This is required only when executing the
+ "generate.taglib.doc" target.
+
-->
<!-- Load local and user build preferences -->
@@ -339,6 +344,25 @@
<classpath refid="compile.classpath"/>
</javadoc>
</target>
+
+<!--
+ Generate new taglib JavaDoc-like documentation
+-->
+ <target name="generate-reports" if="ant.jar">
+ <mkdir dir="${dist.home}/contrib"/>
+ <ant dir="${basedir}/contrib/tag-doc"
+ target="clean" inheritAll="false"/>
+ <ant dir="${basedir}/contrib/tag-doc"
+ target="dist" inheritAll="false"/>
+ <ant dir="${basedir}/contrib/tag-doc"
+ target="generate-reports" inheritAll="false"/>
+ <mkdir dir="${dist.home}/contrib/tag-doc"/>
+ <copy todir="${dist.home}/contrib/tag-doc">
+ <fileset dir="${basedir}/contrib/tag-doc/target"/>
+ </copy>
+
+ </target>
+
<!--
Create directories and copy files for distribution
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
