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 2002/12/12 12:00:45 UTC

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:   <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 Nicholas Lesiecki <ni...@eblox.com>.
> While handling classpaths for tasks such as checkstyle makes the build
> file a bit more complex, it does make the build process itself easier
> IMHO. Do we really want to force everyone who wants to build Cactus from
> source maintain a Cactus-specific Ant installation?

As someone who's struggled with the cactus build, I side with Chris on this
one.

Cheers,
nick

> -----Original Message-----
> From: Christopher Lenz [mailto:cmlenz@gmx.de]
> Sent: Monday, December 16, 2002 6:59 AM
> To: Cactus Developers List
> Subject: Re: cvs commit: jakarta-cactus/documentation
> build.properties.sample build.xml
>
>
> Vincent Massol wrote:
> >>Vincent Massol wrote:
> >>
> >>>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!
> >
> >>>:-)
> >>
> >>Yeah, I know it doesn't really matter for Stylebook, I'm just trying
> >
> > to
> >
> >>move towards what I personally consider a better practice for Ant
> >
> > build
> >
> >>systems: not requiring the user to copy any libraries in
> >
> > $ANT_HOME/lib.
> >
> >>More important than Stylebook is Checkstyle. Since the version of
> >>Checkstyle I need to build Cactus is so bleeding-edge and incompatible
> >>with the previous released versions, I can't use the same
> >
> > checkstyle.jar
> >
> >>for builds of Cactus and build of my other projects. But because the
> >>Cactus build requires checkstyle.jar on java.class.path, I sort of
> >
> > need
> >
> >>to keep 2 separate installations of Ant.
> >
> >
> > Agreed. This is exactly what I have. Actually I have several installs of
> > Ant (which isn't a problem for me):
> >
> > jakarta-ant-1.5.1
> > jakarta-ant-cactus-1.5
> > jakarta-ant-cactus-1.4
> >
> > Then, in my project I have an ant.bat file with:
> >
> > @echo off
> >
> > set ANT_HOME=c:\apps\jakarta-ant-1.5-cactus
> > set PATH=%ANT_HOME%\bin;%PATH%
> >
> > call %ANT_HOME%\bin\ant.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
>
> That's not exactly what I'd call the optimal solution :-P
> [BTW, you could probably achieve the same by just setting up the
> CLASSPATH in the script before invoking Ant]
>
> While handling classpaths for tasks such as checkstyle makes the build
> file a bit more complex, it does make the build process itself easier
> IMHO. Do we really want to force everyone who wants to build Cactus from
> source maintain a Cactus-specific Ant installation?
>
> In my "private" projects I tend to have a 'lib' directory at the root
> level. The build file has default locations for all the required jars,
> which are simply ./lib/<name-of-jar-in-distro>. To get the build going,
> you just need to drop all the required jars in the lib directory and
> type "ant". Obviously, some JARs still need to be installed in
> $ANT_HOME/lib. Xalan is an example, Clover also doesn't work when placed
> elsewhere.
>
> >>>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.
> >>
> >>Hmm, not sure I understand. Why doesn't it get passed?
> >
> >
> >         <ant target="dist" antfile="documentation/build.xml"
> >             inheritAll="false">
> >
> >             <property file="build.properties" />
> >             <property file="${user.home}/build.properties" />
> >         </ant>
> >
> > inheritAll is false (voluntarily).
>
> But the properties get passed by the nested <property file="...">
> element, not?
>
> -chris
>
>
> --
> To unsubscribe, e-mail:
<ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>




--
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>.

> -----Original Message-----
> From: Christopher Lenz [mailto:cmlenz@gmx.de]
> Sent: 18 December 2002 16:54
> To: Cactus Developers List
> Subject: Re: cvs commit: jakarta-cactus/documentation
> build.properties.sample build.xml
> 
> Vincent Massol wrote:
> [snip]
> > Yes. I believe there are only 2 solutions:
> > 1/ a Maven like build (jars get downloaded automatically and put in
your
> > local repository)
> > 2/ checking in the libs in Cactus CVS.
> >
> > I would prefer 1/
> 
> Well, I don't like 2/ either. But also, I'm not sure about moving to
> Maven... IMHO Maven still has to evolve quite a bit until it can be
> really relied upon (but I know you're following the Maven project much
> more closely than I have been).

Agreed, which is why I haven't started yet the migration... :-)

> 
> However, that's a separate topic I think. What I would like to achieve
> for the Cactus build is that it isn't required to install JARs in
> $ANT_HOME/lib, or only as few JARs as possible. That is possible using
> pure Ant, I've been doing it for all of my recent projects.
> 
> I'll probably just check in some related changes in the next couple of
> days, so you can check it out (literally and otherwise ;-) ). If you
> don't like it, we'll revert :-)

oh, I've probably not been clear in my email. I'm absolutely not against
doing this. I was just asking why as I wasn't sure about the benefits.
But you've answered and that's ok with me, especially as Nick likes it
too! I really want the simplest possible build system :-). Please go
ahead!

