cvs commit: jakarta-tomcat-connectors/jk build.xml

[remm]

remm        02/01/21 13:01:28

  Modified:    jk       build.xml
  Log:
  - ajp.jar did include the tomcat-util classes, which was unneeded.
  - Also separate JK from JK2 in a separate jar.
  - If there's a problem with that patch for whatever reason, let me know.
  
  Revision  Changes    Path
  1.22      +16 -4     jakarta-tomcat-connectors/jk/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.xml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- build.xml 18 Jan 2002 22:02:06 -0000      1.21
  +++ build.xml 21 Jan 2002 21:01:28 -0000      1.22
  @@ -125,8 +125,16 @@
            </fileset>
           </copy>
   
  -     <jar jarfile="${jk.build}/WEB-INF/lib/ajp.jar"
  -          basedir="${jk.build}/WEB-INF/classes" />
  +     <jar jarfile="${jk.build}/WEB-INF/lib/tomcat-ajp.jar"
  +          basedir="${jk.build}/WEB-INF/classes">
  +            <include name="org/apache/ajp/**" />
  +        </jar>
  +     
  +     <jar jarfile="${jk.build}/WEB-INF/lib/tomcat-ajp2.jar"
  +          basedir="${jk.build}/WEB-INF/classes">
  +            <include name="org/apache/jk/**" />
  +            <include name="org/apache/catalina/jk/**" />
  +        </jar>
        
       </target>
       
  @@ -194,7 +202,9 @@
           <copy todir="${tomcat40.home}/server/lib" 
                 file="${jk.build}/WEB-INF/lib/tomcat-util.jar"/>
           <copy todir="${tomcat40.home}/server/lib" 
  -              file="${jk.build}/WEB-INF/lib/ajp.jar"/>
  +              file="${jk.build}/WEB-INF/lib/tomcat-ajp.jar"/>
  +        <copy todir="${tomcat40.home}/server/lib" 
  +              file="${jk.build}/WEB-INF/lib/tomcat-ajp2.jar"/>
       </target>
   
       <target name="install-t41" if="tomcat41.detect" > 
  @@ -202,7 +212,9 @@
           <copy todir="${tomcat41.home}/server/lib" 
                 file="${jk.build}/WEB-INF/lib/tomcat-util.jar"/>
           <copy todir="${tomcat41.home}/server/lib" 
  -              file="${jk.build}/WEB-INF/lib/ajp.jar"/>
  +              file="${jk.build}/WEB-INF/lib/tomcat-ajp.jar"/>
  +        <copy todir="${tomcat41.home}/server/lib" 
  +              file="${jk.build}/WEB-INF/lib/tomcat-ajp2.jar"/>
           <echo message="Don't forget to add the connector to 
${tomcat41.home}/conf/server.xml" />
   
           <!-- 3.3 style -->
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>