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/catalina build.xml
Date Tue, 02 Oct 2001 04:44:54 GMT
remm        01/10/01 21:44:54

  Modified:    catalina build.xml
  Log:
  - Change the flags to support using Xerces instead of JAXP.
  
  Revision  Changes    Path
  1.70      +34 -15    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.69
  retrieving revision 1.70
  diff -u -r1.69 -r1.70
  --- build.xml	2001/09/28 05:41:29	1.69
  +++ build.xml	2001/10/02 04:44:54	1.70
  @@ -121,9 +121,12 @@
       <available property="tyrex.present"
        classname="tyrex.tm.Tyrex"
        classpath="${tyrex.jar}" />
  +    <available property="xerces.present"
  +     classname="org.apache.xerces.parsers.SAXParser"
  +     classpath="${xerces.jar}" />
   
       <!-- JAR files availability flags -->
  -    <available property="ajp.jar.present" file="${ajp.jar}" />
  +    <available property="tomcat-ajp.jar.present" file="${tomcat-ajp.jar}" />
       <condition property="javamail.jar.present">
         <and>
           <available file="${activation.jar}" />
  @@ -142,6 +145,7 @@
       <available property="servlet.jar.present" file="${servlet.jar}" />
       <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}" />
   
       <!-- Conditional compilation flags (determined from the flags above) -->
       <condition property="compile.javamail">
  @@ -198,10 +202,10 @@
   
   
       <!-- Conditional copy flags (determined from the flags above) -->
  -    <condition property="copy.ajp.jar">
  +    <condition property="copy.tomcat-ajp.jar">
         <or>
           <equals arg1="${full.dist}" arg2="on" />
  -        <equals arg1="${ajp.jar.present}" arg2="true" />
  +        <equals arg1="${tomcat-ajp.jar.present}" arg2="true" />
         </or>
       </condition>
       <condition property="copy.jdbc20ext.jar">
  @@ -268,16 +272,24 @@
           </and>
         </or>
       </condition>
  -    <condition property="copy.tomcat-util.jar">
  +    <condition property="copy.tyrex.jar">
         <or>
           <equals arg1="${full.dist}" arg2="on" />
  -        <equals arg1="${tomcat-util.jar.present}" arg2="true" />
  +        <equals arg1="${tyrex.jar.present}" arg2="true" />
         </or>
       </condition>
  -    <condition property="copy.tyrex.jar">
  +    <condition property="copy.xerces.jar">
         <or>
           <equals arg1="${full.dist}" arg2="on" />
  -        <equals arg1="${tyrex.jar.present}" arg2="true" />
  +        <and>
  +          <equals arg1="${xerces.jar.present}" arg2="true" />
  +          <not>
  +            <or>
  +              <equals arg1="${jdk.1.3.present}" arg2="true" />
  +              <equals arg1="${jdk.1.4.present}" arg2="true" />
  +            </or>
  +          </not>
  +        </and>
         </or>
       </condition>
   
  @@ -301,6 +313,9 @@
       <echo message="--- Ant Flags ---" />
       <echo message="&lt;style&gt; task available (required)=${style.available}"
/>
   
  +    <echo message="--- Source Repositories ---" />
  +    <echo message="jakarta-tomcat-connectors.home.present=${jakarta-tomcat-connectors.home.present}"