Thanks Chris,
-Vincent

> 
> --
> Christopher Lenz
> /=/ cmlenz at gmx.de
> 
> 
> --
> 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>


Re: cvs commit: jakarta-cactus/documentation build.properties.sample build.xml

Posted by Christopher Lenz <cm...@gmx.de>.
Vincent Massol wrote:
[snip]
> Yes. I believe there are only 2 solutions:
> 1/ a Maven like build (jars get downloaded automatically and put in your
> local repository)
> 2/ checking in the libs in Cactus CVS.
> 
> I would prefer 1/

Well, I don't like 2/ either. But also, I'm not sure about moving to 
Maven... IMHO Maven still has to evolve quite a bit until it can be 
really relied upon (but I know you're following the Maven project much 
more closely than I have been).

However, that's a separate topic I think. What I would like to achieve 
for the Cactus build is that it isn't required to install JARs in 
$ANT_HOME/lib, or only as few JARs as possible. That is possible using 
pure Ant, I've been doing it for all of my recent projects.

I'll probably just check in some related changes in the next couple of 
days, so you can check it out (literally and otherwise ;-) ). If you 
don't like it, we'll revert :-)

-- 
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 Vincent Massol <vm...@octo.com>.

> -----Original Message-----
> From: Christopher Lenz [mailto:cmlenz@gmx.de]
> Sent: 16 December 2002 13:59
> To: Cactus Developers List
> Subject: Re: cvs commit: jakarta-cactus/documentation
> build.properties.sample build.xml
> 
> Vincent Massol wrote:
> >>Vincent Massol wrote:
> >>
> >>>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!
> >
> >>>:-)
> >>
> >>Yeah, I know it doesn't really matter for Stylebook, I'm just trying
> >
> > to
> >
> >>move towards what I personally consider a better practice for Ant
> >
> > build
> >
> >>systems: not requiring the user to copy any libraries in
> >
> > $ANT_HOME/lib.
> >
> >>More important than Stylebook is Checkstyle. Since the version of
> >>Checkstyle I need to build Cactus is so bleeding-edge and
incompatible
> >>with the previous released versions, I can't use the same
> >
> > checkstyle.jar
> >
> >>for builds of Cactus and build of my other projects. But because the
> >>Cactus build requires checkstyle.jar on java.class.path, I sort of
> >
> > need
> >
> >>to keep 2 separate installations of Ant.
> >
> >
> > Agreed. This is exactly what I have. Actually I have several
installs of
> > Ant (which isn't a problem for me):
> >
> > jakarta-ant-1.5.1
> > jakarta-ant-cactus-1.5
> > jakarta-ant-cactus-1.4
> >
> > Then, in my project I have an ant.bat file with:
> >
> > @echo off
> >
> > set ANT_HOME=c:\apps\jakarta-ant-1.5-cactus
> > set PATH=%ANT_HOME%\bin;%PATH%
> >
> > call %ANT_HOME%\bin\ant.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
> 
> That's not exactly what I'd call the optimal solution :-P

Agreed ;-)

> [BTW, you could probably achieve the same by just setting up the
> CLASSPATH in the script before invoking Ant]
> 
> While handling classpaths for tasks such as checkstyle makes the build
> file a bit more complex, it does make the build process itself easier
> IMHO. Do we really want to force everyone who wants to build Cactus
from
> source maintain a Cactus-specific Ant installation?
> 
> In my "private" projects I tend to have a 'lib' directory at the root
> level. The build file has default locations for all the required jars,
> which are simply ./lib/<name-of-jar-in-distro>. To get the build
going,
> you just need to drop all the required jars in the lib directory and
> type "ant". Obviously, some JARs still need to be installed in
> $ANT_HOME/lib. Xalan is an example, Clover also doesn't work when
placed
> elsewhere.

Yes. I believe there are only 2 solutions:
1/ a Maven like build (jars get downloaded automatically and put in your
local repository)
2/ checking in the libs in Cactus CVS.

I would prefer 1/

> 
> >>>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.
> >>
> >>Hmm, not sure I understand. Why doesn't it get passed?
> >
> >
> >         <ant target="dist" antfile="documentation/build.xml"
> >             inheritAll="false">
> >
> >             <property file="build.properties" />
> >             <property file="${user.home}/build.properties" />
> >         </ant>
> >
> > inheritAll is false (voluntarily).
> 
> But the properties get passed by the nested <property file="...">
> element, not?

Hum... oops .... I think you're right ;-). I forgot about that part as I
changed it several times in the past... I should have read better.
Sorry.

Thanks
-Vincent


