costin      02/01/26 09:19:49

  Modified:    jk       build.xml
  Log:
  Add back tomcat-utils.jar in classpath, this should fix gump's problem.
  
  The problem was that gump detected 3.3, but 3.3 wrappers can't be built
  without tomcat-util.jar.
  
  - if tomcat3.3 is present, then the file will exist, and it is required to
  build the 3.3 stuff
  
  - if 3.3 is not detected, the file will not be found - and jk will be built
  without it ( using only utils, and thus checking that we don't have stuff
  like the recent o.a.t.u.net )
  
  Revision  Changes    Path
  1.27      +13 -6     jakarta-tomcat-connectors/jk/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.xml,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- build.xml 26 Jan 2002 16:02:32 -0000      1.26
  +++ build.xml 26 Jan 2002 17:19:48 -0000      1.27
  @@ -89,9 +89,13 @@
               <pathelement location="${tomcat33.home}/lib/common/tomcat_core.jar"/>
               <pathelement location="${tomcat33.home}/lib/common/core_util.jar"/>
               <pathelement 
  -                         
location="${tomcat33.home}/lib/container/tomcat_modules.jar"/>
  -            <!-- pathelement 
  -                         location="${tomcat33.home}/lib/container/tomcat_util.jar"/ 
-->
  +                 location="${tomcat33.home}/lib/container/tomcat_modules.jar"/>
  +            <!-- this is needed - otherwise tomcat33 connector will not compile.
  +                 Just change tomcat33.home in build.properties to point
  +                 to nowhere, and tomcat_util will no longer be visible, nor
  +                 3.3 classes. -->
  +            <pathelement 
  +                 location="${tomcat33.home}/lib/container/tomcat_util.jar"/>
           </path>
   
       </target>
  @@ -110,9 +114,12 @@
               optimize="${optimize}"
               verbose="off" >
            <exclude name="org/apache/ajp/tomcat4/**" unless="tomcat40.detect"/>
  -            <exclude name="org/apache/ajp/tomcat33/**" unless="tomcat33.detect"/>
  -            <exclude name="org/apache/jk/server/tomcat33/**" 
unless="tomcat33.detect"/>
  -            <exclude name="org/apache/jk/server/tomcat40/**" 
unless="tomcat40.detect"/>
  +            <exclude name="org/apache/ajp/tomcat33/**" 
  +                     unless="tomcat33.detect"/>
  +            <exclude name="org/apache/jk/server/tomcat33/**" 
  +                     unless="tomcat33.detect"/>
  +            <exclude name="org/apache/jk/server/tomcat40/**" 
  +                     unless="tomcat40.detect"/>
            <exclude name="org/apache/catalina/**" unless="tomcat40.detect"/>
            <classpath refid="build-main.classpath"/>
        </javac>
  
  
  

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

Reply via email to