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/jasper build.xml
Date Tue, 29 Jan 2002 02:42:25 GMT
craigmcc    02/01/28 18:42:25

  Modified:    .        BUILDING.txt build.properties.sample
               catalina build.xml
               jasper   build.xml
  Log:
  Make it possible to build the HEAD branch of Tomcat 4 against the newest
  Xerces 2.0.0beta4 distribution (which uses two files, "xmlParserAPIs.jar"
  and "xercesImpl.jar"), or against an older distribution (which uses one
  file, "xerces.jar").  The choice of which implementation to use is defined
  by setting one or the other of the following sets of properties:
  
  * For Xerces 1.3.1 up through and including 2.0.0beta3,
    set "xerces.jar" to point to the full pathname of that file.
  
  * For Xerces 2.0.0beta4 or later, set "xmlParserAPIs.jar" and
    "xercesImpl.jar" to point to the full pathnames of the
    corresponding files.
  
  If you have both sets of properties defined (which will be common if you
  are building lots of packages that depend on a "xerces.jar" property), the
  2.0.0beta4 (or later) version of Xerces will be the one used for the Tomcat
  build, and will also be the parser that is copied in to the common/lib
  directory.
  
  At the moment, I would lean against porting this mechanism to the 4.0.2
  release, because it appears we will release 4.0.2 before Xerces 2.0 is
  finalized.  IMHO, Tomcat 4.0.2 should be built against, and include, the
  stable Xerces 1.4.4 release.
  
  Revision  Changes    Path
  1.23      +13 -2     jakarta-tomcat-4.0/BUILDING.txt
  
  Index: BUILDING.txt
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/BUILDING.txt,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- BUILDING.txt	24 Jan 2002 15:31:44 -0000	1.22
  +++ BUILDING.txt	29 Jan 2002 02:42:25 -0000	1.23
  @@ -1,4 +1,4 @@
  -$Id: BUILDING.txt,v 1.22 2002/01/24 15:31:44 remm Exp $
  +$Id: BUILDING.txt,v 1.23 2002/01/29 02:42:25 craigmcc Exp $
   
   
                  Building The Tomcat 4.0 Servlet/JSP Container
  @@ -74,7 +74,7 @@
     it can be used with the <style> tag) by copying it to "${ant.home}/lib".
   
   
  -(3) Download and Install the Xerces 1 Distribution
  +(3) Download and Install the Xerces 1 or 2 Distribution
   
   * Download a binary distribution from:
   
  @@ -85,6 +85,17 @@
   * Unpack the binary distribution into a convenient location so that the
     distribution resides in its own directory (conventionally named
     "xerces-x_y_z").
  +
  +* In your build.properties file, you will need to set properties differently
  +  based on which version of Xerces you are using:
  +  - For versions 1.3.1 up through and including 2.0.0beta3,
  +    set the "xerces.jar" property to point at the full
  +    pathname of the corresponding file.
  +  - For version 2.0.0beta4 and later, set the "xmlParserAPIs.jar"
  +    and "xercesImpl.jar" properties to point at the corresponding
  +    files
  +  - If you have defined both sets of properties, the newer (two files)
  +    packaging will be loaded into the Tomcat you are building
   
   
   (4) Download and Install Subproject Source Code
  
  
  
  1.28      +9 -2      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.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- build.properties.sample	23 Jan 2002 17:57:14 -0000	1.27
  +++ build.properties.sample	29 Jan 2002 02:42:25 -0000	1.28
  @@ -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.27 2002/01/23 17:57:14 remm Exp $
  +# $Id: build.properties.sample,v 1.28 2002/01/29 02:42:25 craigmcc Exp $
   # -----------------------------------------------------------------------------
   
   
  @@ -149,10 +149,17 @@
   tyrex.jar=${tyrex.lib}/tyrex-0.9.7.0.jar
   
   
  -# ----- Xerces XML Parser, version 1.4.3 or later -----
  +# ----- Xerces XML Parser, version 1.4.3 but less than 2.0.0beta4 -----
   xerces.home=${base.path}/xerces-1_4_3
   xerces.lib=${xerces.home}
   xerces.jar=${xerces.lib}/xerces.jar
  +
  +
  +# ----- Xerces XML Parser, version 2.0.0beta4 or later -----
  +#xerces.home=${base.path}/xerces-2_0_0_beta4
  +#xerces.lib=${xerces.home}
  +#xercesImpl.jar=${xerces.lib}/xercesImpl.jar
  +#xmlParserAPIs.jar=${xerces.lib}/xmlParserAPIs.jar
   
   
   # ----- Commons DBCP, version 20011030 or later -----
  
  
  
  1.100     +44 -9     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.99
  retrieving revision 1.100
  diff -u -r1.99 -r1.100
  --- build.xml	25 Jan 2002 17:30:36 -0000	1.99
  +++ build.xml	29 Jan 2002 02:42:25 -0000	1.100
  @@ -65,6 +65,8 @@
       <pathelement location="${servlet.jar}"/>
       <pathelement location="${tyrex.jar}"/>
       <pathelement location="${xerces.jar}"/>
  +    <pathelement location="${xercesImpl.jar}"/>
  +    <pathelement location="${xmlParserAPIs.jar}"/>
       <pathelement location="${catalina.build}/server/classes"/>
     </path>
   
  @@ -93,6 +95,8 @@
       <pathelement location="${servlet.jar}"/>
       <pathelement location="${tyrex.jar}"/>
       <pathelement location="${xerces.jar}"/>
  +    <pathelement location="${xercesImpl.jar}"/>
  +    <pathelement location="${xmlParserAPIs.jar}"/>
       <pathelement location="${catalina.build}/server/classes"/>
       <pathelement location="${catalina.build}/tests"/>
     </path>
  @@ -149,9 +153,9 @@
       <condition property="jaxp.present">
         <and>
           <available classname="javax.xml.parsers.SAXParser"
  -         classpath="${xerces.jar}" />
  +         classpath="${xerces.jar}:${xmlParserAPIs.jar}" />
           <available classname="org.xml.sax.ContentHandler"
  -         classpath="${xerces.jar}" />
  +         classpath="${xerces.jar}:${xmlParserAPIs.jar}" />
         </and>
       </condition>
       <condition property="javamail.present">
  @@ -206,7 +210,7 @@
        classpath="${tyrex.jar}" />
       <available property="xerces.present"
        classname="org.apache.xerces.parsers.SAXParser"
  -     classpath="${xerces.jar}" />
  +     classpath="${xerces.jar}:${xercesImpl.jar}" />
   
       <!-- JAR files availability flags -->
       <available property="dbcp.jar.present" file="${commons-dbcp.jar}" />
  @@ -234,6 +238,14 @@
       <available property="tomcat-util.jar.present" file="${tomcat-util.jar}" />
       <available property="tyrex.jar.present" file="${tyrex.jar}" />
       <available property="xerces.jar.present" file="${xerces.jar}" />
  +    <available property="xercesImpl.jar.present" file="${xercesImpl.jar}"/>
  +    <available property="xmlParserAPIs.jar.present" file="${xmlParserAPIs.jar}"/>
  +    <condition property="xerces2.jars.present">
  +      <and>
  +        <equals arg1="${xercesImpl.jar.present}" arg2="true"/>
  +        <equals arg1="${xmlParserAPIs.jar.present}" arg2="true"/>
  +      </and>
  +    </condition>
   
       <!-- Conditional compilation flags (determined from the flags above) -->
       <condition property="compile.dbcp">
  @@ -421,12 +433,29 @@
         </or>
       </condition>
       <condition property="copy.xerces.jar">
  -      <or>
  -        <equals arg1="${full.dist}" arg2="on" />
  +      <and>
  +        <equals arg1="${xerces.jar.present}" arg2="true" />
           <not>
  -          <equals arg1="${jdk.1.4.present}" arg2="true" />
  +          <equals arg1="${xerces2.jars.present}" arg2="true" />
           </not>
  -      </or>
  +        <or>
  +          <equals arg1="${full.dist}" arg2="on" />
  +          <not>
  +            <equals arg1="${jdk.1.4.present}" arg2="true" />
  +          </not>
  +        </or>
  +      </and>
  +    </condition>
  +    <condition property="copy.xerces2.jars">
  +      <and>
  +        <equals arg1="${xerces2.jars.present}" arg2="true" />
  +        <or>
  +          <equals arg1="${full.dist}" arg2="on" />
  +          <not>
  +            <equals arg1="${jdk.1.4.present}" arg2="true" />
  +          </not>
  +        </or>
  +      </and>
       </condition>
   
     </target>
  @@ -484,7 +513,8 @@
       <echo message="jndi.jar.present(except JDK 1.3+)=${jndi.jar.present}" />
       <echo message="regexp.jar.present=${regexp.jar.present}" />
       <echo message="servlet.jar.present=${servlet.jar.present}" />
  -    <echo message="xerces.jar.present(except JDK 1.4+)=${xerces.jar.present}" />
  +    <echo message="xerces.jar.present(except JDK 1.4+ or xerces2)=${xerces.jar.present}"
