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/webapps/examples build.xml
Date Wed, 26 Sep 2001 18:49:08 GMT
remm        01/09/26 11:49:08

  Modified:    .        Tag: tomcat_40_branch BUILDING.txt
                        build.properties.sample build.xml
               catalina Tag: tomcat_40_branch build.xml
               webapps/examples Tag: tomcat_40_branch build.xml
  Log:
  - Port the new buid scripts to the 4.0 branch.
  - AJP / tomcat-utils is required for a full.dist.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.5.2.1   +27 -14    jakarta-tomcat-4.0/BUILDING.txt
  
  Index: BUILDING.txt
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/BUILDING.txt,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- BUILDING.txt	2001/09/17 06:18:57	1.5
  +++ BUILDING.txt	2001/09/26 18:49:08	1.5.2.1
  @@ -1,4 +1,4 @@
  -$Id: BUILDING.txt,v 1.5 2001/09/17 06:18:57 ccain Exp $
  +$Id: BUILDING.txt,v 1.5.2.1 2001/09/26 18:49:08 remm Exp $
   
   
                  Building The Tomcat 4.0 Servlet/JSP Container
  @@ -138,17 +138,23 @@
     distribution resides in its own directory.
   
   
  -(6) Download and Install JDBC Optional Package API
  +(6) Steps (7) - (17) 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
  +
   * Download the JDBC Optional Pacakge API package (version 2.0) from:
   
       http://java.sun.com/products/jdbc/download.html
   
  -* Unpack the package into a convenient location so that it resides
  -  in its own subdirectory.
  +* Place the jar in a convenient location.
   
   
  -(7) Download and Install the JMX 1.0 Reference Implementation
  +(8) Download and Install the JMX 1.0 Reference Implementation
   
   * Download the JMX Instrumentation and Agent Reference Implementation
     (version 1.0 or later) from
  @@ -159,7 +165,7 @@
     it resides in its own subdirectory.
   
   
  -(8) Download and Install the JNDI 1.2.1 Reference Implementation
  +(9) 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
  @@ -173,7 +179,7 @@
     same download page.  Be sure that you unpack "ldap.jar" into the "lib"
     subdirectory of the JNDI directory, parallel to "jndi.jar".
   
  -(9) Download and Install the Java Activation Framework 1.0.1
  +(10) Download and Install the Java Activation Framework 1.0.1
   
   * Download the Java Activation Framework package (version 1.0.1 or later) from
   
  @@ -182,7 +188,7 @@
   * Unpack the package into a convenient location so that it
     resised in its own subdirectory.
   
  -(10) Download and Install JavaMail 1.2
  +(11) Download and Install JavaMail 1.2
   
   * Download the JavaMail package (version 1.2 or later) from
   
  @@ -192,7 +198,7 @@
     it resides in its own subdirectory.
   
   
  -(11) Download and Install the JSSE 1.0.2 Reference Implementation
  +(12) 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
  @@ -203,7 +209,7 @@
     it resides in its own subdirectory.
   
   
  -(12) Download and Install the Java Transaction APIs
  +(13) Download and Install the Java Transaction APIs
   
   * Download the Java Transaction API (JTA) package (version 1.0.1) from:
   
  @@ -213,7 +219,7 @@
     own subdirectory.
   
   
  -(13) Download and Install the Tyrex Data Source Package
  +(14) 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.
  @@ -226,7 +232,7 @@
     own subdirectory.
   
   
  -(14) Download and Install the JUnit Testing Package (OPTIONAL)
  +(15) 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.
  @@ -238,8 +244,15 @@
   * Unpack the package into a convenient location so that it resides in its
     own subdirectory.
   
  +
  +(16) Check out the jakarta-tomcat-connectors repository, using the "TOMCAT_4_1"
  +     tag.
  +
  +
  +(17) Compile the "util" module, and the "jk" module.
  +
   
  -(15) Customize Build Properties For This Subproject
  +(18) 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
  @@ -263,7 +276,7 @@
   each developer will have their own version.
   
   
  -(16) Build A Binary Distribution
  +(19) Build A Binary Distribution
   
   Open a command line shell, and issue the following commands:
   
  
  
  
  1.7.2.5   +15 -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.7.2.4
  retrieving revision 1.7.2.5
  diff -u -r1.7.2.4 -r1.7.2.5
  --- build.properties.sample	2001/09/18 04:56:36	1.7.2.4
  +++ build.properties.sample	2001/09/26 18:49:08	1.7.2.5
  @@ -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.4 2001/09/18 04:56:36 jon Exp $
  +# $Id: build.properties.sample,v 1.7.2.5 2001/09/26 18:49:08 remm Exp $
   # -----------------------------------------------------------------------------
   
   
  @@ -16,8 +16,22 @@
   compile.optimize=on
   
   
  +# ----- Build Control Flags
  +#full.dist=on
  +#build.sysclasspath=ignore
  +#flags.hide=on
  +
  +
   # ----- Default Base Path for Dependent Packages -----
   base.path=/usr/local
  +
  +
  +# ----- Tomcat Util -----
  +tomcat-util.jar=../../jakarta-tomcat-connectors/util/build/lib/tomcat-util.jar
  +
  +
  +# ----- JK 1.3 connector for Tomcat 4.0 -----
  +ajp.jar=../../jakarta-tomcat-connectors/jk/build/lib/ajp.jar
   
   
   # ----- Jakarta Regular Expressions Library, version 1.2 -----
  
  
  
  1.38.2.2  +7 -0      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.1
  retrieving revision 1.38.2.2
  diff -u -r1.38.2.1 -r1.38.2.2
  --- build.xml	2001/09/18 03:31:00	1.38.2.1
  +++ build.xml	2001/09/26 18:49:08	1.38.2.2
  @@ -20,6 +20,13 @@
   
   
   
  +  <!-- =================== DETECT: Display configuration ================== -->
  +  <target name="detect"
  +   description="Display configuration flags">
  +    <ant dir="./catalina" target="flags.display"/>
  +  </target>
  +
  +
     <!-- ===================== DEPLOY: Create Directories =================== -->
     <target name="deploy-prepare">
       <mkdir dir="${tomcat.build}"/>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.60.2.4  +358 -32   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.60.2.3
  retrieving revision 1.60.2.4
  diff -u -r1.60.2.3 -r1.60.2.4
  --- build.xml	2001/09/21 15:59:55	1.60.2.3
  +++ build.xml	2001/09/26 18:49:08	1.60.2.4
  @@ -64,11 +64,305 @@
     </path>
   
   
  +  <!-- =================== BUILD: Set compile flags ======================= -->
  +  <target name="flags">
  +
  +    <!-- JDK flags -->
  +    <available property="jdk.1.2.present" classname="java.util.HashMap" />
  +    <available property="jdk.1.3.present" 
  +     classname="java.lang.reflect.Proxy" />
  +    <available property="jdk.1.4.present" classname="java.nio.Buffer" />
  +
  +    <!-- Ant flags -->
  +    <available property="style.available"
  +     classname="org.apache.tools.ant.taskdefs.optional.TraXLiaison" />
  +
  +    <!-- Class availability flags -->
  +    <condition property="javamail.present">
  +      <and>
  +        <available classname="javax.activation.DataSource"
  +         classpath="${activation.jar}" />
  +        <available classname="javax.mail.Service"
  +         classpath="${mail.jar}" />
  +      </and>
  +    </condition>
  +    <available property="jmx.present"
  +     classname="javax.management.MBeanServer"
  +     classpath="${jmxri.jar}" />
  +    <available property="jndi.present"
  +     classname="javax.naming.Context"
  +     classpath="${jndi.jar}" />
  +    <condition property="jsse.present">
  +      <and>
  +        <available classname="javax.security.cert.Certificate"
  +         classpath="${jcert.jar}" />
  +        <available classname="javax.net.SocketFactory"
  +         classpath="${jnet.jar}" />
  +        <available classname="javax.net.ssl.SSLSocket"
  +         classpath="${jsse.jar}" />
  +      </and>
  +    </condition>
  +    <condition property="jta.present">
  +      <and>
  +        <available classname="javax.sql.XADataSource"
  +         classpath="${jdbc20ext.jar}" />
  +        <available classname="javax.transaction.UserTransaction"
  +         classpath="${jta.jar}" />
  +      </and>
  +    </condition>
  +    <available property="junit.present"
  +     classname="junit.framework.TestCase"
  +     classpath="${junit.jar}" />
  +    <available property="ldap.present"
  +     classname="com.sun.jndi.ldap.LdapClient"
  +     classpath="${ldap.jar}" />
  +    <available property="regexp.present"
  +     classname="org.apache.regexp.RE"
  +     classpath="${regexp.jar}" />
  +    <available property="servlet.present"
  +     classname="javax.servlet.Servlet"
  +     classpath="${servlet.jar}" />
  +    <available property="tyrex.present"
  +     classname="tyrex.tm.Tyrex"
  +     classpath="${tyrex.jar}" />
  +
  +    <!-- JAR files availability flags -->
  +    <available property="ajp.jar.present" file="${ajp.jar}" />
  +    <condition property="javamail.jar.present">
  +      <and>
  +        <available file="${activation.jar}" />
  +        <available file="${mail.jar}" />
  +      </and>
  +    </condition>
  +    <available property="jdbc20ext.jar.present" file="${jdbc20ext.jar}" />
  +    <available property="jcert.jar.present" file="${jcert.jar}" />
  +    <available property="jndi.jar.present" file="${jndi.jar}" />
  +    <available property="jnet.jar.present" file="${jnet.jar}" />
  +    <available property="jsse.jar.present" file="${jsse.jar}" />
  +    <available property="jta.jar.present" file="${jta.jar}" />
  +    <available property="junit.jar.present" file="${junit.jar}" />
  +    <available property="ldap.jar.present" file="${ldap.jar}" />
  +    <available property="regexp.jar.present" file="${regexp.jar}" />
  +    <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}" />
  +
  +    <!-- Conditional compilation flags (determined from the flags above) -->
  +    <condition property="compile.javamail">
  +      <or>
  +        <equals arg1="${full.dist}" arg2="on" />
  +        <equals arg1="${javamail.present}" arg2="true" />
  +      </or>
  +    </condition>
  +    <condition property="compile.jmx">
  +      <or>
  +        <equals arg1="${full.dist}" arg2="on" />
  +        <equals arg1="${jmx.present}" arg2="true" />
  +      </or>
  +    </condition>
  +    <condition property="compile.jndi">
  +      <or>
  +        <equals arg1="${full.dist}" arg2="on" />
  +        <equals arg1="${jndi.present}" arg2="true" />
  +        <equals arg1="${jdk.1.3.present}" arg2="true" />
  +      </or>
  +    </condition>
  +    <condition property="compile.jsse">
  +      <or>
  +        <equals arg1="${full.dist}" arg2="on" />
  +        <equals arg1="${jsse.present}" arg2="true" />
  +        <equals arg1="${jdk.1.4.present}" arg2="true" />
  +      </or>
  +    </condition>
  +    <condition property="compile.jta">
  +      <or>
  +        <equals arg1="${full.dist}" arg2="on" />
  +        <equals arg1="${jta.present}" arg2="true" />
  +      </or>
  +    </condition>
  +    <condition property="compile.junit">
  +      <or>
  +        <equals arg1="${full.dist}" arg2="on" />
  +        <equals arg1="${junit.present}" arg2="true" />
  +      </or>
  +    </condition>
  +    <condition property="compile.ldap">
  +      <or>
  +        <equals arg1="${full.dist}" arg2="on" />
  +        <equals arg1="${ldap.present}" arg2="true" />
  +        <equals arg1="${jdk.1.3.present}" arg2="true" />
  +      </or>
  +    </condition>
  +    <condition property="compile.tyrex">
  +      <or>
  +        <equals arg1="${full.dist}" arg2="on" />
  +        <equals arg1="${tyrex.present}" arg2="true" />
  +      </or>
  +    </condition>
  +
  +
  +    <!-- Conditional copy flags (determined from the flags above) -->
  +    <condition property="copy.ajp.jar">
  +      <or>
  +        <equals arg1="${full.dist}" arg2="on" />
  +        <equals arg1="${ajp.jar.present}" arg2="true" />
  +      </or>
  +    </condition>
  +    <condition property="copy.jdbc20ext.jar">
  +      <or>
  +        <equals arg1="${full.dist}" arg2="on" />
  +        <and>
  +          <equals arg1="${jdbc20ext.jar.present}" arg2="true" />
  +          <not>
  +            <equals arg1="${jdk.1.4.present}" arg2="true" />
  +          </not>
  +        </and>
  +      </or>
  +    </condition>
  +    <condition property="copy.jndi.jar">
  +      <or>
  +        <equals arg1="${full.dist}" arg2="on" />
  +        <and>
  +          <equals arg1="${jndi.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>
  +    <condition property="copy.javamail.jar">
  +      <or>
  +        <equals arg1="${full.dist}" arg2="on" />
  +        <equals arg1="${javamail.jar.present}" arg2="true" />
  +      </or>
  +    </condition>
  +    <condition property="copy.jta.jar">
  +      <or>
  +        <equals arg1="${full.dist}" arg2="on" />
  +        <equals arg1="${jta.jar.present}" arg2="true" />
  +      </or>
  +    </condition>
  +    <condition property="copy.ldap.jar">
  +      <or>
  +        <equals arg1="${full.dist}" arg2="on" />
  +        <and>
  +          <equals arg1="${ldap.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>
  +    <condition property="copy.jsse.jar">
  +      <or>
  +        <equals arg1="${full.dist}" arg2="on" />
  +        <and>
  +          <equals arg1="${jcert.jar.present}" arg2="true" />
  +          <equals arg1="${jnet.jar.present}" arg2="true" />
  +          <equals arg1="${jsse.jar.present}" arg2="true" />
  +          <not>
  +            <equals arg1="${jdk.1.4.present}" arg2="true" />
  +          </not>
  +        </and>
  +      </or>
  +    </condition>
  +    <condition property="copy.tomcat-util.jar">
  +      <or>
  +        <equals arg1="${full.dist}" arg2="on" />
  +        <equals arg1="${tomcat-util.jar.present}" arg2="true" />
  +      </or>
  +    </condition>
  +    <condition property="copy.tyrex.jar">
  +      <or>
  +        <equals arg1="${full.dist}" arg2="on" />
  +        <equals arg1="${tyrex.jar.present}" arg2="true" />
  +      </or>
  +    </condition>
  +
  +  </target>
  +
  +
  +  <!-- =================== BUILD: Set compile flags ======================= -->
  +  <target name="flags.display" depends="flags" unless="flags.hide">
  +
  +    <echo message="--- Build environment for Catalina ---" />
  +
  +    <echo message="If ${property_name} is displayed, then the property is not set)"
