Author: kkolinko
Date: Thu Apr 1 15:17:29 2010
New Revision: 929998
URL: http://svn.apache.org/viewvc?rev=929998&view=rev
Log:
Update to Commons Daemon 1.0.2 and use procrun from upstream distribution
Removed:
tomcat/tc6.0.x/trunk/res/procrun/
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.properties.default
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/dist.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=929998&r1=929997&r2=929998&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Apr 1 15:17:29 2010
@@ -187,14 +187,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko, markt
-1:
-* Update to Commons Daemon 1.0.2 and use procrun from upstream distribution
- 1)
- svn delete res/procrun
- 2)
-
http://people.apache.org/~kkolinko/patches/2010-03-11_tc6_commons-daemon.patch
- +1: kkolinko, mturk, markt
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48795
Provide an option to allow recompilation on the next request following a JSP
compilation error rather than waiting modifcationTestInterval before the next
Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=929998&r1=929997&r2=929998&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Thu Apr 1 15:17:29 2010
@@ -86,8 +86,13 @@ nsis.nsisdl.dll=${nsis.home}/Plugins/NSI
nsis.loc=${base-sf.loc}/nsis/nsis-2.45.zip
# ----- Commons Daemon, version 1.0-Alpha or later -----
-commons-daemon.home=${base.path}/commons-daemon-1.0.1
-commons-daemon.lib=${commons-daemon.home}
-commons-daemon.jar=${commons-daemon.lib}/commons-daemon.jar
-commons-daemon.loc=${base-commons.loc}/daemon/binaries/commons-daemon-1.0.1.tar.gz
-commons-daemon.jsvc.tar.gz=${commons-daemon.lib}/bin/jsvc.tar.gz
+commons-daemon.version=1.0.2
+commons-daemon.home=${base.path}/commons-daemon-${commons-daemon.version}
+commons-daemon.jar=${commons-daemon.home}/commons-daemon-${commons-daemon.version}.jar
+commons-daemon.native.win.home=${commons-daemon.home}/windows
+commons-daemon.native.win.mgr.exe=${commons-daemon.native.win.home}/prunmgr.exe
+commons-daemon.native.src.tgz=${commons-daemon.home}/commons-daemon-${commons-daemon.version}-native-src.tar.gz
+commons-daemon.native.win.zip=${commons-daemon.home}/commons-daemon-${commons-daemon.version}-bin-windows.zip
+commons-daemon.bin.loc=${base-commons.loc}/daemon/binaries/${commons-daemon.version}/commons-daemon-${commons-daemon.version}-bin.tar.gz
+commons-daemon.native.src.loc=${base-commons.loc}/daemon/source/commons-daemon-${commons-daemon.version}-native-src.tar.gz
+commons-daemon.native.win.loc=${base-commons.loc}/daemon/binaries/${commons-daemon.version}/windows/commons-daemon-${commons-daemon.version}-bin-windows.zip
Modified: tomcat/tc6.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=929998&r1=929997&r2=929998&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Thu Apr 1 15:17:29 2010
@@ -473,9 +473,10 @@
<copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
file="${tomcat-native.tar.gz}" />
+ <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
+ file="${commons-daemon.native.src.tgz}" />
- <copy todir="${tomcat.build}/bin" file="${commons-daemon.jar}" />
- <copy todir="${tomcat.build}/bin" file="${commons-daemon.jsvc.tar.gz}" />
+ <copy tofile="${tomcat.build}/bin/commons-daemon.jar"
file="${commons-daemon.jar}" />
<!-- Copy scripts -->
<copy todir="${tomcat.build}/bin">
@@ -719,11 +720,24 @@
<param name="destdir" value="${tomcat-native.home}"/>
</antcall>
+ <!-- Download Commons Daemon -->
<antcall target="downloadgz">
- <param name="sourcefile" value="${commons-daemon.loc}"/>
+ <param name="sourcefile" value="${commons-daemon.bin.loc}"/>
<param name="destfile" value="${commons-daemon.jar}"/>
</antcall>
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${commons-daemon.native.src.loc}"/>
+ <param name="destfile" value="${commons-daemon.native.src.tgz}"/>
+ <param name="destdir" value="${commons-daemon.home}"/>
+ </antcall>
+
+ <antcall target="downloadzip">
+ <param name="sourcefile" value="${commons-daemon.native.win.loc}"/>
+ <param name="destfile" value="${commons-daemon.native.win.mgr.exe}"/>
+ <param name="destdir" value="${commons-daemon.native.win.home}"/>
+ </antcall>
+
<!-- Build Tomcat DBCP bundle -->
<antcall target="downloadgz">
<param name="sourcefile" value="${commons-pool-src.loc}"/>
Modified: tomcat/tc6.0.x/trunk/dist.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=929998&r1=929997&r2=929998&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Thu Apr 1 15:17:29 2010
@@ -306,15 +306,15 @@
<copy file="${nsis.nsexec.dll}" todir="${tomcat.dist}" />
<copy file="${nsis.nsisdl.dll}" todir="${tomcat.dist}" />
<!-- 32 bit -->
- <copy file="res/procrun/tomcat${version.major}.exe"
+ <copy file="${commons-daemon.home}/windows/prunsrv.exe"
tofile="${tomcat.dist}/bin/tomcat${version.major}.exe" />
- <copy file="res/procrun/tomcat${version.major}w.exe"
+ <copy file="${commons-daemon.home}/windows/prunmgr.exe"
tofile="${tomcat.dist}/bin/tomcat${version.major}w.exe" />
<!-- 64 bit amd -->
- <copy file="res/procrun/amd64/tomcat${version.major}.exe"
+ <copy file="${commons-daemon.home}/windows/amd64/prunsrv.exe"
tofile="${tomcat.dist}/bin/x64/tomcat${version.major}.exe" />
<!-- 64 bit ia -->
- <copy file="res/procrun/ia64/tomcat${version.major}.exe"
+ <copy file="${commons-daemon.home}/windows/ia64/prunsrv.exe"
tofile="${tomcat.dist}/bin/i64/tomcat${version.major}.exe" />
<!-- tc native -->
<copy file="${tomcat-native.home}/tcnative-1.dll.x86"
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=929998&r1=929997&r2=929998&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Apr 1 15:17:29 2010
@@ -38,7 +38,16 @@
<!-- Section names:
Catalina, Coyote, Jasper, Cluster, Webapps, Other
-->
-<section name="Tomcat 6.0.26 (jfclere)">
+<section name="Tomcat 6.0.27 (jfclere)">
+ <subsection name="Other">
+ <changelog>
+ <update>Update to Commons Daemon 1.0.2. Use service launcher (procrun)
+ from the Commons Daemon release. Do not keep a copy of it in our source
+ tree. (mturk/kkolinko)</update>
+ </changelog>
+ </subsection>
+</section>
+<section name="Tomcat 6.0.26 (jfclere)" rtext="released 2010-03-11">
<subsection name="Catalina">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
