From cf1cee1b7016da533e8bde02097cd3b5638dd5fe Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 5 Aug 2010 20:38:03 +0000
Subject: [PATCH] Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49585
 Update for changes in Commons Daemon packaging

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@982770 13f79535-47bb-0310-9956-ffa450edef68
---
 webapps/docs/changelog.xml |  4 ++++
 webapps/docs/setup.xml     | 27 ++++++++++++++-------------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c91dc2601..84460140c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -67,6 +67,10 @@
         Correct the class name of the default JAR scanner in the documentaiton
         web application. (rjung) 
       </fix>
+      <fix>
+        <bug>49585</bug>: Update JSVC documentation to reflect new packaging
+        of Commons Daemon. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Other">
diff --git a/webapps/docs/setup.xml b/webapps/docs/setup.xml
index 48ad5ca1b..d9b0a5452 100644
--- a/webapps/docs/setup.xml
+++ b/webapps/docs/setup.xml
@@ -107,13 +107,13 @@
 
 <source>
     cd $CATALINA_HOME/bin
-    tar xvfz jsvc.tar.gz
-    cd jsvc-src
+    tar xvfz commons-deamon-native.tar.gz
+    cd commons-daemon-1.0.x-native-src/unix
     autoconf
     ./configure
     make
-    cp jsvc ..
-    cd ..
+    cp jsvc ../..
+    cd ../..
 </source>
 
     <p>Tomcat can then be run as a daemon using the following commands.</p>
@@ -133,17 +133,18 @@
        information. In particular, the <code>-debug</code> option is useful
        to debug issues running jsvc.</p>
 
-    <p>The file <code>$CATALINA_HOME/bin/jsvc/native/tomcat.sh</code> can be 
-       used as a template for starting Tomcat automatically at boot time from 
-       <code>/etc/init.d</code>.  The file is currently setup for running 
-       Tomcat 4.1.x, so it is necessary to edit it and change the classname 
-       from <code>BootstrapService</code> to <code>Bootstrap</code>.</p>
+    <p>The file <code>
+       $CATALINA_HOME/bin/commons-daemon-1.0.x-native-src/unix/native/Tomcat5.sh
+       </code> can be used as a template for starting Tomcat automatically at
+       boot time from <code>/etc/init.d</code>. The file is currently setup for
+       running Tomcat 5.5.x, so it will be necessary to edit it a little.</p>
 
     <p>Note that the Commons-Daemon JAR file must be on your runtime classpath 
-       to run Tomcat in this manner.  The Commons-Daemon JAR file is in the Class-Path 
-       entry of the bootstrap.jar manifest, but if you get a ClassNotFoundException 
-       or a NoClassDefFoundError for a Commons-Daemon class, add the Commons-Daemon 
-       JAR to the -cp argument when launching jsvc.</p> 
+       to run Tomcat in this manner.  The Commons-Daemon JAR file is in the
+       Class-Path entry of the bootstrap.jar manifest, but if you get a
+       ClassNotFoundException or a NoClassDefFoundError for a Commons-Daemon
+       class, add the Commons-Daemon JAR to the -cp argument when launching
+       jsvc.</p> 
 
   </section>
 
-- 
2.11.0