--
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>.
Vincent Massol wrote:
>>Vincent Massol wrote:
>>
>>>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!
> 
>>>:-)
>>
>>Yeah, I know it doesn't really matter for Stylebook, I'm just trying
> 
> to
> 
>>move towards what I personally consider a better practice for Ant
> 
> build
> 
>>systems: not requiring the user to copy any libraries in
> 
> $ANT_HOME/lib.
> 
>>More important than Stylebook is Checkstyle. Since the version of
>>Checkstyle I need to build Cactus is so bleeding-edge and incompatible
>>with the previous released versions, I can't use the same
> 
> checkstyle.jar
> 
>>for builds of Cactus and build of my other projects. But because the
>>Cactus build requires checkstyle.jar on java.class.path, I sort of
> 
> need
> 
>>to keep 2 separate installations of Ant.
> 
> 
> Agreed. This is exactly what I have. Actually I have several installs of
> Ant (which isn't a problem for me):
> 
> jakarta-ant-1.5.1
> jakarta-ant-cactus-1.5
> jakarta-ant-cactus-1.4
> 
> Then, in my project I have an ant.bat file with:
> 
> @echo off
> 
> set ANT_HOME=c:\apps\jakarta-ant-1.5-cactus
> set PATH=%ANT_HOME%\bin;%PATH%
> 
> call %ANT_HOME%\bin\ant.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

That's not exactly what I'd call the optimal solution :-P
[BTW, you could probably achieve the same by just setting up the 
CLASSPATH in the script before invoking Ant]

While handling classpaths for tasks such as checkstyle makes the build 
file a bit more complex, it does make the build process itself easier 
IMHO. Do we really want to force everyone who wants to build Cactus from 
source maintain a Cactus-specific Ant installation?

In my "private" projects I tend to have a 'lib' directory at the root 
level. The build file has default locations for all the required jars, 
which are simply ./lib/<name-of-jar-in-distro>. To get the build going, 
you just need to drop all the required jars in the lib directory and 
type "ant". Obviously, some JARs still need to be installed in 
$ANT_HOME/lib. Xalan is an example, Clover also doesn't work when placed 
elsewhere.

>>>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.
>>
>>Hmm, not sure I understand. Why doesn't it get passed?
> 
> 
>         <ant target="dist" antfile="documentation/build.xml"
>             inheritAll="false">
> 
>             <property file="build.properties" />
>             <property file="${user.home}/build.properties" />
>         </ant>
> 
> inheritAll is false (voluntarily).

But the properties get passed by the nested <property file="..."> 
element, not?

-chris


--
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>.

> -----Original Message-----
> From: Christopher Lenz [mailto:cmlenz@gmx.de]
> Sent: 16 December 2002 08:48
> To: Cactus Developers List
> Subject: Re: cvs commit: jakarta-cactus/documentation
> build.properties.sample build.xml
> 
> Vincent Massol wrote:
> > 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!
> > :-)
> 
> Yeah, I know it doesn't really matter for Stylebook, I'm just trying
to
> move towards what I personally consider a better practice for Ant
build
> systems: not requiring the user to copy any libraries in
$ANT_HOME/lib.
> 
> More important than Stylebook is Checkstyle. Since the version of
> Checkstyle I need to build Cactus is so bleeding-edge and incompatible
> with the previous released versions, I can't use the same
checkstyle.jar
> for builds of Cactus and build of my other projects. But because the
> Cactus build requires checkstyle.jar on java.class.path, I sort of
need
> to keep 2 separate installations of Ant.

Agreed. This is exactly what I have. Actually I have several installs of
Ant (which isn't a problem for me):

jakarta-ant-1.5.1
jakarta-ant-cactus-1.5
jakarta-ant-cactus-1.4

Then, in my project I have an ant.bat file with:

@echo off

set ANT_HOME=c:\apps\jakarta-ant-1.5-cactus
set PATH=%ANT_HOME%\bin;%PATH%

call %ANT_HOME%\bin\ant.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

> 
> > 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.
> 
> Hmm, not sure I understand. Why doesn't it get passed?

        <ant target="dist" antfile="documentation/build.xml"
            inheritAll="false">

            <property file="build.properties" />
            <property file="${user.home}/build.properties" />
        </ant>

inheritAll is false (voluntarily).

-Vincent



--
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>.
Vincent Massol wrote:
> 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!
> :-)

Yeah, I know it doesn't really matter for Stylebook, I'm just trying to 
move towards what I personally consider a better practice for Ant build 
systems: not requiring the user to copy any libraries in $ANT_HOME/lib.

More important than Stylebook is Checkstyle. Since the version of 
Checkstyle I need to build Cactus is so bleeding-edge and incompatible 
with the previous released versions, I can't use the same checkstyle.jar 
for builds of Cactus and build of my other projects. But because the 
Cactus build requires checkstyle.jar on java.class.path, I sort of need 
to keep 2 separate installations of Ant.

> 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.

Hmm, not sure I understand. Why doesn't it get passed?

-- 
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 Vincent Massol <vm...@octo.com>.
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: cmlenz@apache.org [mailto:cmlenz@apache.org]
> Sent: 12 December 2002 11:01
> To: jakarta-cactus-cvs@apache.org
> 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-
> 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>