Return-Path: 
 <dev-return-78400-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org>
Delivered-To: apmail-tomcat-dev-archive@www.apache.org
Received: (qmail 19750 invoked from network); 7 Feb 2007 00:28:27 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 7 Feb 2007 00:28:27 -0000
Received: (qmail 1154 invoked by uid 500); 7 Feb 2007 00:28:32 -0000
Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org
Received: (qmail 334 invoked by uid 500); 7 Feb 2007 00:28:29 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@tomcat.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@tomcat.apache.org>
List-Post: <mailto:dev@tomcat.apache.org>
List-Id: <dev.tomcat.apache.org>
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 323 invoked by uid 500); 7 Feb 2007 00:28:29 -0000
Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org
Received: (qmail 320 invoked by uid 99); 7 Feb 2007 00:28:29 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Feb 2007 16:28:29 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Feb 2007 16:28:21 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id 88B961A981A; Tue,  6 Feb 2007 16:28:01 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r504386 - in /tomcat/connectors/trunk: http11/build.xml
 jk/build.xml util/build.xml
Date: Wed, 07 Feb 2007 00:28:01 -0000
To: tomcat-dev@jakarta.apache.org
From: markt@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070207002801.88B961A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: markt
Date: Tue Feb  6 16:28:00 2007
New Revision: 504386

URL: http://svn.apache.org/viewvc?view=rev&rev=504386
Log:
Switch to a straight JDK 1.4 test to determine which components to exclude when building TC4 on JDK 1.3. This should sit better along side the TC5 build process.

Modified:
    tomcat/connectors/trunk/http11/build.xml
    tomcat/connectors/trunk/jk/build.xml
    tomcat/connectors/trunk/util/build.xml

Modified: tomcat/connectors/trunk/http11/build.xml
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/http11/build.xml?view=diff&rev=504386&r1=504385&r2=504386
==============================================================================
--- tomcat/connectors/trunk/http11/build.xml (original)
+++ tomcat/connectors/trunk/http11/build.xml Tue Feb  6 16:28:00 2007
@@ -119,7 +119,6 @@
     <echo message="-------- ${component.title} ${component.version} --------"/>
     <filter  token="name"                  value="${component.name}"/>
     <filter  token="version"               value="${component.version}"/>
-    <available property="tomcat-jni.detect" file="${tomcat-jni.jar}" />
   </target>
 
 
@@ -168,7 +167,7 @@
              debug="${compile.debug}"
        deprecation="${compile.deprecation}"
           optimize="${compile.optimize}">
-      <exclude name="org\apache\coyote\http11\*Apr*" unless="tomcat-jni.detect" />
+      <exclude name="org\apache\coyote\http11\*Apr*" unless="jdk.1.4.present" />
       <classpath refid="compile.classpath"/>
     </javac>
     <copy    todir="${build.home}/classes" filtering="on">

Modified: tomcat/connectors/trunk/jk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/build.xml?view=diff&rev=504386&r1=504385&r2=504386
==============================================================================
--- tomcat/connectors/trunk/jk/build.xml (original)
+++ tomcat/connectors/trunk/jk/build.xml Tue Feb  6 16:28:00 2007
@@ -102,7 +102,6 @@
         <echo message="IIS:       ${iis.detect} ${iis.home}" />
         <echo message="AOLserver: ${aolserver.detect} ${aolserver.home}" />
         <echo message="jmx:       ${jmx.jar} ${jmx.detect} ${commons-modeler.jar} ${modeler.detect}" />
-        <echo message="apr:       ${tomcat-apr.detect} ${tomcat-apr.jar}" />
     </target>
 
     <target name="detect" >
@@ -145,7 +144,6 @@
                    <classpath refid="classpath"/>
                     -->
         </available>
-        <available property="tomcat-apr.detect" file="${tomcat-apr.jar}" />
     </target>
 
     <target name="prepare" depends="detect" >
@@ -206,7 +204,7 @@
                verbose="off" >
             <include name="org/apache/jk/**"/>
             <include name="org/apache/coyote/ajp/**" />
-            <exclude name="org/apache/coyote/ajp/*Apr*" unless="tomcat-apr.detect" />
+            <exclude name="org/apache/coyote/ajp/*Apr*" unless="jdk.1.4.present" />
 	    <exclude name="org/apache/jk/common/ChannelNioSocket.java" unless="jdk.1.4.present"/>
 	    <exclude name="org/apache/jk/common/JkMX.java" unless="jmx.detect"/>
 	    <exclude name="org/apache/jk/common/ModJkMX.java" unless="jmx.detect"/>

Modified: tomcat/connectors/trunk/util/build.xml
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/util/build.xml?view=diff&rev=504386&r1=504385&r2=504386
==============================================================================
--- tomcat/connectors/trunk/util/build.xml (original)
+++ tomcat/connectors/trunk/util/build.xml Tue Feb  6 16:28:00 2007
@@ -43,7 +43,6 @@
         <available property="puretls.present" file="${puretls.jar}"/>
         <available property="commons-logging.present" file="${commons-logging.jar}"/>
         <available property="modeler.present" file="${commons-modeler.jar}"/>
-        <available property="tomcat-jni.present" file="${tomcat-jni.jar}"/>
 	<available property="jdk1.4.present" classname="java.lang.CharSequence" />
         <available property="jdk1.5.present" classname="javax.net.ssl.CertPathTrustManagerParameters" />
     </target>
@@ -63,7 +62,6 @@
         <echo message="-- commons-logging = ${commons-logging.present}"/>
         <echo message="-- jmx = ${jmx.present} ${jmx.jar}"/>
         <echo message="-- modeler = ${modeler.present} ${commons-modeler.jar}"/>
-        <echo message="-- jni = ${tomcat-jni.present} ${tomcat-jni.jar}"/>
         <echo message="-- skip.digester = ${skip.digester}" />
         <echo message="-- JDK14 = ${jdk1.4.present}"/>
         <echo message="-- JDK15 = ${jdk1.5.present}" />
@@ -86,7 +84,7 @@
             <exclude name="**/util/net/jsse/JSSE15*" unless="jdk1.5.present" />
             <exclude name="**/util/net/jsse/JSSEKeyManager.java" unless="jdk1.4.present" />
             <exclude name="**/util/digester/*" if="skip.digester" />
-            <exclude name="**/util/net/AprEndpoint.java" unless="tomcat-jni.present" />
+            <exclude name="**/util/net/AprEndpoint.java" unless="jdk1.4.present" />
         </javac>
 
 	<!-- Copy static resource files -->



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