tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From patri...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk build.properties.autoconf build.properties.sample build.xml
Date Thu, 17 Oct 2002 18:18:48 GMT
patrickl    2002/10/17 11:18:48

  Modified:    jk       build.properties.autoconf build.properties.sample
                        build.xml
  Log:
  Add support for Tomcat 5
  
  Revision  Changes    Path
  1.2       +3 -0      jakarta-tomcat-connectors/jk/build.properties.autoconf
  
  Index: build.properties.autoconf
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.properties.autoconf,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.properties.autoconf	24 May 2002 07:10:20 -0000	1.1
  +++ build.properties.autoconf	17 Oct 2002 18:18:48 -0000	1.2
  @@ -3,6 +3,9 @@
   # to be processed by configure
   #
   
  +# Directory where tomcat5 is installed
  +tomcat5.home=@TOMCAT5_HOME@ 
  +
   # Directory where catalina is installed. It can 
   # be either 4.0 or 4.1
   tomcat40.home=@TOMCAT40_HOME@
  
  
  
  1.15      +3 -0      jakarta-tomcat-connectors/jk/build.properties.sample
  
  Index: build.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.properties.sample,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- build.properties.sample	27 May 2002 15:22:41 -0000	1.14
  +++ build.properties.sample	17 Oct 2002 18:18:48 -0000	1.15
  @@ -3,6 +3,9 @@
   # edit to taste...
   #
   
  +# Directory where tomcat5 is installed
  +tomcat5.home= ../../jakarta-tomcat-5/build
  +
   # Directory where catalina is installed. It can 
   # be either 4.0 or 4.1
   tomcat40.home=../../jakarta-tomcat-4.0/build
  
  
  
  1.60      +24 -25    jakarta-tomcat-connectors/jk/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.xml,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- build.xml	15 Oct 2002 21:03:26 -0000	1.59
  +++ build.xml	17 Oct 2002 18:18:48 -0000	1.60
  @@ -1,8 +1,9 @@
   <project name="jk" default="build-main" basedir=".">
     
       <!-- We'll build jk for 3.3 or 4.0 ( depending on what you have installed ).
  -    You need to set tomcat40.home and/or tomcat33.home in build.properties
  -    ( either the path to 'official' distribution or the development dirs )
  +    You need to set tomcat5.home, tomcat40.home, and/or tomcat33.home in
  +    build.properties ( either the path to 'official' distribution or the
  +    development dirs )
       -->
     
       <!-- ===================== Initialize Property Values ================ -->
  @@ -28,6 +29,8 @@
   	      location="../../jakarta-tomcat-4.0/build" />
       <property name="tomcat41.home" 
   	      location="../../jakarta-tomcat-4.1/build" />
  +    <property name="tomcat5.home" 
  +	      location="../../jakarta-tomcat-catalina/build" />
       <property name="coyote.home" 
   	      location="../coyote/build" />
       <property name="commons-logging.jar" location="../lib/commons-logging.jar" />
  @@ -41,11 +44,11 @@
           <echo message="Tomcat33: ${tomcat33.detect} ${tomcat33.home}" />
           <echo message="Tomcat40:  ${tomcat40.detect} ${tomcat40.home}" />
           <echo message="Tomcat41: ${tomcat41.detect} ${tomcat41.home}" />
  +        <echo message="Tomcat5:  ${tomcat5.detect} ${tomcat5.home}" />
           <echo message="Apache13: ${apache13.detect} ${apache13.home}" />
           <echo message="Apache2: ${apache2.detect} ${apache2.home}" />
           <echo message="iPlanet:  ${iplanet.detect} ${iplanet.home}" />
           <echo message="IIS:      ${iis.detect} ${iis.home}" />
  -        <echo message="Using catalina.home:      ${catalina.home}" />
       </target>
   
       <target name="detect" >
  @@ -56,6 +59,14 @@
                      file="${tomcat40.home}/server/lib/catalina.jar" />
           <available property="tomcat41.detect" 
                      file="${tomcat41.home}/server/webapps" />
  +        <condition property="tomcat5.detect">
  +          <and>
  +            <available
  +              classname="javax.servlet.ServletRequestEvent"
  +              classpath="${tomcat5.home}/common/lib/servlet-api.jar"
  +            />
  +          </and>
  +        </condition>
           <available property="apache13.detect" 
                      file="${apache13.home}" />
           <available property="apache2.detect" 
  @@ -78,23 +89,7 @@
           </available>
       </target>
   
  -    <target name="cpath" depends="guess_catalina40,guess_catalina41" />
  -    <!-- If both 4.0 and 4.1 are present ( developer machine ), use 4.1 jars.
  -         If only 4.0 is present or
  -         If only 4.1 is present - use what's available.
  -     -->
  -
  -    <target name="guess_catalina40" unless="tomcat41.detect">
  -        <property name="catalina.home" 
  -                  location="${tomcat40.home}" />
  -    </target>
  -
  -    <target name="guess_catalina41" if="tomcat41.detect">
  -        <property name="catalina.home" 
  -                  location="${tomcat41.home}" />
  -    </target>
  -
  -    <target name="prepare" depends="detect,cpath" >
  +    <target name="prepare" depends="detect" >
           <mkdir dir="${jk.build}"/>
           <mkdir dir="${jk.build}"/>
           <mkdir dir="${jk.build}/conf"/>
  @@ -120,9 +115,12 @@
           <path id="build-main.classpath">
               <fileset dir="../lib" includes="*.jar" />
               <pathelement location="../util/build/classes"/>
  -            <pathelement location="${catalina.home}/server/lib/catalina.jar"/>
  -            <pathelement location="${catalina.home}/common/lib/servlet.jar"/>
  -            <pathelement location="${catalina.home}/common/lib/servlet-api.jar"/>
  +            <pathelement location="${tomcat5.home}/server/lib/catalina.jar"/>
  +            <pathelement location="${tomcat5.home}/common/lib/servlet-api.jar"/>
  +            <pathelement location="${tomcat41.home}/server/lib/catalina.jar"/>
  +            <pathelement location="${tomcat41.home}/common/lib/servlet.jar"/>
  +            <pathelement location="${tomcat40.home}/server/lib/catalina.jar"/>
  +            <pathelement location="${tomcat40.home}/common/lib/servlet.jar"/>
               <pathelement location="${tomcat33.home}/lib/common/tomcat_core.jar"/>
               <pathelement location="${tomcat33.home}/lib/common/core_util.jar"/>
               <pathelement location="${tomcat-util.jar}" />
  @@ -164,6 +162,7 @@
                  debug="${debug}"
                  optimize="${optimize}"
                  verbose="off" >
  +            <exclude name="org/apache/ajp/tomcat5/**" unless="tomcat5.detect"/>
               <exclude name="org/apache/ajp/tomcat4/**" unless="tomcat40.detect"/>
               <exclude name="org/apache/ajp/tomcat33/**" 
                        unless="tomcat33.detect"/>
  @@ -310,9 +309,9 @@
       <target name="javadoc">
           <delete dir="${jk.build}/javadoc"/>
   	<mkdir dir="${jk.build}/javadoc"/>
  -	<javadoc packagenames="org.apache.ajp,org.apache.ajp.tomcat4"
  +	<javadoc packagenames="org.apache.ajp,org.apache.ajp.tomcat4,org.apache.ajp,org.apache.ajp.tomcat5"
                    sourcepath="java"
  -                 classpath="${tomcat-util.jar}:${tomcat40.home}/server/lib/catalina.jar:${tomcat40.home}/common/lib/servlet.jar:${tomcat40.home}/common/lib/servlet-api.jar"
  +                 classpath="${tomcat5.home}/server/lib/catalina.jar:${tomcat5.home}/common/lib/servlet-api.jar:${tomcat41.home}/server/lib/catalina.jar:${tomcat41.home}/common/lib/servlet.jar:${tomcat40.home}/server/lib/catalina.jar:${tomcat40.home}/common/lib/servlet.jar:${tomcat-util.jar}"
                    destdir="${jk.build}/javadoc"
                    author="true"
                    version="true"
  
  
  

--
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