gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From billbar...@apache.org
Subject cvs commit: gump/project jakarta-tomcat-connectors.xml
Date Tue, 12 Oct 2004 08:07:38 GMT
billbarker    2004/10/12 01:07:38

  Modified:    project  jakarta-tomcat-connectors.xml
  Log:
  Fix the jakarta-tomcat-jk target.
  
  Also commenting out the native targets until <configure> and <make> tags are
available.
  
  Revision  Changes    Path
  1.29      +9 -8      gump/project/jakarta-tomcat-connectors.xml
  
  Index: jakarta-tomcat-connectors.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/jakarta-tomcat-connectors.xml,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- jakarta-tomcat-connectors.xml	10 Oct 2004 06:01:05 -0000	1.28
  +++ jakarta-tomcat-connectors.xml	12 Oct 2004 08:07:38 -0000	1.29
  @@ -109,16 +109,17 @@
     <project name="jakarta-tomcat-jk">
       <package>org.apache.jk</package>
   
  -    <ant basedir="jk">
  +    <ant basedir="jk" target="jkjava-tc5">
         <property name="jmx.home" reference="home" project="jmx"/>
         <property name="jmx.jar" project="jmx" path="jmx/lib/jmxri.jar" />
         <property name="jsse.home" reference="home" project="jsse"/>
  -      <property name="tomcat40.home" reference="home" project="tomcat-catalina" />
  -      <property name="tomcat5.home" reference="home" project="jakarta-tomcat-catalina"
/>
         <depend property="commons-modeler.jar" project="commons-modeler"/>
  +      <depend property="tc5-catalina.jar" project="jakarta-tomcat-catalina" id="catalina"
/>
  +      <depend property="servlet-api.jar" project="jakarta-servletapi-5-servlet"/>
  +      <depend property="tomcat-coyote.jar" project="jakarta-tomcat-coyote"/>
       </ant>
   
  -    <depend project="ant"/>
  +    <depend project="ant" inherit="runtime"/>
       <depend project="commons-logging"/>
       <depend project="jmx"/>
       <depend project="jakarta-tomcat-util"/>
  @@ -126,12 +127,11 @@
       <depend project="jakarta-tomcat-coyote"/>
   
       <home nested="jk/build"/>
  -    <jar name="lib/jkant.jar"/>
       <jar name="lib/jkconfig.jar"/>
       <jar name="lib/tomcat-jk2.jar"/>
       <jar name="lib/tomcat-jni.jar"/>
       <nag to="tomcat-dev@jakarta.apache.org"
  -         from="Bill Barker &lt;billbarker@jakarta.apache.org&gt;"/>
  +         from="Bill Barker &lt;billbarker@apache.org&gt;"/>
     </project>
   
     <project name="jakarta-tomcat-jk-ant">
  @@ -143,9 +143,10 @@
   
       <jar name="jk/build/lib/jkant.jar"/>
       <nag to="tomcat-dev@jakarta.apache.org"
  -         from="Bill Barker &lt;billbarker@jakarta.apache.org&gt;"/>
  +         from="Bill Barker &lt;billbarker@apache.org&gt;"/>
     </project>
     
  +<!--
     <project name="jakarta-tomcat-jk-native2">
       <ant basedir="jk/native2" target="main" >
       </ant>
  @@ -177,5 +178,5 @@
         <regexp pattern="/timed out/" subject="Build timed out - jk"/>
       </nag>
     </project>
  -  
  +-->  
   </module>
  
  
  

Mime
View raw message