Author: markt
Date: Sun Nov 30 15:53:03 2008
New Revision: 721934
URL: http://svn.apache.org/viewvc?rev=721934&view=rev
Log:
Port Costin's build on a 1.6 JDK fix
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 30 15:53:03 2008
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709816,710063,710125,710205,711126,711600,712461
+/tomcat/trunk:601180,606992,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709816,710063,710125,710205,711126,711600,712461
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=721934&r1=721933&r2=721934&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Nov 30 15:53:03 2008
@@ -172,12 +172,6 @@
-1:
-* Add Costin's DBCP check so you can build Tomcat 6 on a 1.6 JDK
- http://svn.apache.org/viewvc?view=rev&revision=652744
- http://svn.apache.org/viewvc?view=rev&revision=653247
- +1: markt, fhanik, remm, pero
- -1:
-
* Remove unnecessary commons-logging reference from manifest
http://svn.apache.org/viewvc?view=rev&revision=612607
+1: markt, remm, fhanik, pero
Modified: tomcat/tc6.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=721934&r1=721933&r2=721934&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Sun Nov 30 15:53:03 2008
@@ -78,6 +78,8 @@
<property name="jasper-jdt.home" value="${base.path}/tomcat6-deps/jdt" />
<property name="tomcat-dbcp.jar"
value="${tomcat-dbcp.home}/tomcat-dbcp.jar"/>
<property name="jasper-jdt.jar" value="${jasper-jdt.home}/jasper-jdt.jar"/>
+ <available property="tomcat-dbcp.present" file="${tomcat-dbcp.jar}" />
+ <available property="jdk16.present" classname="javax.sql.StatementEvent" />
<!-- Classpath -->
<path id="tomcat.classpath">
@@ -427,8 +429,14 @@
<param name="relative-path" expression=".."/>
</xslt>
</target>
-
- <target name="deploy" depends="build-only,build-docs">
+
+ <target name="warn.dbcp" unless="tomcat-dbcp.present">
+ <echo>WARNING: tomcat-dbcp.jar not included, this build can't be used
+ in a release. Please run 'ant download' with JDK1.5 if you are
+ building a tomcat release.</echo>
+ </target>
+
+ <target name="deploy" depends="build-only,build-docs,warn.dbcp">
<copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
file="${tomcat-native.tar.gz}" />
@@ -565,7 +573,8 @@
</fileset>
</txt2html>
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib" />
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
+ failonerror="false"/>
<copy file="${jasper-jdt.jar}" todir="${tomcat.build}/lib" />
</target>
@@ -688,7 +697,7 @@
</target>
- <target name="build-tomcat-dbcp">
+ <target name="build-tomcat-dbcp" unless="jdk16.present">
<copy todir="${tomcat-dbcp.home}">
<!--
<fileset dir="${commons-collections.home}" >
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=721934&r1=721933&r2=721934&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Nov 30 15:53:03 2008
@@ -351,6 +351,11 @@
<bug>45879</bug>: Move NOTICE file from documentation webapp to the
installation directory. (markt)
</fix>
+ <fix>
+ Add a workaround for DBCP-191. Tomcat will now build without error on a
+ 1.6 JDK but because it does this by skipping DBCP, release builds must
+ be generated with a 1.5 JDK. (costin/markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
