Author: kkolinko
Date: Tue Jun 30 17:38:59 2009
New Revision: 789842
URL: http://svn.apache.org/viewvc?rev=789842&view=rev
Log:
Fix download task check for commons-pool and commons-dbcp.
Without this patch the 'ant download' call does not download
the updated commons-pool or commons-dbcp version,
like the recent update of commons-pool 1.4 -> 1.5.1,
unless you run 'ant clean-depend' or delete existing ${tomcat-dbcp.jar} file
before that.
It is backport of rev.787999
Modified:
tomcat/build/tc5.5.x/build.xml
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt
Modified: tomcat/build/tc5.5.x/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/build.xml?rev=789842&r1=789841&r2=789842&view=diff
==============================================================================
--- tomcat/build/tc5.5.x/build.xml (original)
+++ tomcat/build/tc5.5.x/build.xml Tue Jun 30 17:38:59 2009
@@ -679,11 +679,11 @@
-->
<antcall target="downloadgz">
<param name="sourcefile" value="${commons-pool-src.loc}"/>
- <param name="destfile" value="${tomcat-dbcp.jar}" />
+ <param name="destfile" value="${commons-pool.home}/build.xml" />
</antcall>
<antcall target="downloadgz">
<param name="sourcefile" value="${commons-dbcp-src.loc}"/>
- <param name="destfile" value="${tomcat-dbcp.jar}" />
+ <param name="destfile" value="${commons-dbcp.home}/build.xml" />
</antcall>
<antcall target="build-tomcat-dbcp" />
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=789842&r1=789841&r2=789842&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Tue Jun 30 17:38:59 2009
@@ -43,8 +43,9 @@
Update to NSIS 2.44 (kkolinko)
</update>
<update>
- Build scripts: use different values for ${tomcat-dbcp.home} and
- ${jasper-compiler-jdt.home} in tomcat-deps. (kkolinko)
+ Build scripts: Use different values for ${tomcat-dbcp.home} and
+ ${jasper-compiler-jdt.home} in tomcat-deps. Fix download task
+ checks for commons-pool and commons-dbcp. (kkolinko)
</update>
</changelog>
</subsection>
Modified: tomcat/current/tc5.5.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=789842&r1=789841&r2=789842&view=diff
==============================================================================
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Tue Jun 30 17:38:59 2009
@@ -99,11 +99,6 @@
http://svn.apache.org/viewvc?rev=786496&view=rev
+1: markt, kkolinko, rjung
-1:
- kkolinko: (
- Note: The 'Fix download task check' patch (rev.787999) that I propose
below
- is needed for 'ant download' to download updated library, unless
- you run 'ant clean-depend' before building.
- )
* Fix Java 5 dependency Boolean.parseBoolean() (regression)
Introduced in fix for
https://issues.apache.org/bugzilla/show_bug.cgi?id=45996
@@ -119,13 +114,6 @@
+1: kkolinko, markt, rjung
-1:
-* Fix download task check for commons-pool and commons-dbcp.
- Backport of http://svn.apache.org/viewvc?rev=787999&view=rev
- TC 5.5 specific patch is:
-
http://people.apache.org/~kkolinko/patches/2009-06-24_tc55_rev787999backport.patch
- +1: kkolinko, markt, rjung
- -1:
-
* Make access log valves thread safe
http://people.apache.org/~markt/patches/2009-06-25-AccessLogValve-tc5.patch
+1: markt
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
