cmlenz 2003/01/09 12:05:39
Modified: . build.xml gump.xml build.properties.sample
documentation build.properties.sample build.xml
Log:
Although not documented, the ant <cvschangelog> task does seem to
have all functionality we require from our custom <cvslog> task. This
change replaces usage of <cvslog> with <cvschangelog>, and removes
the cvs.executable property which is no longer needed.
Revision Changes Path
1.32 +0 -3 jakarta-cactus/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/build.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- build.xml 3 Jan 2003 15:53:35 -0000 1.31
+++ build.xml 9 Jan 2003 20:05:39 -0000 1.32
@@ -99,8 +99,6 @@
<echo message="j2ee.jar = ${j2ee.jar}"/>
<echo message="servlet.jar = ${servlet.jar}"/>
<echo message=""/>
- <echo message="cvs.executable = ${cvs.executable}"/>
- <echo message=""/>
<echo message="clover.enable (optional) = ${clover.enable}"/>
<echo message=""/>
@@ -125,7 +123,6 @@
<available file="${aspectjrt.jar}"/>
<available file="${jstl.jar}"/>
<available file="${standard.jar}"/>
- <isset property="cvs.executable"/>
</and>
</condition>
1.31 +0 -4 jakarta-cactus/gump.xml
Index: gump.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/gump.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- gump.xml 8 Jan 2003 23:25:33 -0000 1.30
+++ gump.xml 9 Jan 2003 20:05:39 -0000 1.31
@@ -46,7 +46,6 @@
<ant buildfile="documentation/build.xml" target="dist">
<depend property="cactus.ant.jar" project="jakarta-cactus-ant"/>
- <property name="cvs.executable" value="cvs"/>
</ant>
<depend project="jakarta-ant" inherit="runtime"/>
@@ -254,7 +253,6 @@
<depend property="standard.jar" project="jakarta-taglibs-standard"
id="standard"/>
<property name="release.dir" value="release-12"/>
- <property name="cvs.executable" value="cvs"/>
</ant>
@@ -294,7 +292,6 @@
<depend property="standard.jar" project="jakarta-taglibs-standard"
id="standard"/>
<property name="release.dir" value="release-13"/>
- <property name="cvs.executable" value="cvs"/>
</ant>
@@ -333,7 +330,6 @@
<depend property="jstl.jar" project="jakarta-taglibs-standard" id="jstl"/>
<depend property="standard.jar" project="jakarta-taglibs-standard"
id="standard"/>
- <property name="cvs.executable" value="cvs"/>
</ant>
1.37 +1 -5 jakarta-cactus/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-cactus/build.properties.sample,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- build.properties.sample 3 Jan 2003 14:12:14 -0000 1.36
+++ build.properties.sample 9 Jan 2003 20:05:39 -0000 1.37
@@ -55,10 +55,6 @@
# The location of the JSTL jar
standard.jar = ${lib.repo}/taglibs/jars/standard-1.0.2.jar
-# CVS executable to use for documentation generation (used to automatically
-# generate web site changelog).
-cvs.executable = cvs
-
# -----------------------------------------------------------------------------
# Optional properties
# -----------------------------------------------------------------------------
1.8 +1 -5 jakarta-cactus/documentation/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-cactus/documentation/build.properties.sample,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.properties.sample 3 Jan 2003 13:41:03 -0000 1.7
+++ build.properties.sample 9 Jan 2003 20:05:39 -0000 1.8
@@ -16,10 +16,6 @@
# Mandatory properties
# -----------------------------------------------------------------------------
-# CVS executable to use for documentation generation (used to automatically
-# generate web site changelog).
-cvs.executable = cvs
-
# -----------------------------------------------------------------------------
# Optional properties
# -----------------------------------------------------------------------------
1.23 +5 -24 jakarta-cactus/documentation/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/documentation/build.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- build.xml 8 Jan 2003 14:04:03 -0000 1.22
+++ build.xml 9 Jan 2003 20:05:39 -0000 1.23
@@ -110,17 +110,6 @@
-->
<target name="check.properties" depends="display.properties">
- <taskdef name="checkProperty"
- classname="org.apache.cactus.ant.CheckPropertiesTask">
- <classpath>
- <pathelement location="${cactus.ant.jar}"/>
- </classpath>
- </taskdef>
-
- <checkProperty>
- <property name="cvs.executable"/>
- </checkProperty>
-
</target>
<!--
@@ -150,19 +139,12 @@
<mkdir dir="${target.doc.dir}"/>
<mkdir dir="${target.doc.dir}/images"/>
- <!-- Custom Ant task definitions -->
- <taskdef name="cvslog" classname="org.apache.cactus.ant.ChangeLogTask">
- <classpath>
- <pathelement location="${cactus.ant.jar}"/>
- </classpath>
- </taskdef>
-
<!-- Generate cvs log -->
<mkdir dir="${target.xdoc.dir}/cvslog"/>
- <cvslog users="${doc.xdoc.dir}/cvslog/users.properties"
- work="${doc.xdoc.dir}" output="${target.xdoc.dir}/cvslog/cvslog.xml"
- elapsed="15" executable="${cvs.executable}">
-
+ <cvschangelog dir="${doc.xdoc.dir}"
+ usersfile="${doc.xdoc.dir}/cvslog/users.properties"
+ destfile="${target.xdoc.dir}/cvslog/cvslog.xml"
+ daysinpast="15">
<fileset dir="${doc.xdoc.dir}">
<exclude name="**/navigation.xml"/>
<exclude name="sitemap.xml"/>
@@ -171,8 +153,7 @@
<exclude name="**/cvslog.xml"/>
<include name="**/*.xml"/>
</fileset>
-
- </cvslog>
+ </cvschangelog>
<!-- Copy all files that may contain token filters or that are not
binary files -->
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
