You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2006/06/16 03:55:49 UTC

svn commit: r414717 - /tomcat/container/branches/tc4.1.x/catalina/build.xml

Author: markt
Date: Thu Jun 15 18:55:49 2006
New Revision: 414717

URL: http://svn.apache.org/viewvc?rev=414717&view=rev
Log:
Tweak the 4.x build to remove a 1.4 JDK dependency

Modified:
    tomcat/container/branches/tc4.1.x/catalina/build.xml

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?rev=414717&r1=414716&r2=414717&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/build.xml (original)
+++ tomcat/container/branches/tc4.1.x/catalina/build.xml Thu Jun 15 18:55:49 2006
@@ -814,6 +814,16 @@
   <!-- =================== BUILD: Build tomcat-util ======================= -->
   <target name="build-tomcat-util" depends="build-tomcat-apr" >
 
+    <!-- Remove references to CharSequence as it is a 1.4 class -->
+    <replace file="${tomcat-util.home}/java/org/apache/tomcat/util/buf/CharChunk.java">
+      <replacefilter
+             token=", CharSequence {"
+             value=" {" />
+      <replacefilter
+             token="public CharSequence subSequence"
+             value="public CharChunk subSequence" />
+    </replace>
+
     <ant dir="${tomcat-util.home}" target="build-main" inheritAll="false" >
        <property name="jmx.jar" value="${jmx.jar}" />
        <property name="puretls.jar" value="${puretls.jar}" />



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