Return-Path: 
 <tomcat-dev-return-10732-qmlist-jakarta-archive-tomcat-dev=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org
Received: (qmail 36170 invoked from network); 9 May 2002 00:20:36 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 9 May 2002 00:20:36 -0000
Received: (qmail 17150 invoked by uid 97); 9 May 2002 00:20:35 -0000
Delivered-To: qmlist-jakarta-archive-tomcat-dev@jakarta.apache.org
Received: (qmail 17080 invoked by uid 97); 9 May 2002 00:20:34 -0000
Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:tomcat-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:tomcat-dev-help@jakarta.apache.org>
List-Post: <mailto:tomcat-dev@jakarta.apache.org>
List-Id: "Tomcat Developers List" <tomcat-dev.jakarta.apache.org>
Reply-To: "Tomcat Developers List" <tomcat-dev@jakarta.apache.org>
Delivered-To: mailing list tomcat-dev@jakarta.apache.org
Received: (qmail 17069 invoked by uid 97); 9 May 2002 00:20:34 -0000
X-Antivirus: nagoya (v4198 created Apr 24 2002)
Date: 9 May 2002 00:20:22 -0000
Message-ID: <20020509002022.3451.qmail@icarus.apache.org>
From: costin@apache.org
To: jakarta-tomcat-connectors-cvs@apache.org
Subject: cvs commit: jakarta-tomcat-connectors/jk build.xml
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

costin      02/05/08 17:20:22

  Modified:    jk       build.xml
  Log:
  Added tests for JDK1.4 and JMX.
  
  ( I haven't checked in the jmx part - it's still to early )
  
  Revision  Changes    Path
  1.40      +11 -5     jakarta-tomcat-connectors/jk/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.xml,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- build.xml	3 May 2002 05:25:54 -0000	1.39
  +++ build.xml	9 May 2002 00:20:22 -0000	1.40
  @@ -17,6 +17,8 @@
       <property name="debug" value="on" />
   
       <!-- default locations, overrident by properties -->
  +    <property name="base.path" location="/usr/share/java"/>
  +
       <property name="tomcat33.home" 
                 location="../../jakarta-tomcat/build/tomcat/lib/common/tomcat_core.jar" />
       <property name="tomcat40.home" 
  @@ -26,6 +28,8 @@
       <property name="coyote.home" 
   	      location="../coyote/build" />
       <property name="commons-logging.jar" location="../lib/commons-logging.jar" />
  +    <property name="mx4j.home" location="${base.path}/mx4j-1.0" />
  +    <property name="jmx.jar" location="${mx4j.home}/lib/mx4j.jar" />
   
       <!-- ==================== Detection and reports ==================== -->
   
  @@ -56,6 +60,10 @@
                      file="${iis.home}" />
           <available property="iplanet.detect" 
                      file="${iplanet.home}" />
  +        <available property="jmx.detect" 
  +                   file="${jmx.jar}" />
  +        <available property="jdk14.detect" 
  +                   classname="java.nio.MappedByteBuffer" />
       </target>
   
       <target name="cpath" depends="guess_catalina40,guess_catalina41" />
  @@ -101,6 +109,7 @@
               <pathelement location="${tomcat33.home}/lib/common/core_util.jar"/>
               <pathelement location="${jk.build}/lib/tomcat-util.jar" />
               <pathelement location="${commons-logging.jar}"/>
  +            <pathelement location="${jmx.jar}"/>
               <pathelement 
                    location="${tomcat33.home}/lib/container/tomcat_modules.jar"/>
               <!-- this is needed - otherwise tomcat33 connector will not compile.
  @@ -141,11 +150,8 @@
         <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/catalina/**" unless="tomcat40.detect"/>
  +	    <exclude name="org/apache/jk/common/JkMX.java" unless="jmx.detect"/>
  +	    <exclude name="org/apache/jk/common/Shm14.java" unless="jdk14.detect"/>
   	    <classpath refid="build-main.classpath"/>
   	</javac>
   
  
  
  

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