/>
  +
  +    <echo message="--- Build options ---" />
  +    <echo message="full.dist=${full.dist}" />
  +    <echo message="build.sysclasspath=${build.sysclasspath}" />
  +    <echo message="compile.debug=${compile.debug}" />
  +    <echo message="compile.deprecation=${compile.deprecation}" />
  +    <echo message="compile.optimize=${compile.optimize}" />
  +
  +    <echo message="--- Ant Flags ---" />
  +    <echo message="&lt;style&gt; task available (required)=${style.available}"
/>
  +
  +    <echo message="--- JDK ---" />
  +    <echo message="jdk.1.2.present=${jdk.1.2.present}" />
  +    <echo message="jdk.1.3.present=${jdk.1.3.present}" />
  +    <echo message="jdk.1.4.present=${jdk.1.4.present}" />
  +
  +    <echo message="--- Required Libraries ---" />
  +    <echo message="jndi.present=${jndi.present}" />
  +    <echo message="regexp.present=${regexp.present}" />
  +    <echo message="servlet.present=${servlet.present}" />
  +
  +    <echo message="--- Optional Libraries ---" />
  +    <echo message="javamail.present=${javamail.present}" />
  +    <echo message="jsse.present=${jsse.present}" />
  +    <echo message="jta.present=${jta.present}" />
  +    <echo message="junit.present=${junit.present}" />
  +    <echo message="ldap.present=${ldap.present}" />
  +    <echo message="tyrex.present=${tyrex.present}" />
  +
  +    <echo message="--- Required JARs ---" />
  +    <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="tomcat-util.jar.present=${tomcat-util.jar.present}" />
  +
  +    <echo message="--- Optional JARs ---" />
  +    <echo message="ajp.jar.present=${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="--- Conditional compilation flags ---" />
  +    <echo message="compile.javamail=${compile.javamail}" />
  +    <echo message="compile.jmx=${compile.jmx}" />
  +    <echo message="compile.jndi=${compile.jndi}" />
  +    <echo message="compile.jsse=${compile.jsse}" />
  +    <echo message="compile.jta=${compile.jta}" />
  +    <echo message="compile.junit=${compile.junit}" />
  +    <echo message="compile.ldap=${compile.ldap}" />
  +    <echo message="compile.tyrex=${compile.tyrex}" />
  +
  +    <echo message="--- Distribution flags ---" />
  +    <echo message="copy.ajp.jar=${copy.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}" />
  +
  +  </target>
  +
     <!-- =================== BUILD: Create Directories ====================== -->
     <target name="build-prepare">
   
  -    <available classname="junit.framework.TestCase" property="junit.present" />
  -
       <mkdir dir="${catalina.build}"/>
       <mkdir dir="${catalina.build}/bin"/>
       <mkdir dir="${catalina.build}/classes"/>
  @@ -84,8 +378,46 @@
     </target>
   
   
  +  <!-- ======================== BUILD: Copy JARs ========================== -->
  +  <target name="copy-ajp.jar" if="copy.ajp.jar">
  +    <copy todir="${catalina.build}/server/lib" file="${ajp.jar}"/>
  +  </target>
  +  <target name="copy-activation.jar" if="copy.javamail.jar">
  +    <copy todir="${catalina.build}/common/lib" file="${activation.jar}"/>
  +    <copy todir="${catalina.build}/common/lib" file="${mail.jar}"/>
  +  </target>
  +  <target name="copy-jdbc20ext.jar" if="copy.jdbc20ext.jar">
  +    <copy todir="${catalina.build}/common/lib" file="${jdbc20ext.jar}"/>
  +  </target>
  +  <target name="copy-jndi.jar" if="copy.jndi.jar">
  +    <copy todir="${catalina.build}/common/lib" file="${jndi.jar}"/>
  +  </target>
  +  <target name="copy-jta.jar" if="copy.jta.jar">
  +    <copy todir="${catalina.build}/common/lib" file="${jta.jar}"/>
  +  </target>
  +  <target name="copy-ldap.jar" if="copy.ldap.jar">
  +    <!-- Cannot redistribute LDAP
  +    <copy todir="${catalina.build}/common/lib" file="${ldap.jar}"/>
  +    -->
  +  </target>
  +  <target name="copy-jsse.jar" if="copy.jsse.jar">
  +    <!-- Cannot redistribute JSSE
  +    <copy todir="${catalina.build}/common/lib" file="${jcert.jar}"/>
  +    <copy todir="${catalina.build}/common/lib" file="${jnet.jar}"/>
  +    <copy todir="${catalina.build}/common/lib" file="${jsse.jar}"/>
  +    -->
  +  </target>
  +  <target name="copy-tomcat-util.jar" if="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>
  +
  +
     <!-- =================== BUILD: Copy Static Files ======================= -->
  -  <target name="build-static" depends="build-prepare">
  +  <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">
   
       <!-- Executable Commands -->
       <copy todir="${catalina.build}/bin">
  @@ -99,24 +431,9 @@
       <chmod perm="+x" file="${catalina.build}/bin/shutdown.sh"/>
   
       <!-- Common Extensions -->
  -    <copy todir="${catalina.build}/common/lib" file="${activation.jar}"/>
       <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="${jdbc20ext.jar}"/>
  -    <copy todir="${catalina.build}/common/lib" file="${jndi.jar}"/>
  -<!-- Cannot redistribute JSSE
  -    <copy todir="${catalina.build}/common/lib" file="${jnet.jar}"/>
  -    <copy todir="${catalina.build}/common/lib" file="${jsse.jar}"/>
  -    <copy todir="${catalina.build}/common/lib" file="${jcert.jar}"/>
  --->
  -    <copy todir="${catalina.build}/common/lib" file="${jta.jar}"/>
  -<!-- Connot redistribute LDAP
  -    <copy todir="${catalina.build}/common/lib" file="${ldap.jar}"/>
  --->
  -    <copy todir="${catalina.build}/common/lib" file="${mail.jar}"/>
       <copy todir="${catalina.build}/common/lib" file="${servlet.jar}"/>
  -    <copy todir="${catalina.build}/common/lib" file="${tyrex.jar}"/>
  -    <copy todir="${catalina.build}/common/lib" file="../lib/tyrex.license"/>
   
       <!-- Configuration Files -->
       <copy todir="${catalina.build}/conf">
  @@ -137,9 +454,6 @@
     <!-- ================= BUILD: Compile Server Components ================= -->
     <target name="build-main" depends="build-static">
   
  -    <available property="jdk.1.3.present"
  -     classname="java.lang.reflect.Proxy" />
  -
       <!-- Compile Service API -->
       <javac srcdir="../service/java" destdir="${catalina.build}/classes"
              debug="${compile.debug}" deprecation="${compile.deprecation}"
  @@ -152,8 +466,28 @@
              optimize="${compile.optimize}"
              excludes="**/CVS/**">
         <classpath refid="catalina.classpath" />
  -      <exclude name="**/util/ProcessHelper.java" unless="jdk.1.3.present"/>
  -      <exclude name="**/servlets/CGIServlet.java" unless="jdk.1.3.present"/>
  +      <exclude name="org/apache/catalina/util/ProcessHelper.java" 
  +       unless="jdk.1.3.present"/>
  +      <exclude name="org/apache/catalina/servlets/CGIServlet.java" 
  +       unless="jdk.1.3.present"/>
  +      <exclude name="org/apache/naming/factory/TyrexDataSourceFactory.java" 
  +       unless="compile.tyrex"/>
  +      <exclude name="org/apache/naming/factory/TyrexTransactionFactory.java" 
  +       unless="compile.tyrex"/>
  +      <exclude name="org/apache/catalina/net/SSLServerSocketFactory.java" 
  +       unless="compile.jsse"/>
  +      <exclude name="org/apache/catalina/valves/CertificatesValve.java"
  +       unless="compile.jsse"/>
  +      <exclude name="org/apache/naming/factory/MailSessionFactory.java"
  +       unless="compile.javamail"/>
  +      <exclude name="org/apache/naming/factory/SendMailFactory.java"
  +       unless="compile.javamail"/>
  +      <exclude name="org/apache/catalina/startup/EmbeddedManager.java"
  +       unless="compile.jmx"/>
  +      <exclude name="org/apache/catalina/startup/CatalinaManager.java"
  +       unless="compile.jmx"/>
  +      <exclude name="org/apache/naming/NamingService.java"
  +       unless="compile.jmx"/>
       </javac>
   
       <!-- Copy static resource files -->
  @@ -167,7 +501,7 @@
   
   
     <!-- ================ BUILD: Create Catalina Javadocs =================== -->
  -  <target name="javadoc" depends="build-main">
  +  <target name="javadoc">
       <delete dir="${catalina.build}/javadoc"/>
       <mkdir dir="${catalina.build}/javadoc"/>
       <javadoc packagenames="org.apache.catalina.*,org.apache.naming.*"
  @@ -457,14 +791,6 @@
       <copy todir="${catalina.dist}/common/lib">
         <fileset dir="${catalina.build}/common/lib" />
       </copy>
  -
  -    <!-- Cannot redistribute JSSE -->
  -    <echo>
  -        Cannot redistribute JSSE. Deleting jars from distribution.
  -    </echo>
  -    <delete file="${catalina.deploy}/common/lib/jcert.jar"/>
  -    <delete file="${catalina.deploy}/common/lib/jnet.jar"/>
  -    <delete file="${catalina.deploy}/common/lib/jsse.jar"/>
   
       <!-- Configuration Files -->
       <mkdir dir="${catalina.dist}/conf"/>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.14.2.1  +40 -2     jakarta-tomcat-4.0/webapps/examples/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/examples/build.xml,v
  retrieving revision 1.14
  retrieving revision 1.14.2.1
  diff -u -r1.14 -r1.14.2.1
  --- build.xml	2001/09/16 04:58:28	1.14
  +++ build.xml	2001/09/26 18:49:08	1.14.2.1
  @@ -15,7 +15,43 @@
     <property name="webapps.dist"    value="../dist"/>
     <property name="webapp.name"     value="examples"/>
   
  +  <!-- Construct Catalina classpath -->
  +  <path id="examples.classpath">
  +    <pathelement location="${activation.jar}"/>
  +    <pathelement location="${jndi.jar}"/>
  +    <pathelement location="${mail.jar}"/>
  +    <pathelement location="${servlet.jar}"/>
  +  </path>
  +
  +  <!-- =================== BUILD: Set compile flags ======================= -->
  +  <target name="flags">
  +
  +    <!-- JDK flags -->
  +    <available property="jdk.1.2.present" classname="java.util.HashMap" />
  +    <available property="jdk.1.3.present" 
  +     classname="java.lang.reflect.Proxy" />
  +    <available property="jdk.1.4.present" classname="java.nio.Buffer" />
  +
  +    <!-- Class availability flags -->
  +    <condition property="javamail.present">
  +      <and>
  +        <available classname="javax.activation.DataSource"
  +         classpath="${activation.jar}" />
  +        <available classname="javax.mail.Service"
  +         classpath="${mail.jar}" />
  +      </and>
  +    </condition>
  +
  +    <!-- Conditional compilation flags (determined from the flags above) -->
  +    <condition property="compile.javamail">
  +      <or>
  +        <equals arg1="${full.dist}" arg2="on" />
  +        <equals arg1="${javamail.present}" arg2="true" />
  +      </or>
  +    </condition>
   
  +  </target>
  +
     <!-- =================== BUILD: Create Directories ====================== -->
     <target name="build-prepare">
       <mkdir dir="${webapps.build}"/>
  @@ -38,10 +74,12 @@
   
       <javac   srcdir="WEB-INF/classes" 
                destdir="${webapps.build}/${webapp.name}/WEB-INF/classes"
  -             classpath="${servlet.jar}:${jndi.jar}:${activation.jar}:${mail.jar}"
                debug="${compile.debug}" deprecation="${compile.deprecation}"
                optimize="${compile.optimize}"
  -             excludes="**/CVS/**"/>
  +             excludes="**/CVS/**">
  +      <classpath refid="examples.classpath" />
  +      <exclude name="SendMailServlet.java" unless="compile.javamail" />
  +    </javac>
   
       <javac   srcdir="jsp/plugin/applet" 
                destdir="${webapps.build}/${webapp.name}/jsp/plugin/applet"
  
  
  

Mime
View raw message