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/05/19 01:09:25 UTC

cvs commit: jakarta-cactus build.xml build.properties.sample

cmlenz      2003/05/18 16:09:25

  Modified:    .        build.xml build.properties.sample
  Log:
  - include servlet.jar, jstl.jar and standard.jar with the binary distribution
  - there is no extra servlet.jar property now, as effectively j2ee.jar == servlet.jar for our purposes
  
  Revision  Changes    Path
  1.52      +9 -1      jakarta-cactus/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/build.xml,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- build.xml	18 May 2003 22:12:50 -0000	1.51
  +++ build.xml	18 May 2003 23:09:25 -0000	1.52
  @@ -156,8 +156,16 @@
                   prefix="${main.release.name}/lib"/>
               <zipfileset file="${nekohtml.jar}"
                   prefix="${main.release.name}/lib"/>
  +            <zipfileset file="${j2ee.jar}"
  +                prefix="${main.release.name}/lib"/>
               <zipfileset dir="samples/servlet/target-${j2ee.api}/sample"
  -                prefix="${main.release.name}/samples/servlet"/>
  +                prefix="${main.release.name}/samples/servlet">
  +                <exclude name="lib/**"/>
  +            </zipfileset>
  +            <zipfileset file="${jstl.jar}"
  +                prefix="${main.release.name}/samples/servlet/lib"/>
  +            <zipfileset file="${standard.jar}"
  +                prefix="${main.release.name}/samples/servlet/lib"/>
               <zipfileset dir="framework/web"
                   prefix="${main.release.name}/web"/>
               <zipfileset dir="." prefix="${main.release.name}"
  
  
  
  1.64      +1 -5      jakarta-cactus/build.properties.sample
  
  Index: build.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/build.properties.sample,v
  retrieving revision 1.63
  retrieving revision 1.64
  diff -u -r1.63 -r1.64
  --- build.properties.sample	13 May 2003 13:52:14 -0000	1.63
  +++ build.properties.sample	18 May 2003 23:09:25 -0000	1.64
  @@ -30,10 +30,6 @@
   # only available for Servlet 2.3 (part of J2EE 1.3).
   j2ee.jar = ${lib.repo}/j2ee/jars/j2ee-1.3.jar
   
  -# Location of the Servlet API jar (it is needed because we want to copy it
  -# in the Cactus distribution).
  -servlet.jar = ${lib.repo}/servletapi/jars/servletapi-2.3.jar
  -
   # The location of the Commons Logging jar
   commons.logging.jar = ${lib.repo}/commons-logging/jars/commons-logging-1.0.2.jar
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org