Hi Chris,

Not sure what is the benefit of putting stylebook.jar in the
build.properties. It looks more complex than just putting it in
anthome/lib. I guess you want to keep your anthome/lib clean? (However
stylebook does not interfere with anything else). However, I don't mind!
:-)

Anyway, there is still a problem I think with the current implementation
of stylebook.jar in the build.xmls. The stylebook jar that is specified
in the global build.properties will *not* get passed to the
documentation subproject build. This is slightly complex to do as it
must be passed only if stylebook.jar is defined.

-Vincent

> -----Original Message-----
> From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
> Sent: 12 December 2002 11:01
> To: [EMAIL PROTECTED]
> Subject: cvs commit: jakarta-cactus/documentation
build.properties.sample
> build.xml
> 
> cmlenz      2002/12/12 03:00:45
> 
>   Modified:    .        build.xml build.properties.sample
>                documentation build.properties.sample build.xml
>   Log:
>   Enable building the documentation without requiring the Stylebook
JAR in
>   $ANT_HOME/lib. Now you just need to specify the stylebook.jar
property.
>   If the property is not set, the build will assume that stylebook is
>   available on the classpath somewhere (i.e. $ANT_HOME/lib)
> 
>   Revision  Changes    Path
>   1.28      +1 -0      jakarta-cactus/build.xml
> 
>   Index: build.xml
>   ===================================================================
>   RCS file: /home/cvs/jakarta-cactus/build.xml,v
>   retrieving revision 1.27
>   retrieving revision 1.28
>   diff -u -r1.27 -r1.28
>   --- build.xml       28 Nov 2002 11:34:12 -0000      1.27
>   +++ build.xml       12 Dec 2002 11:00:44 -0000      1.28
>   @@ -100,6 +100,7 @@
>            <echo message="servlet.jar = ${servlet.jar}"/>
>            <echo message=""/>
>            <echo message="cvs.executable = ${cvs.executable}"/>
>   +        <echo message="stylebook.jar = ${stylebook.jar}"/>
>            <echo message=""/>
>            <echo message="clover.enable (optional) =
${clover.enable}"/>
>            <echo message=""/>
> 
> 
> 
>   1.30      +4 -1      jakarta-cactus/build.properties.sample
> 
>   Index: build.properties.sample
>   ===================================================================
>   RCS file: /home/cvs/jakarta-cactus/build.properties.sample,v
>   retrieving revision 1.29
>   retrieving revision 1.30
>   diff -u -r1.29 -r1.30
>   --- build.properties.sample 1 Dec 2002 20:18:05 -0000       1.29
>   +++ build.properties.sample 12 Dec 2002 11:00:44 -0000      1.30
>   @@ -55,6 +55,9 @@
>    # The location of the JSTL jar
>    standard.jar = ${lib.repo}/taglibs/jars/standard-1.0.2.jar
> 
>   +# The location of the Stylebook jar (used to generate the
> documentation)
>   +stylebook.jar = ${lib.repo}/stylebook/jars/stylebook.jar
>   +
>    # CVS executable to use for documentation generation (used to
> automatically
>    # generate web site changelog).
>    cvs.executable = cvs
> 
> 
> 
>   1.4       +9 -1      jakarta-
> cactus/documentation/build.properties.sample
> 
>   Index: build.properties.sample
>   ===================================================================
>   RCS file: /home/cvs/jakarta-
> cactus/documentation/build.properties.sample,v
>   retrieving revision 1.3
>   retrieving revision 1.4
>   diff -u -r1.3 -r1.4
>   --- build.properties.sample 9 Jun 2002 18:28:06 -0000       1.3
>   +++ build.properties.sample 12 Dec 2002 11:00:44 -0000      1.4
>   @@ -16,6 +16,14 @@
>    # Mandatory properties
>    #
---------------------------------------------------------------------
> --------
> 
>   +# Location of all jars. Note: This is not a mandatory property. It
is
> only
>   +# used here so that it can be reused when defining the location of
all
> the jars
>   +# below. You do not have to put all the external jars in a single
> location.
>   +lib.repo = c:/apps/maven/repository
>   +
>   +# The location of the Stylebook jar (used to generate the
> documentation)
>   +stylebook.jar = ${lib.repo}/stylebook/jars/stylebook.jar
>   +
>    # CVS executable to use for documentation generation (used to
> automatically
>    # generate web site changelog).
>    cvs.executable = cvs
> 
> 
> 
>   1.15      +7 -1      jakarta-cactus/documentation/build.xml
> 
>   Index: build.xml
>   ===================================================================
>   RCS file: /home/cvs/jakarta-cactus/documentation/build.xml,v
>   retrieving revision 1.14
>   retrieving revision 1.15
>   diff -u -r1.14 -r1.15
>   --- build.xml       25 Aug 2002 13:30:28 -0000      1.14
>   +++ build.xml       12 Dec 2002 11:00:44 -0000      1.15
>   @@ -41,6 +41,10 @@
>        <!-- Prefix to add to all distributable files -->
>        <property name="project.prefix" value="jakarta-"/>
> 
>   +    <!-- Default location for the stylebook jar -->
>   +    <property name="stylebook.jar"
>   +        value="${basedir}/lib/stylebook.jar"/>
>   +
>        <!--
> 
>
========================================================================
>             Default values for properties not defined in
build.properties
> or in
>   @@ -112,7 +116,8 @@
>        -->
>        <target name="check.properties" depends="display.properties">
> 
>   -        <taskdef name="checkProperty"
> classname="org.apache.cactus.ant.CheckPropertiesTask">
>   +        <taskdef name="checkProperty"
>   +            classname="org.apache.cactus.ant.CheckPropertiesTask">
>                <classpath>
>                    <pathelement location="${cactus.ant.jar}"/>
>                </classpath>
>   @@ -207,6 +212,7 @@
>                targetDirectory="${target.doc.dir}">
> 
>                <classpath>
>   +                <pathelement location="${stylebook.jar}"/>
>                    <pathelement path="${java.class.path}"/>
>                </classpath>
> 
> 
> 
> 
> 
> --
> To unsubscribe, e-mail:   <mailto:cactus-dev-
> [EMAIL PROTECTED]>
> For additional commands, e-mail: <mailto:cactus-dev-
> [EMAIL PROTECTED]>



--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to