tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-4.0 build.properties.sample build.xml tomcat.nsi
Date Thu, 04 Oct 2001 19:24:46 GMT
remm        01/10/04 12:24:46

  Modified:    .        Tag: tomcat_40_branch build.properties.sample
                        build.xml tomcat.nsi
  Log:
  - Merge a variety of fixes and small feature additions which have been made
    and debugged in the HEAD branch, including:
    - Removal of Jasper loader (merged with the shared loader).
    - Fixes a lot of spec complaince issue regarding the commit state of the
      response when using forwards, sendError or sendRedirect.
    - Fixes cache consistency issues for static resource serving.
    - Adds content caching for static resources (that's linked to the bugfix
      mentioned just above).
    - Merge enhanced error reporting and error page dispatching (which will be
      able to display error pages for most errors returned from the pipeline -
      like the 401 and 403 returned by the authenticator).
    - Merge the fixes for all the other more recent bugfixes that have been
      fixed in the HEAD branch.
    - Passes all tester and Watchdog tests.
    - Merge a variety of small enhancements to the build scripts which have been
      made in the HEAD branch.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.7.2.8   +9 -8      jakarta-tomcat-4.0/build.properties.sample
  
  Index: build.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/build.properties.sample,v
  retrieving revision 1.7.2.7
  retrieving revision 1.7.2.8
  diff -u -r1.7.2.7 -r1.7.2.8
  --- build.properties.sample	2001/09/28 16:28:13	1.7.2.7
  +++ build.properties.sample	2001/10/04 19:24:45	1.7.2.8
  @@ -6,7 +6,7 @@
   # modules that Tomcat depends on.  Copy this file to "build.properties"
   # in the top-level source directory, and customize it as needed.
   #
  -# $Id: build.properties.sample,v 1.7.2.7 2001/09/28 16:28:13 craigmcc Exp $
  +# $Id: build.properties.sample,v 1.7.2.8 2001/10/04 19:24:45 remm Exp $
   # -----------------------------------------------------------------------------
   
   
  @@ -26,18 +26,20 @@
   base.path=/usr/local
   
   
  -# ----- Tomcat Util -----
  -tomcat-util.jar=../../jakarta-tomcat-connectors/util/build/lib/tomcat-util.jar
  +# ----- Jakarta Tomcat Connectors path -----
  +jakarta-tomcat-connector.home=../../jakarta-tomcat-connectors
   
   
  +# ----- Tomcat utils -----
  +tomcat-util.jar=../lib/tomcat-util.jar
  +
  +
   # ----- JK 1.3 connector for Tomcat 4.0 -----
  -ajp.jar=../../jakarta-tomcat-connectors/jk/build/lib/ajp.jar
  +tomcat-ajp.jar=../lib/tomcat-ajp.jar
   
   
   # ----- Jakarta Regular Expressions Library, version 1.2 -----
  -regexp.home=${base.path}/jakarta-regexp-1.2
  -regexp.lib=${regexp.home}
  -regexp.jar=${regexp.home}/jakarta-regexp-1.2.jar
  +regexp.jar=../lib/jakarta-regexp-1.2.jar
   
   
   # ----- Jakarta Servlet API Classes (Servlet 2.3 / JSP 1.2) -----
  @@ -115,5 +117,4 @@
   xerces.home=${base.path}/xerces-1_4_3
   xerces.lib=${xerces.home}
   xerces.jar=${xerces.lib}/xerces.jar
  -
   
  
  
  
  1.38.2.3  +26 -14    jakarta-tomcat-4.0/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/build.xml,v
  retrieving revision 1.38.2.2
  retrieving revision 1.38.2.3
  diff -u -r1.38.2.2 -r1.38.2.3
  --- build.xml	2001/09/26 18:49:08	1.38.2.2
  +++ build.xml	2001/10/04 19:24:45	1.38.2.3
  @@ -18,6 +18,9 @@
     <property name="webapps.build"    value="${basedir}/webapps/build"/>
     <property name="webapps.dist"     value="${basedir}/webapps/dist"/>
   
  +  <!-- Default AJP and UTIL components for the usual case -->
  +  <property name="tomcat-ajp.jar"   value="${basedir}/lib/tomcat-ajp.jar"/>
  +  <property name="tomcat-util.jar"  value="${basedir}/lib/tomcat-util.jar"/>
   
   
     <!-- =================== DETECT: Display configuration ================== -->
  @@ -91,17 +94,16 @@
     <target name="dist-prepare">
       <mkdir dir="${tomcat.dist}"/>
       <mkdir dir="${tomcat.dist}/bin"/>
  -    <mkdir dir="${tomcat.dist}/classes"/>
       <mkdir dir="${tomcat.dist}/common"/>
       <mkdir dir="${tomcat.dist}/common/classes"/>
       <mkdir dir="${tomcat.dist}/common/lib"/>
       <mkdir dir="${tomcat.dist}/conf"/>
  -    <mkdir dir="${tomcat.dist}/jasper"/>
  -    <mkdir dir="${tomcat.dist}/lib"/>
       <mkdir dir="${tomcat.dist}/logs"/>
       <mkdir dir="${tomcat.dist}/server"/>
       <mkdir dir="${tomcat.dist}/server/classes"/>
       <mkdir dir="${tomcat.dist}/server/lib"/>
  +    <mkdir dir="${tomcat.dist}/classes"/>
  +    <mkdir dir="${tomcat.dist}/lib"/>
       <mkdir dir="${tomcat.dist}/webapps"/>
       <mkdir dir="${tomcat.dist}/work"/>
     </target>
  @@ -110,6 +112,7 @@
     <!-- ====================== DIST: Copy Static Files ===================== -->
     <target name="dist-static" depends="dist-prepare">
   
  +    <!-- Copy the top-level documentation files -->
       <copy todir="${tomcat.dist}">
         <fileset dir=".">
           <include name="LICENSE"/>
  @@ -121,27 +124,39 @@
         </fileset>
       </copy>
   
  +    <!-- Copy the contents of each "build" directory -->
       <copy todir="${tomcat.dist}/bin">
         <fileset dir="${tomcat.build}/bin" />
       </copy>
  +    <copy todir="${tomcat.dist}/common/classes">
  +      <fileset dir="${tomcat.build}/common/classes" />
  +    </copy>
  +    <copy todir="${tomcat.dist}/common/lib">
  +      <fileset dir="${tomcat.build}/common/lib" />
  +    </copy>
       <copy todir="${tomcat.dist}/conf">
         <fileset dir="${tomcat.build}/conf" />
       </copy>
  -    <copy todir="${tomcat.dist}/jasper">
  -      <fileset dir="${tomcat.build}/jasper" />
  +    <copy todir="${tomcat.dist}/server/classes">
  +      <fileset dir="${tomcat.build}/server/classes" />
       </copy>
  -    <copy todir="${tomcat.dist}/common/lib">
  -      <fileset dir="${tomcat.build}/common/lib" />
  +    <copy todir="${tomcat.dist}/server/lib">
  +      <fileset dir="${tomcat.build}/server/lib" />
  +    </copy>
  +    <copy todir="${tomcat.dist}/classes">
  +      <fileset dir="${tomcat.build}/classes" />
       </copy>
       <copy todir="${tomcat.dist}/lib">
         <fileset dir="${tomcat.build}/lib" />
       </copy>
  -    <copy todir="${tomcat.dist}/server/lib">
  -      <fileset dir="${tomcat.build}/server/lib" />
  +    <copy todir="${tomcat.dist}/webapps">
  +      <fileset dir="${tomcat.build}/webapps" />
       </copy>
  -    <fixcrlf srcdir="${tomcat.dist}/bin"   includes="*.sh" eol="lf"/>
  +
  +    <!-- Correct permissions and line endings on "bin" scripts -->
  +    <fixcrlf srcdir="${tomcat.dist}/bin"   includes="*.sh"  eol="lf"/>
       <fixcrlf srcdir="${tomcat.dist}/bin"   includes="*.bat" eol="crlf"/>
  -    <chmod      dir="${tomcat.dist}/bin"   includes="*.sh" perm="+x"/>
  +    <chmod      dir="${tomcat.dist}/bin"   includes="*.sh"  perm="+x"/>
   
     </target>
   
  @@ -180,9 +195,6 @@
     <!-- ====================== DIST: Create Archives ======================= -->
     <target name="dist" depends="deploy,dist-static,dist-javadoc"
      description="Create binary distribution">
  -    <copy todir="${tomcat.dist}/webapps">
  -      <fileset dir="${tomcat.build}/webapps" />
  -    </copy>
     </target>
   
   
  
  
  
  1.16.2.1  +4 -7      jakarta-tomcat-4.0/tomcat.nsi
  
  Index: tomcat.nsi
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
  retrieving revision 1.16
  retrieving revision 1.16.2.1
  diff -u -r1.16 -r1.16.2.1
  --- tomcat.nsi	2001/09/11 23:40:38	1.16
  +++ tomcat.nsi	2001/10/04 19:24:45	1.16.2.1
  @@ -1,6 +1,6 @@
   
   ; Tomcat 4 script for Nullsoft Installer
  -; $Id: tomcat.nsi,v 1.16 2001/09/11 23:40:38 remm Exp $
  +; $Id: tomcat.nsi,v 1.16.2.1 2001/10/04 19:24:45 remm Exp $
   
   Name "apache-tomcat-4.0"
   Caption "Apache Tomcat 4.0"
  @@ -41,8 +41,7 @@
     File LICENSE
     File /r bin
     File /r common
  -  File /r jasper
  -  File /r lib
  +  File /r shared
     File /r logs
     File /r server
     File /r work
  @@ -249,8 +248,7 @@
     File LICENSE
     File /r bin
     File /r common
  -  File /r jasper
  -  File /r lib
  +  File /r shared
     File /r logs
     File /r server
     File /r work
  @@ -299,8 +297,7 @@
     RMDir /r "$INSTDIR\bin"
     RMDir /r "$INSTDIR\common"
     Delete "$INSTDIR\conf\*.dtd"
  -  RMDir /r "$INSTDIR\jasper"
  -  RMDir /r "$INSTDIR\lib"
  +  RMDir /r "$INSTDIR\shared"
     RMDir "$INSTDIR\logs"
     RMDir /r "$INSTDIR\server"
     RMDir /r "$INSTDIR\webapps\manager"
  
  
  

Mime
View raw message