You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by cm...@apache.org on 2003/01/09 21:05:40 UTC
cvs commit: jakarta-cactus/documentation build.properties.sample build.xml
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: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>
Re: cvs commit: jakarta-cactus/documentation build.properties.sample build.xml
Posted by Stefan Bodewig <bo...@apache.org>.
On Mon, 13 Jan 2003, Christopher Lenz <cm...@gmx.de> wrote:
> Well, Cygwin isn't just bash ;-)
I (sort of) knew.
> I've installed the 'normal' windows distribution of CVS now, and
> everything's working fine.
So putting the "normal" cvs executable in front of the Cygwin one in
PATH would solve the problem? Might make a good FAQ entry.
Then again, those CVS tasks could use a unixstyle="true" flag for
Cygwin users ... I'll look into it.
Stefan
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>
Re: cvs commit: jakarta-cactus/documentation build.properties.sample
build.xml
Posted by Christopher Lenz <cm...@gmx.de>.
Stefan Bodewig wrote:
> On Mon, 13 Jan 2003, Christopher Lenz <cm...@gmx.de> wrote:
>>Anyway, you can see that cvs is getting windows-style relative
>>paths.
>
> And it shouldn't? Sorry, but I'm totally ignorant when it comes to
> Windows.
>
> Can you run the CVS executable for a single file in a DOS box once using
> back- and once using forward slashes?
>
>>Anyway, this is on Windows + Cygwin, and I'm not sure what the
>>correct behaviour *should* be in this case. :-P
>
> The shell won't see anything as Ant bypasses it completely (invoking
> cvs via Runtime#exec). I don't think that using Cygwin causes any
> difference, but maybe using Cygwin also implies a different cvs
> executable than the one "other" Windows users would see.
Well, Cygwin isn't just bash ;-) It also comes with all kinds of
unix-ish executables, amongst them CVS. Those executables expect
unix-style paths.
I've installed the 'normal' windows distribution of CVS now, and
everything's working fine. Thanks for the hints.
--
Christopher Lenz
/=/ cmlenz at gmx.de
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>
Re: cvs commit: jakarta-cactus/documentation build.properties.sample build.xml
Posted by Stefan Bodewig <bo...@apache.org>.
On Mon, 13 Jan 2003, Christopher Lenz <cm...@gmx.de> wrote:
> Anyway, you can see that cvs is getting windows-style relative
> paths.
And it shouldn't? Sorry, but I'm totally ignorant when it comes to
Windows.
Can you run the CVS executable for a single file in a DOS box once using
back- and once using forward slashes?
> Anyway, this is on Windows + Cygwin, and I'm not sure what the
> correct behaviour *should* be in this case. :-P
The shell won't see anything as Ant bypasses it completely (invoking
cvs via Runtime#exec). I don't think that using Cygwin causes any
difference, but maybe using Cygwin also implies a different cvs
executable than the one "other" Windows users would see.
Stefan
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>
Re: cvs commit: jakarta-cactus/documentation build.properties.sample
build.xml
Posted by Christopher Lenz <cm...@gmx.de>.
Stefan Bodewig wrote:
> On Mon, 13 Jan 2003, Christopher Lenz <cm...@gmx.de> wrote:
>>But there's another problem with the <cvschangelog> task,
>
> certainly possible, I must admit that I've never used it myself.
>
>>That's when running Ant on Windows, of course.
>
> and I don't use Windows either 8-)
>
> Can you run Ant with -debug to see what gets passed to the cvs
> executable? We can take this over to ant-user or bugzilla, if you
> want to.
Here's the full debug output:
----------------------------------------------------------------------------------
doc.cvschangelog:
[mkdir] Created dir:
C:\Programme\Eclipse\workspace\jakarta-cactus\documentation\target\xdocs\cvslog
fileset: Setup scanner in dir
C:\Programme\Eclipse\workspace\jakarta-cactus\documentation\docs\xdocs
with patternSet{ includes: [**/*.xml] excludes: [**/navigation.xml,
sitemap.xml, todo.xml, changes.xml, **/cvslog.xml] }
[cvschangelog] ChangeLog command: [cvs log "-d >=2002-12-29"
build_result.xml cactusname.xml downloads.xml faq.xml features.xml
getting_started.xml goals.xml howto_migration.xml howto_sample.xml
how_it_works.xml how_it_works_uml.xml index.xml javadoc.xml
javadoc_12.xml javadoc_13.xml license.xml mailinglist.xml
mock_vs_cactus.xml news.xml participating\coding_conventions.xml
participating\contributing.xml participating\contributors.xml
participating\coverage.xml participating\coverage_12.xml
participating\coverage_13.xml participating\coverage_empty.xml
participating\howto_build.xml participating\logos.xml
participating\release_checklist.xml participating\todo.xml
participating\users.xml resources.xml spines\ant\howto_ant.xml
spines\ant\howto_ant_cactus.xml spines\ant\howto_ant_install.xml
spines\ant\howto_ant_primer.xml spines\browser\howto_junitee.xml
spines\browser\howto_tomcat.xml spines\eclipse\eclipse_plugin.xml
spines\howto_runner.xml spines\manual\howto_classpath.xml
spines\manual\howto_config.xml spines\manual\howto_ide.xml
spines\manual\howto_ide_jbuilder4.xml
spines\manual\howto_ide_jbuilder5.xml
spines\manual\howto_ide_vajava_tomcat.xml
spines\manual\howto_ide_vajava_wte.xml testedon.xml webalizer.xml
writing\howto_ejb.xml writing\howto_ejb_j2eeri.xml
writing\howto_httpunit.xml writing\howto_jsp.xml
writing\howto_security.xml writing\howto_testcase.xml
writing\howto_testcase_filter.xml writing\howto_testcase_jsp.xml
writing\howto_testcase_servlet.xml]
Execute:Java13CommandLauncher: Executing 'cvs' with arguments:
'log'
'-d >=2002-12-29'
'build_result.xml'
'cactusname.xml'
'downloads.xml'
'faq.xml'
'features.xml'
'getting_started.xml'
'goals.xml'
'howto_migration.xml'
'howto_sample.xml'
'how_it_works.xml'
'how_it_works_uml.xml'
'index.xml'
'javadoc.xml'
'javadoc_12.xml'
'javadoc_13.xml'
'license.xml'
'mailinglist.xml'
'mock_vs_cactus.xml'
'news.xml'
'participating\coding_conventions.xml'
'participating\contributing.xml'
'participating\contributors.xml'
'participating\coverage.xml'
'participating\coverage_12.xml'
'participating\coverage_13.xml'
'participating\coverage_empty.xml'
'participating\howto_build.xml'
'participating\logos.xml'
'participating\release_checklist.xml'
'participating\todo.xml'
'participating\users.xml'
'resources.xml'
'spines\ant\howto_ant.xml'
'spines\ant\howto_ant_cactus.xml'
'spines\ant\howto_ant_install.xml'
'spines\ant\howto_ant_primer.xml'
'spines\browser\howto_junitee.xml'
'spines\browser\howto_tomcat.xml'
'spines\eclipse\eclipse_plugin.xml'
'spines\howto_runner.xml'
'spines\manual\howto_classpath.xml'
'spines\manual\howto_config.xml'
'spines\manual\howto_ide.xml'
'spines\manual\howto_ide_jbuilder4.xml'
'spines\manual\howto_ide_jbuilder5.xml'
'spines\manual\howto_ide_vajava_tomcat.xml'
'spines\manual\howto_ide_vajava_wte.xml'
'testedon.xml'
'webalizer.xml'
'writing\howto_ejb.xml'
'writing\howto_ejb_j2eeri.xml'
'writing\howto_httpunit.xml'
'writing\howto_jsp.xml'
'writing\howto_security.xml'
'writing\howto_testcase.xml'
'writing\howto_testcase_filter.xml'
'writing\howto_testcase_jsp.xml'
'writing\howto_testcase_servlet.xml'
The ' characters around the executable and arguments are
not part of the command.
Password:
BUILD FAILED
file:c:/Programme/Eclipse/workspace/jakarta-cactus/documentation/build.xml:159:
Error running cvs log
at
org.apache.tools.ant.taskdefs.cvslib.ChangeLogTask.execute(ChangeLogTask.java:290)
at org.apache.tools.ant.Task.perform(Task.java:319)
at org.apache.tools.ant.Target.execute(Target.java:309)
at org.apache.tools.ant.Target.performTasks(Target.java:336)
at org.apache.tools.ant.Project.executeTarget(Project.java:1306)
at org.apache.tools.ant.Project.executeTargets(Project.java:1250)
at org.apache.tools.ant.Main.runBuild(Main.java:610)
at org.apache.tools.ant.Main.start(Main.java:196)
at org.apache.tools.ant.Main.main(Main.java:235)
Total time: 10 seconds
----------------------------------------------------------------------------------
Too bad the error message doesn't contain any details :-(
Anyway, you can see that cvs is getting windows-style relative paths. As
long as the referenced files are not in sub-directories, everything
works okay.
Anyway, this is on Windows + Cygwin, and I'm not sure what the correct
behaviour *should* be in this case. :-P
--
Christopher Lenz
/=/ cmlenz at gmx.de
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>
Re: cvs commit: jakarta-cactus/documentation build.properties.sample build.xml
Posted by Stefan Bodewig <bo...@apache.org>.
On Mon, 13 Jan 2003, Christopher Lenz <cm...@gmx.de> wrote:
> But there's another problem with the <cvschangelog> task,
certainly possible, I must admit that I've never used it myself.
> That's when running Ant on Windows, of course.
and I don't use Windows either 8-)
Can you run Ant with -debug to see what gets passed to the cvs
executable? We can take this over to ant-user or bugzilla, if you
want to.
Stefan
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>
Re: cvs commit: jakarta-cactus/documentation build.properties.sample
build.xml
Posted by Christopher Lenz <cm...@gmx.de>.
Stefan Bodewig wrote:
> On Sun, 12 Jan 2003, Vincent Massol <vm...@octo.com> wrote:
>
>
>>the disconnected mode, i.e. it does not work anymore if you're not
>>connected to the internet. Thus, I now have to modify the build.xml
>>and comment out the <cvschangelog> task whenever I need to generate
>>the doc when not connected to the internet.
>
>
>>>From Ant's build file:
>
> <condition property="offline">
> <or>
> <isset property="offline"/>
> <not>
> <http url="http://www.apache.org/"/>
> </not>
> </or>
> </condition>
>
> and only run <cvschangelog> when offline has not been set?
>
> Due to property immutability the <isset/> looks redundant, but it
> saves you the (potentially time-consuming) check if you know that the
> system is not connected.
Thanks for the tip, I'll include that in the build file...
But there's another problem with the <cvschangelog> task, and I think it
has to do with the relative paths we're specifying with the nested
fileset. At least, I've started getting failures since Vincent started
putting subdirectories into the xdocs directory.
As far as I can tell, the 'cvs log' command fails when it gets
windows-style relative paths like 'writing\navigation.xml'. That's when
running Ant on Windows, of course.
Any idea how to solve this problem?
--
Christopher Lenz
/=/ cmlenz at gmx.de
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>
Re: cvs commit: jakarta-cactus/documentation build.properties.sample build.xml
Posted by Stefan Bodewig <bo...@apache.org>.
On Sun, 12 Jan 2003, Vincent Massol <vm...@octo.com> wrote:
> the disconnected mode, i.e. it does not work anymore if you're not
> connected to the internet. Thus, I now have to modify the build.xml
> and comment out the <cvschangelog> task whenever I need to generate
> the doc when not connected to the internet.
>From Ant's build file:
<condition property="offline">
<or>
<isset property="offline"/>
<not>
<http url="http://www.apache.org/"/>
</not>
</or>
</condition>
and only run <cvschangelog> when offline has not been set?
Due to property immutability the <isset/> looks redundant, but it
saves you the (potentially time-consuming) check if you know that the
system is not connected.
Stefan
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>
RE: cvs commit: jakarta-cactus/documentation build.properties.sample build.xml
Posted by Vincent Massol <vm...@octo.com>.
Hi Chris,
Cool, but there is one feature that I have highlighted in my previous
email that does not seem to be there and that is causing me some
trouble: the disconnected mode, i.e. it does not work anymore if you're
not connected to the internet. Thus, I now have to modify the build.xml
and comment out the <cvschangelog> task whenever I need to generate the
doc when not connected to the internet.
Any idea on how to solve this?
Thanks
-Vincent
> -----Original Message-----
> From: cmlenz@apache.org [mailto:cmlenz@apache.org]
> Sent: 09 January 2003 20:06
> To: jakarta-cactus-cvs@apache.org
> Subject: cvs commit: jakarta-cactus/documentation
build.properties.sample
> build.xml
>
> 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:cactus-dev-
> unsubscribe@jakarta.apache.org>
> For additional commands, e-mail: <mailto:cactus-dev-
> help@jakarta.apache.org>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>