craigmcc    2003/03/05 20:20:49

  Modified:    .        build.properties.sample build.xml
  Log:
  Make it possible to build Struts against the Servlet 2.4 and JSP 2.0 APIs,
  where the JSP classes have been pulled out into their own JAR file (jsp.jar).
  On an earlier platform, you can leave the "jsp.jar" property unset and things
  will continue to operate as they have before.
  
  Revision  Changes    Path
  1.32      +6 -1      jakarta-struts/build.properties.sample
  
  Index: build.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/build.properties.sample,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- build.properties.sample   28 Feb 2003 06:42:20 -0000      1.31
  +++ build.properties.sample   6 Mar 2003 04:20:49 -0000       1.32
  @@ -78,6 +78,11 @@
   # http://java.sun.com/products/jdbc/download.html
   jdbc20ext.jar=../../../Java/Programs/sun/jdbc2_0-stdext.jar
   
  +# The JAR file containing the JSP API classes to compile against if you are
  +# using JSP 2.0 or later (where these classes are separated from servlet.jar).
  +# If you are using JSP 1.1 or 1.2, leave this property unset
  +#jsp.jar=${apache.home}/jakarta-servletapi/lib/jsp.jar
  +
   # The JAR file containing the Servlet API classes to compile against (either
   # version 2.2 or 2.3)
   servlet.jar=${apache.home}/jakarta-servletapi/lib/servlet.jar
  
  
  
  1.102     +9 -1      jakarta-struts/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/build.xml,v
  retrieving revision 1.101
  retrieving revision 1.102
  diff -u -r1.101 -r1.102
  --- build.xml 28 Feb 2003 06:42:20 -0000      1.101
  +++ build.xml 6 Mar 2003 04:20:49 -0000       1.102
  @@ -75,6 +75,13 @@
           jdbc20ext.jar                 (required).  The path to the JAR file
                                         for the JDBC 2.0 Optional Package APIs.
   
  +        jsp.jar                       (optional).  the path to the JSP API
  +                                      classes to compile against, if you are
  +                                      using JSP 2.0 where these classes have
  +                                      been separated from servlet.jar.  If you
  +                                      are using JSP 1.1 or 1.2, leave this
  +                                      property unset.
  +
           servlet.jar                   (required).  The path to the Servlet API
                                         classes to compile against (currently,
                                         either version 2.2 or 2.3 supported).
  @@ -195,6 +202,7 @@
         <pathelement location="${commons-validator.jar}"/>
         <pathelement location="${jakarta-oro.jar}"/>
         <pathelement location="${jdbc20ext.jar}"/>
  +      <pathelement location="${jsp.jar}"/>
         <pathelement location="${servlet.jar}"/>
         <pathelement location="${xerces.jar}"/>
       </path>
  @@ -319,7 +327,7 @@
           <mkdir dir="${build.home}/documentation/api"/>
           <javadoc sourcepath="${src.share.dir}"
               destdir="${build.home}/documentation/api"
  -            classpath="${servlet.jar}:${jdbc20ext.jar}"
  +            classpath="${servlet.jar}:${jsp.jar}:${jdbc20ext.jar}"
               packagenames="org.apache.struts.*"
               author="true"
               private="true"
  
  
  

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

Reply via email to