Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 95270 invoked from network); 1 Apr 2010 15:17:57 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 1 Apr 2010 15:17:57 -0000 Received: (qmail 11876 invoked by uid 500); 1 Apr 2010 15:17:56 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 11809 invoked by uid 500); 1 Apr 2010 15:17:56 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 11800 invoked by uid 99); 1 Apr 2010 15:17:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Apr 2010 15:17:56 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Apr 2010 15:17:54 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4F83723889B9; Thu, 1 Apr 2010 15:17:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r929998 - in /tomcat/tc6.0.x/trunk: STATUS.txt build.properties.default build.xml dist.xml res/procrun/ webapps/docs/changelog.xml Date: Thu, 01 Apr 2010 15:17:31 -0000 To: dev@tomcat.apache.org From: kkolinko@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100401151732.4F83723889B9@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ + - - + @@ -719,11 +720,24 @@ + - + + + + + + + + + + + + + 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 @@ - - - - -
+
+ + + 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) + + +
+
--------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org