tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From craig...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/tester build.xml
Date Fri, 28 Sep 2001 05:41:29 GMT
craigmcc    01/09/27 22:41:29

  Modified:    .        BUILDING.txt build.properties.sample
               catalina build.xml
               jasper   build.xml
               tester   build.xml
  Removed:     lib      crimson.jar jaxp.jar
  Log:
  Port switching to Xerces 1.4.3 as the XML parser exposed to web
  applications (as well as for internal components) to the HEAD branch.
  
  Revision  Changes    Path
  1.8       +32 -18    jakarta-tomcat-4.0/BUILDING.txt
  
  Index: BUILDING.txt
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/BUILDING.txt,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- BUILDING.txt	2001/09/23 00:12:34	1.7
  +++ BUILDING.txt	2001/09/28 05:41:29	1.8
  @@ -1,4 +1,4 @@
  -$Id: BUILDING.txt,v 1.7 2001/09/23 00:12:34 remm Exp $
  +$Id: BUILDING.txt,v 1.8 2001/09/28 05:41:29 craigmcc Exp $
   
   
                  Building The Tomcat 4.0 Servlet/JSP Container
  @@ -73,8 +73,21 @@
     it can be used with the <style> tag) by copying it to "${ant.home}/lib".
   
   
  -(3) Download and Install Subproject Source Code
  +(3) Download and Install the Xerces 1 Distribution
   
  +* Download a binary distribution from:
  +
  +  http://xml.apache.org/dist/xerces-j/
  +
  +  (Tomcat was tested with "Xerces-J-bin-1.4.3.zip")
  +
  +* Unpack the binary distribution into a convenient location so that the
  +  distribution resides in its own directory (conventionally named
  +  "xerces-x_y_z").
  +
  +
  +(4) Download and Install Subproject Source Code
  +
   * Use Anonymous CVS (as described on the Jakarta web site at
     <http://jakarta.apache.org/site/cvsindex.html>, or
     download a source distribution from:
  @@ -97,7 +110,7 @@
     pathname of the release directory.
   
   
  -(4) Download and Install the Regular Expressions Binary Distribution
  +(5) Download and Install the Regular Expressions Binary Distribution
   
   NOTE:  Alternatively, you can download the sources of the
   "jakarta-regexp" subproject, and build a binary distribution yourself.
  @@ -117,7 +130,7 @@
     "jakarta-regexp-x.y").
   
   
  -(5) Download and Install the Servlet API Binary Distribution
  +(6) Download and Install the Servlet API Binary Distribution
   
   NOTE:  Alternatively, you can download the sources of the
   "jakarta-servletapi-4" subproject, and build a binary distribution yourself,
  @@ -138,14 +151,14 @@
     distribution resides in its own directory.
   
   
  -(6) Steps (7) - (17) are optional, but are necessary to build a complete binary
  +(7) Steps (8) - (18) are optional, but are necessary to build a complete binary
       distribution of Tomcat 4.0. Set the "full.dist" property to "on" in the
       build.properties file (see step (18)) to build a complete distribution.
       Regular contributors to Tomcat are encouraged to use the complete build 
       option.
   
   
  -(7) Download and Install JDBC Optional Package API Binary Distribution
  +(8) Download and Install JDBC Optional Package API Binary Distribution
   
   * Download the JDBC Optional Pacakge API package (version 2.0) from:
   
  @@ -154,7 +167,7 @@
   * Place the jar in a convenient location.
   
   
  -(8) Download and Install the JMX 1.0 Reference Implementation
  +(9) Download and Install the JMX 1.0 Reference Implementation
   
   * Download the JMX Instrumentation and Agent Reference Implementation
     (version 1.0 or later) from
  @@ -165,7 +178,7 @@
     it resides in its own subdirectory.
   
   
  -(9) Download and Install the JNDI 1.2.1 Reference Implementation
  +(10) Download and Install the JNDI 1.2.1 Reference Implementation
   
   * Download the Java Naming and Directory Interface (JNDI) package,
     (version 1.2.1 or later) from
  @@ -179,7 +192,7 @@
     same download page.  Be sure that you unpack "ldap.jar" into the "lib"
     subdirectory of the JNDI directory, parallel to "jndi.jar".
   
  -(10) Download and Install the Java Activation Framework 1.0.1
  +(11) Download and Install the Java Activation Framework 1.0.1
   
   * Download the Java Activation Framework package (version 1.0.1 or later) from
   
  @@ -187,8 +200,9 @@
   
   * Unpack the package into a convenient location so that it
     resised in its own subdirectory.
  +
   
  -(11) Download and Install JavaMail 1.2
  +(12) Download and Install JavaMail 1.2
   
   * Download the JavaMail package (version 1.2 or later) from
   
  @@ -198,7 +212,7 @@
     it resides in its own subdirectory.
   
   
  -(12) Download and Install the JSSE 1.0.2 Reference Implementation
  +(13) Download and Install the JSSE 1.0.2 Reference Implementation
   
   * Download the Java Secure Sockets Extension (JSSE) package,
     (version 1.0.2 or later) from
  @@ -209,7 +223,7 @@
     it resides in its own subdirectory.
   
   
  -(13) Download and Install the Java Transaction APIs
  +(14) Download and Install the Java Transaction APIs
   
   * Download the Java Transaction API (JTA) package (version 1.0.1) from:
   
  @@ -219,7 +233,7 @@
     own subdirectory.
   
   
  -(14) Download and Install the Tyrex Data Source Package
  +(15) Download and Install the Tyrex Data Source Package
   
   NOTE:  This step is only required if you wish to build the Tyrex connection
   pool implementation for JNDI-accessed data sources.
  @@ -232,7 +246,7 @@
     own subdirectory.
   
   
  -(15) Download and Install the JUnit Testing Package (OPTIONAL)
  +(16) Download and Install the JUnit Testing Package (OPTIONAL)
   
   NOTE:  This step is only required if you wish to build and execute the unit
   tests that are part of the Tomcat 4.0 source base.
  @@ -245,14 +259,14 @@
     own subdirectory.
   
   
  -(16) Check out the jakarta-tomcat-connectors repository, using the "TOMCAT_4_1"
  +(17) Check out the jakarta-tomcat-connectors repository, using the "TOMCAT_4_1"
        tag.
   
   
  -(17) Compile the "util" module, and the "jk" module.
  +(18) Compile the "util" module, and the "jk" module.
   
   
  -(18) Customize Build Properties For This Subproject
  +(19) Customize Build Properties For This Subproject
   
   Most Jakarta subprojects allow you to customize Ant properties (with default
   values defined in the "build.xml" file.  This is done by creating a text file
  @@ -276,7 +290,7 @@
   each developer will have their own version.
   
   
  -(19) Build A Binary Distribution
  +(20) Build A Binary Distribution
   
   Open a command line shell, and issue the following commands:
   
  
  
  
  1.15      +7 -1      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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- build.properties.sample	2001/09/23 00:12:34	1.14
  +++ build.properties.sample	2001/09/28 05:41:29	1.15
  @@ -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.14 2001/09/23 00:12:34 remm Exp $
  +# $Id: build.properties.sample,v 1.15 2001/09/28 05:41:29 craigmcc Exp $
   # -----------------------------------------------------------------------------
   
   
  @@ -109,3 +109,9 @@
   tyrex.home=${base.path}/tyrex-0.9.7.0
   tyrex.lib=${tyrex.home}
   tyrex.jar=${tyrex.lib}/tyrex-0.9.7.0.jar
  +
  +# ----- Xerces XML Parser, version 1.4.3 or later -----
  +xerces.home=${base.path}/xerces-1_4_3
  +xerces.lib=${xerces.home}
  +xercse.jar=${xerces.lib}/xerces.jar
  +
  
  
  
  1.69      +3 -8      jakarta-tomcat-4.0/catalina/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/build.xml,v
  retrieving revision 1.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- build.xml	2001/09/26 22:49:27	1.68
  +++ build.xml	2001/09/28 05:41:29	1.69
  @@ -14,8 +14,6 @@
     <property name="catalina.build"    value="build"/>
     <property name="catalina.deploy"   value="../build"/>
     <property name="catalina.dist"     value="dist"/>
  -  <property name="copy.crimson.jar"  value="../lib/crimson.jar"/>
  -  <property name="copy.jaxp.jar"     value="../lib/jaxp.jar"/>
     <property name="test.failonerror"  value="true"/>
     <property name="test.runner"       value="junit.textui.TestRunner"/>
     <property name="test.webapp"       value="../webapps/build/examples"/>
  @@ -24,8 +22,6 @@
     <!-- Construct Catalina classpath -->
     <path id="catalina.classpath">
       <pathelement location="${activation.jar}"/>
  -    <pathelement location="${copy.crimson.jar}"/>
  -    <pathelement location="${copy.jaxp.jar}"/>
       <pathelement location="${jcert.jar}"/>
       <pathelement location="${jdbc20ext.jar}"/>
       <pathelement location="${jmxri.jar}"/>
  @@ -38,6 +34,7 @@
       <pathelement location="${regexp.jar}"/>
       <pathelement location="${servlet.jar}"/>
       <pathelement location="${tyrex.jar}"/>
  +    <pathelement location="${xerces.jar}"/>
       <pathelement location="${catalina.build}/classes"/>
     </path>
   
  @@ -45,8 +42,6 @@
     <path id="test.classpath">
       <pathelement location="${junit.jar}"/>
       <pathelement location="${activation.jar}"/>
  -    <pathelement location="${copy.crimson.jar}"/>
  -    <pathelement location="${copy.jaxp.jar}"/>
       <pathelement location="${jcert.jar}"/>
       <pathelement location="${jdbc20ext.jar}"/>
       <pathelement location="${jmxri.jar}"/>
  @@ -59,6 +54,7 @@
       <pathelement location="${regexp.jar}"/>
       <pathelement location="${servlet.jar}"/>
       <pathelement location="${tyrex.jar}"/>
  +    <pathelement location="${xerces.jar}"/>
       <pathelement location="${catalina.build}/classes"/>
       <pathelement location="${catalina.build}/tests"/>
     </path>
  @@ -431,9 +427,8 @@
       <chmod perm="+x" file="${catalina.build}/bin/shutdown.sh"/>
   
       <!-- Common Extensions -->
  -    <copy todir="${catalina.build}/common/lib" file="${copy.crimson.jar}"/>
  -    <copy todir="${catalina.build}/common/lib" file="${copy.jaxp.jar}"/>
       <copy todir="${catalina.build}/common/lib" file="${servlet.jar}"/>
  +    <copy todir="${catalina.build}/common/lib" file="${xerces.jar}"/>
   
       <!-- Configuration Files -->
       <copy todir="${catalina.build}/conf">
  
  
  
  1.24      +2 -6      jakarta-tomcat-4.0/jasper/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/build.xml,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- build.xml	2001/09/28 03:24:30	1.23
  +++ build.xml	2001/09/28 05:41:29	1.24
  @@ -11,8 +11,6 @@
   
     <!-- Build Defaults -->
     <property name="build.compiler"    value="classic"/>
  -  <property name="copy.crimson.jar"  value="../lib/crimson.jar"/>
  -  <property name="copy.jaxp.jar"     value="../lib/jaxp.jar"/>
     <property name="jasper.build"      value="build"/>
     <property name="jasper.deploy"     value="../build"/>
     <property name="jasper.dist"       value="dist"/>
  @@ -22,20 +20,18 @@
   
     <!-- Construct Jasper classpath -->
     <path id="jasper.classpath">
  -    <pathelement location="${copy.crimson.jar}"/>
  -    <pathelement location="${copy.jaxp.jar}"/>
       <pathelement location="${servlet.jar}"/>
       <pathelement location="${tools.jar}"/>
  +    <pathelement location="${xerces.jar}"/>
       <pathelement location="${jasper.build}/classes"/>
     </path>
   
     <!-- Construct unit tests classpath -->
     <path id="test.classpath">
       <pathelement location="${junit.jar}"/>
  -    <pathelement location="${copy.crimson.jar}"/>
  -    <pathelement location="${copy.jaxp.jar}"/>
       <pathelement location="${servlet.jar}"/>
       <pathelement location="${tools.jar}"/>
  +    <pathelement location="${xerces.jar}"/>
       <pathelement location="${jasper.build}/classes"/>
       <pathelement location="${jasper.build}/tests"/>
     </path>
  
  
  
  1.14      +1 -5      jakarta-tomcat-4.0/tester/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/tester/build.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- build.xml	2001/08/15 00:57:08	1.13
  +++ build.xml	2001/09/28 05:41:29	1.14
  @@ -12,12 +12,10 @@
     <property name="tester.build"    value="build"/>
     <property name="tester.deploy"   value="../build"/>
     <property name="tester.dist"     value="dist"/>
  -  <property name="xerces.home"     value="../../xerces-1_3_0"/>
   
     <!-- ================== Derived Property Values ========================= -->
     <property name="ant.jar"         value="${ant.home}/lib/ant.jar"/>
     <property name="servlet.jar"     value="${servletapi.home}/lib/servlet.jar"/>
  -  <property name="xerces.jar"      value="${xerces.home}/xerces.jar"/>
   
     <!-- =================== BUILD: Create Directories ====================== -->
     <target name="build-prepare">
  @@ -89,9 +87,7 @@
           tofile="${tester.build}/web/WEB-INF/classes/org/apache/tester/Unpacked05.txt"/>
   
       <!-- Install Xerces -->
  -    <copy  todir="${tester.build}/web/WEB-INF/lib">
  -        <fileset dir="${xerces.home}" includes="xerces.jar"/>
  -    </copy>
  +    <copy  todir="${tester.build}/web/WEB-INF/lib" file="${xerces.jar}"/>
   
       <!-- Create and install tester library -->
       <mkdir   dir="${tester.build}/web/WEB-INF/lib"/>
  
  
  

Mime
View raw message