tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From billbar...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk build.xml
Date Sat, 18 Jun 2005 04:14:39 GMT
billbarker    2005/06/17 21:14:39

  Modified:    jk       build.xml
  Log:
  Update to include the APR classes.
  
  This is mostly to get Remy's stuff in the Gump build.  It likely to be a very long time
before jakarta-tomcat-5's dependencies build, and hopefully by then I'll have modified the
gumpy-build target to use the Gump jars instead of re-building.
  
  Doesn't effect the TC 5.5 build at all, the TC 3.3 patch is to follow, and AFAIK, those
are the only versions using HEAD.
  
  Revision  Changes    Path
  1.82      +4 -0      jakarta-tomcat-connectors/jk/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.xml,v
  retrieving revision 1.81
  retrieving revision 1.82
  diff -u -r1.81 -r1.82
  --- build.xml	16 Jun 2005 17:03:12 -0000	1.81
  +++ build.xml	18 Jun 2005 04:14:39 -0000	1.82
  @@ -28,6 +28,7 @@
       <property name="tomcat-jkshm.jar" value="${jk.build}/lib/jkshm.jar" />
       <property name="tomcat-jk2.jar" value="${jk.build}/lib/tomcat-jk2.jar" />
       <property name="tomcat-jni.jar" value="${jk.build}/lib/tomcat-jni.jar" />
  +    <property name="tomcat-apr.jar" value="../jni/dist/tomcat-native-1.0.0.jar" />
   
       <!-- default locations, overrident by properties -->
       <property name="base.path" location="/usr/share/java"/>
  @@ -202,12 +203,14 @@
                  optimize="${optimize}"
                  verbose="off" >
               <include name="org/apache/jk/**"/>
  +            <include name="org/apache/coyote/ajp/**" />
   	    <exclude name="org/apache/jk/common/JkMX.java" unless="jmx.detect"/>
   	    <exclude name="org/apache/jk/common/ModJkMX.java" unless="jmx.detect"/>
   	    <exclude name="org/apache/jk/common/Shm14.java" unless="jdk14.detect"/>
               <exclude name="org/apache/jk/config/*Config.java"  />
               <exclude name="org/apache/jk/ant/**" />
   	    <classpath>
  +	       <pathelement location="${tomcat-apr.jar}" />
   	       <path refid="xml-apis.classpath"/>
   	       <path refid="build-main.classpath"/>
   	    </classpath>
  @@ -223,6 +226,7 @@
                manifest="conf/tomcat-jk2.manifest"
   	     basedir="${jk.build}/classes" >
               <include name="org/apache/jk/**" />
  +            <include name="org/apache/coyote/ajp/**" />
               <exclude name="org/apache/jk/ant/**" />
           </jar>
   	
  
  
  

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


Mime
View raw message