tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
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 GMT
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


Mime
View raw message