tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r503957 - in /tomcat: connectors/trunk/http11/ connectors/trunk/jk/ connectors/trunk/util/ container/branches/tc4.1.x/catalina/ container/branches/tc4.1.x/webapps/ container/branches/tc4.1.x/webapps/manager/
Date Tue, 06 Feb 2007 02:18:15 GMT
Author: markt
Date: Mon Feb  5 18:18:14 2007
New Revision: 503957

URL: http://svn.apache.org/viewvc?view=rev&rev=503957
Log:
Make connectors build for TC4 with a 1.3 JDK. Some bits will be excluded from the build but
it will then run on a 1.3 JDK.

Modified:
    tomcat/connectors/trunk/http11/build.xml
    tomcat/connectors/trunk/jk/build.xml
    tomcat/connectors/trunk/util/build.xml
    tomcat/container/branches/tc4.1.x/catalina/build.xml
    tomcat/container/branches/tc4.1.x/webapps/build.xml
    tomcat/container/branches/tc4.1.x/webapps/manager/build.xml

Modified: tomcat/connectors/trunk/http11/build.xml
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/http11/build.xml?view=diff&rev=503957&r1=503956&r2=503957
==============================================================================
--- tomcat/connectors/trunk/http11/build.xml (original)
+++ tomcat/connectors/trunk/http11/build.xml Mon Feb  5 18:18:14 2007
@@ -119,6 +119,7 @@
     <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>
 
 
@@ -167,6 +168,7 @@
              debug="${compile.debug}"
        deprecation="${compile.deprecation}"
           optimize="${compile.optimize}">
+      <exclude name="org\apache\coyote\http11\*Apr*" unless="tomcat-jni.detect" />
       <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=503957&r1=503956&r2=503957
==============================================================================
--- tomcat/connectors/trunk/jk/build.xml (original)
+++ tomcat/connectors/trunk/jk/build.xml Mon Feb  5 18:18:14 2007
@@ -92,16 +92,17 @@
   <!-- ==================== Detection and reports ==================== -->
 
     <target name="report"  >
-        <echo message="Tomcat33: ${tomcat33.detect} ${tomcat33.home}" />
+        <echo message="Tomcat33:  ${tomcat33.detect} ${tomcat33.home}" />
         <echo message="Tomcat40:  ${tomcat40.detect} ${tomcat40.home}" />
-        <echo message="Tomcat41: ${tomcat41.detect} ${tomcat41.home}" />
-        <echo message="Tomcat5:  ${tomcat5.detect} ${tomcat5.home}" />
-        <echo message="Apache13: ${apache13.detect} ${apache13.home}" />
-        <echo message="Apache2: ${apache2.detect} ${apache2.home}" />
-        <echo message="iPlanet:  ${iplanet.detect} ${iplanet.home}" />
-        <echo message="IIS:      ${iis.detect} ${iis.home}" />
+        <echo message="Tomcat41:  ${tomcat41.detect} ${tomcat41.home}" />
+        <echo message="Tomcat5:   ${tomcat5.detect} ${tomcat5.home}" />
+        <echo message="Apache13:  ${apache13.detect} ${apache13.home}" />
+        <echo message="Apache2:   ${apache2.detect} ${apache2.home}" />
+        <echo message="iPlanet:   ${iplanet.detect} ${iplanet.home}" />
+        <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="jmx:       ${jmx.jar} ${jmx.detect} ${commons-modeler.jar} ${modeler.detect}"
/>
+        <echo message="apr:       ${tomcat-apr.detect} ${tomcat-apr.jar}" />
     </target>
 
     <target name="detect" >
@@ -144,6 +145,7 @@
                    <classpath refid="classpath"/>
                     -->
         </available>
+        <available property="tomcat-apr.detect" file="${tomcat-apr.jar}" />
     </target>
 
     <target name="prepare" depends="detect" >
@@ -204,6 +206,8 @@
                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/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"/>
 	    <exclude name="org/apache/jk/common/Shm14.java" unless="jdk14.detect"/>

Modified: tomcat/connectors/trunk/util/build.xml
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/util/build.xml?view=diff&rev=503957&r1=503956&r2=503957
==============================================================================
--- tomcat/connectors/trunk/util/build.xml (original)
+++ tomcat/connectors/trunk/util/build.xml Mon Feb  5 18:18:14 2007
@@ -43,6 +43,7 @@
         <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>
@@ -62,6 +63,7 @@
         <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}" />
@@ -84,6 +86,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" />
         </javac>
 
 	<!-- Copy static resource files -->

Modified: tomcat/container/branches/tc4.1.x/catalina/build.xml
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/build.xml?view=diff&rev=503957&r1=503956&r2=503957
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/build.xml (original)
+++ tomcat/container/branches/tc4.1.x/catalina/build.xml Mon Feb  5 18:18:14 2007
@@ -802,7 +802,7 @@
 
 
   <!-- =================== BUILD: Build tomcat-apr ======================== -->
-  <target name="build-tomcat-apr">
+  <target name="build-tomcat-apr" if="jdk.1.4.present" >
 
     <ant dir="${tomcat-jni.home}" target="jar" inheritAll="false" >
        <property name="version" value="1.0.0" />

Modified: tomcat/container/branches/tc4.1.x/webapps/build.xml
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/webapps/build.xml?view=diff&rev=503957&r1=503956&r2=503957
==============================================================================
--- tomcat/container/branches/tc4.1.x/webapps/build.xml (original)
+++ tomcat/container/branches/tc4.1.x/webapps/build.xml Mon Feb  5 18:18:14 2007
@@ -19,6 +19,7 @@
   <target name="build-prepare">
 
     <available classname="junit.framework.TestCase" property="junit.present" />
+    <available property="jdk.1.4.present" classname="java.nio.Buffer" />
 
     <mkdir dir="${webapps.build}"/>
     <mkdir dir="${webapps.dist}"/>
@@ -45,7 +46,7 @@
     <ant dir="${basedir}/manager" target="dist"/>
   </target>
 
-  <target name="tomcat-docs">
+  <target name="tomcat-docs" if="jdk.1.4.present" >
     <ant dir="${basedir}/tomcat-docs" target="dist"/>
   </target>
 

Modified: tomcat/container/branches/tc4.1.x/webapps/manager/build.xml
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/webapps/manager/build.xml?view=diff&rev=503957&r1=503956&r2=503957
==============================================================================
--- tomcat/container/branches/tc4.1.x/webapps/manager/build.xml (original)
+++ tomcat/container/branches/tc4.1.x/webapps/manager/build.xml Mon Feb  5 18:18:14 2007
@@ -36,26 +36,7 @@
 
 
   <!-- ================= BUILD: Compile Server Components ================= -->
-  <target name="build-main" depends="build-static">
-
-    <!-- Top Level Directory -->
-    <style basedir="../tomcat-docs"
-           destdir="${webapps.build}/${webapp.name}"
-           extension=".html"
-           style="tomcat-docs.xsl"
-           excludes="build.xml project.xml"
-           includes="manager-howto.xml,html-manager-howto.xml">
-      <param name="relative-path" expression="."/>
-      <param name="project-menu" expression="nomenu"/>
-      <param name="standalone" expression="standalone"/>
-    </style>
-
-    <!-- Images Subdirectory -->
-    <copy todir="${webapps.build}/${webapp.name}/images">
-      <fileset dir="../tomcat-docs/images">
-        <exclude name="printer.gif"/>
-      </fileset>
-    </copy>
+  <target name="build-main" depends="build-static" >
 
 <!--
     <javac   srcdir="WEB-INF/classes" 



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


Mime
View raw message