/>
  +    <echo message="xerces2.jars.present(except JDK 1.4+ or xerces1)=${xerces2.jars.present}"
/>
   
       <echo message="--- Optional JARs ---" />
       <echo message="dbcp.jar.present=${dbcp.jar.present}" />
  @@ -526,6 +556,7 @@
       <echo message="copy.pool.jar=${copy.pool.jar}" />
       <echo message="copy.tyrex.jar=${copy.tyrex.jar}" />
       <echo message="copy.xerces.jar=${copy.xerces.jar}" />
  +    <echo message="copy.xerces2.jars=${copy.xerces2.jars}"/>
   
     </target>
   
  @@ -600,10 +631,14 @@
     <target name="copy-xerces.jar" if="copy.xerces.jar">
       <copy todir="${catalina.build}/common/lib" file="${xerces.jar}"/>
     </target>
  +  <target name="copy-xerces2.jars" if="copy.xerces2.jars">
  +    <copy todir="${catalina.build}/common/lib" file="${xercesImpl.jar}"/>
  +    <copy todir="${catalina.build}/common/lib" file="${xmlParserAPIs.jar}"/>
  +  </target>
   
   
     <!-- =================== BUILD: Copy Static Files ======================= -->
  -  <target name="build-static" depends="flags,flags.display,build-prepare,copy-activation.jar,copy-dbcp.jar,copy-jaas.jar,copy-jdbc20ext.jar,copy-jmx.jar,copy-jndi.jar,copy-jsse.jar,copy-jta.jar,copy-ldap.jar,copy-modeler.jar,copy-pool.jar,copy-tyrex.jar,copy-xerces.jar">
  +  <target name="build-static" depends="flags,flags.display,build-prepare,copy-activation.jar,copy-dbcp.jar,copy-jaas.jar,copy-jdbc20ext.jar,copy-jmx.jar,copy-jndi.jar,copy-jsse.jar,copy-jta.jar,copy-ldap.jar,copy-modeler.jar,copy-pool.jar,copy-tyrex.jar,copy-xerces.jar,copy-xerces2.jars">
   
       <!-- Executable Commands -->
       <copy todir="${catalina.build}/bin">
  
  
  
  1.27      +4 -0      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.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- build.xml	4 Oct 2001 05:51:12 -0000	1.26
  +++ build.xml	29 Jan 2002 02:42:25 -0000	1.27
  @@ -23,6 +23,8 @@
       <pathelement location="${servlet.jar}"/>
       <pathelement location="${tools.jar}"/>
       <pathelement location="${xerces.jar}"/>
  +    <pathelement location="${xercesImpl.jar}"/>
  +    <pathelement location="${xmlParserAPIs.jar}"/>
       <pathelement location="${jasper.build}/shared/classes"/>
     </path>
   
  @@ -32,6 +34,8 @@
       <pathelement location="${servlet.jar}"/>
       <pathelement location="${tools.jar}"/>
       <pathelement location="${xerces.jar}"/>
  +    <pathelement location="${xercesImpl.jar}"/>
  +    <pathelement location="${xmlParserAPIs.jar}"/>
       <pathelement location="${jasper.build}/shared/classes"/>
       <pathelement location="${jasper.build}/tests"/>
     </path>
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message