/>
  +
       <echo message="--- JDK ---" />
       <echo message="jdk.1.2.present=${jdk.1.2.present}" />
       <echo message="jdk.1.3.present=${jdk.1.3.present}" />
  @@ -318,6 +333,7 @@
       <echo message="junit.present=${junit.present}" />
       <echo message="ldap.present=${ldap.present}" />
       <echo message="tyrex.present=${tyrex.present}" />
  +    <echo message="xerces.present=${xerces.present}" />
   
       <echo message="--- Required JARs ---" />
       <echo message="jndi.jar.present(except JDK 1.3+)=${jndi.jar.present}" />
  @@ -326,13 +342,14 @@
       <echo message="tomcat-util.jar.present=${tomcat-util.jar.present}" />
   
       <echo message="--- Optional JARs ---" />
  -    <echo message="ajp.jar.present=${ajp.jar.present}" />
  +    <echo message="tomcat-ajp.jar.present=${tomcat-ajp.jar.present}" />
       <echo message="javamail.jar.present=${javamail.jar.present}" />
       <echo message="jdbc20ext.jar.present=${jdbc20ext.jar.present}" />
       <echo message="jta.jar.present=${jta.jar.present}" />
       <echo message="junit.jar.present=${junit.jar.present}" />
       <echo message="ldap.jar.present=${ldap.jar.present}" />
       <echo message="tyrex.jar.present=${tyrex.jar.present}" />
  +    <echo message="xerces.jar.present=${xerces.jar.present}" />
   
       <echo message="--- Conditional compilation flags ---" />
       <echo message="compile.javamail=${compile.javamail}" />
  @@ -345,14 +362,14 @@
       <echo message="compile.tyrex=${compile.tyrex}" />
   
       <echo message="--- Distribution flags ---" />
  -    <echo message="copy.ajp.jar=${copy.ajp.jar}" />
  +    <echo message="copy.tomcat-ajp.jar=${copy.tomcat-ajp.jar}" />
       <echo message="copy.jdbc20ext.jar=${copy.jdbc20ext.jar}" />
       <echo message="copy.jndi.jar=${copy.jndi.jar}" />
       <echo message="copy.javamail.jar=${copy.javamail.jar}" />
       <echo message="copy.jta.jar=${copy.jta.jar}" />
       <echo message="copy.ldap.jar=${copy.ldap.jar}" />
  -    <echo message="copy.tomcat-util.jar=${copy.tomcat-util.jar}" />
       <echo message="copy.tyrex.jar=${copy.tyrex.jar}" />
  +    <echo message="copy.xerces.jar=${copy.xerces.jar}" />
   
     </target>
   
  @@ -375,8 +392,8 @@
   
   
     <!-- ======================== BUILD: Copy JARs ========================== -->
  -  <target name="copy-ajp.jar" if="copy.ajp.jar">
  -    <copy todir="${catalina.build}/server/lib" file="${ajp.jar}"/>
  +  <target name="copy-tomcat-ajp.jar" if="copy.tomcat-ajp.jar">
  +    <copy todir="${catalina.build}/server/lib" file="${tomcat-ajp.jar}"/>
     </target>
     <target name="copy-activation.jar" if="copy.javamail.jar">
       <copy todir="${catalina.build}/common/lib" file="${activation.jar}"/>
  @@ -403,17 +420,20 @@
       <copy todir="${catalina.build}/common/lib" file="${jsse.jar}"/>
       -->
     </target>
  -  <target name="copy-tomcat-util.jar" if="copy.tomcat-util.jar">
  +  <target name="copy-tomcat-util.jar">
       <copy todir="${catalina.build}/server/lib" file="${tomcat-util.jar}"/>
     </target>
     <target name="copy-tyrex.jar" if="copy.tyrex.jar">
       <copy todir="${catalina.build}/common/lib" file="${tyrex.jar}"/>
       <copy todir="${catalina.build}/common/lib" file="../lib/tyrex.license"/>
     </target>
  +  <target name="copy-xerces.jar" if="copy.xerces.jar">
  +    <copy todir="${catalina.build}/common/lib" file="${xerces.jar}"/>
  +  </target>
   
   
     <!-- =================== BUILD: Copy Static Files ======================= -->
  -  <target name="build-static" depends="flags,flags.display,build-prepare,copy-activation.jar,copy-ajp.jar,copy-jdbc20ext.jar,copy-jndi.jar,copy-jsse.jar,copy-jta.jar,copy-ldap.jar,copy-tomcat-util.jar,copy-tyrex.jar">
  +  <target name="build-static" depends="flags,flags.display,build-prepare,copy-activation.jar,copy-tomcat-ajp.jar,copy-jdbc20ext.jar,copy-jndi.jar,copy-jsse.jar,copy-jta.jar,copy-ldap.jar,copy-tomcat-util.jar,copy-tyrex.jar,copy-xerces.jar">
   
       <!-- Executable Commands -->
       <copy todir="${catalina.build}/bin">
  @@ -428,7 +448,6 @@
   
       <!-- Common Extensions -->
       <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">
  
  
  

Mime
View raw message