Return-Path: 
 <dev-return-104946-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org>
Delivered-To: apmail-tomcat-dev-archive@www.apache.org
Received: (qmail 74621 invoked from network); 1 Apr 2010 14:32:05 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 1 Apr 2010 14:32:05 -0000
Received: (qmail 51619 invoked by uid 500); 1 Apr 2010 14:32:04 -0000
Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org
Received: (qmail 51565 invoked by uid 500); 1 Apr 2010 14:32:04 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@tomcat.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@tomcat.apache.org>
List-Post: <mailto:dev@tomcat.apache.org>
List-Id: <dev.tomcat.apache.org>
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 51556 invoked by uid 99); 1 Apr 2010 14:32:04 -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 14:32:04 +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 14:32:01 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id B27FE23888DD; Thu,  1 Apr 2010 14:31:39 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r929990 - in /tomcat/tc5.5.x/trunk: STATUS.txt
 build/build.properties.default build/build.xml connectors/procrun/
 container/webapps/docs/changelog.xml
Date: Thu, 01 Apr 2010 14:31:39 -0000
To: dev@tomcat.apache.org
From: kkolinko@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100401143139.B27FE23888DD@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: kkolinko
Date: Thu Apr  1 14:31:39 2010
New Revision: 929990

URL: http://svn.apache.org/viewvc?rev=929990&view=rev
Log:
Update to Commons Daemon 1.0.2 and use procrun from upstream distribution

Removed:
    tomcat/tc5.5.x/trunk/connectors/procrun/
Modified:
    tomcat/tc5.5.x/trunk/STATUS.txt
    tomcat/tc5.5.x/trunk/build/build.properties.default
    tomcat/tc5.5.x/trunk/build/build.xml
    tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=929990&r1=929989&r2=929990&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Apr  1 14:31:39 2010
@@ -124,19 +124,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 connectors/procrun
-  2)
-    http://people.apache.org/~kkolinko/patches/2010-03-17_tc55_commons-daemon.patch
-  +1: kkolinko, mturk, markt
-  -1: 
-      kkolinko - I updated the patch to do not delete "deploy.old" target.
-              Regarding "deploy.old": Note, that the commons-daemon files that were
-              copied in that target are already copied by "deploy-static", and that
-              I see no reason why one of the files was copied to ${tomcat.dist},
-              as that target updates ${tomcat.build} only.
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48717
   When a node joins a cluster and it receives all the current sessions, ensure
   the sessionCreated event is fired if the Manager is configured to replicate

Modified: tomcat/tc5.5.x/trunk/build/build.properties.default
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/build.properties.default?rev=929990&r1=929989&r2=929990&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/build/build.properties.default (original)
+++ tomcat/tc5.5.x/trunk/build/build.properties.default Thu Apr  1 14:31:39 2010
@@ -90,11 +90,16 @@ commons-launcher.loc=${base-commons.loc}
 
 
 # ----- 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
 
 
 # ----- Commons Digester, version 1.4 or later -----

Modified: tomcat/tc5.5.x/trunk/build/build.xml
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/build.xml?rev=929990&r1=929989&r2=929990&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/build/build.xml (original)
+++ tomcat/tc5.5.x/trunk/build/build.xml Thu Apr  1 14:31:39 2010
@@ -222,12 +222,12 @@
 
     <copy todir="${tomcat.build}/server/lib" file="${commons-modeler.jar}" />
 
-    <copy todir="${tomcat.build}/bin" file="${commons-daemon.jar}" />
-    <copy todir="${tomcat.build}/bin" file="${commons-daemon.jsvc.tar.gz}"
-            failonerror="false" />
-
     <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 tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
 
     <!-- <copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/>
     <copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/> -->
@@ -703,13 +703,10 @@
 
 
   <target name="build-depends" depends="init"
-          description="Builds various dependent components - APIs, commons-el, commons-modeler, daemon">
+          description="Builds various dependent components - APIs, dbcp, jdt">
     <antcall target="build-servletapi"/>
     <antcall target="build-jspapi"/>
 
-    <!-- <antcall target="build-commons-modeler" /> -->
-    <!-- <antcall target="build-commons-daemon"  /> -->
-
     <!--<antcall target="downloadgz">
       <param name="sourcefile" value="${commons-collections-src.loc}"/>
       <param name="destfile" value="${tomcat-dbcp.jar}" />
@@ -1153,11 +1150,6 @@
       <fileset dir="${api.home}/jsr154/build/examples"/>
     </copy>
 
-    <!-- Copy Unix JSVC from commons-daemon -->
-    <copy file="${commons-daemon.jsvc.tar.gz}"
-        tofile="${tomcat.dist}/bin/jsvc.tar.gz" />
-    <copy todir="${tomcat.build}/bin" file="${commons-daemon.jar}" />
-
     <echo>Target: Webapps precompilation ...</echo>
 
     <antcall target="build-admin"/>
@@ -1542,16 +1534,16 @@
     <copy file="${nsis.nsexec.dll}" todir="${tomcat.dist}" />
     <copy file="${nsis.nsisdl.dll}" todir="${tomcat.dist}" />
     <!-- 32 bit -->
-    <copy file="${jtc.home}/procrun/bin/tomcat${version.major}.exe"
-       tofile="${tomcat.dist}/bin/tomcat${version.major}.exe" />
-    <copy file="${jtc.home}/procrun/bin/tomcat${version.major}w.exe"
-          tofile="${tomcat.dist}/bin/tomcat${version.major}w.exe" />
+    <copy file="${commons-daemon.home}/windows/prunsrv.exe"
+        tofile="${tomcat.dist}/bin/tomcat${version.major}.exe" />
+    <copy file="${commons-daemon.home}/windows/prunmgr.exe"
+        tofile="${tomcat.dist}/bin/tomcat${version.major}w.exe" />
     <!-- 64 bit amd -->
-    <copy file="${jtc.home}/procrun/bin/amd64/tomcat${version.major}.exe"
-          tofile="${tomcat.dist}/bin/x64/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="${jtc.home}/procrun/bin/ia64/tomcat${version.major}.exe"
-          tofile="${tomcat.dist}/bin/i64/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"
           tofile="${tomcat.dist}/bin/tcnative-1.dll" />
@@ -2062,11 +2054,23 @@
     </antcall>
 
     <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>
+
+    <antcall target="downloadfile">
       <param name="sourcefile" value="${tomcat-native.loc}"/>
       <param name="destfile" value="${tomcat-native.tar.gz}"/>
       <param name="destdir" value="${tomcat-native.home}"/>

Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=929990&r1=929989&r2=929990&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Thu Apr  1 14:31:39 2010
@@ -33,6 +33,15 @@
   </properties>
 
 <body>
+<section name="Tomcat 5.5.30 (fhanik)">
+  <subsection name="General">
+    <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 5.5.29 (fhanik)">
   <subsection name="General">
     <changelog>



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