Author: markt
Date: Thu Aug 5 20:37:46 2010
New Revision: 982768
URL: http://svn.apache.org/viewvc?rev=982768&view=rev
Log:
Docs only CTR
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49585
Update for changes in Commons Daemon packaging
Modified:
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/setup.xml
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=982768&r1=982767&r2=982768&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Aug 5 20:37:46 2010
@@ -57,6 +57,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Webapps">
+ <changelog>
+ <fix>
+ <bug>49585</bug>: Update JSVC documentation to reflect new packaging
+ of Commons Daemon. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Other">
<changelog>
<fix>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/setup.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/setup.xml?rev=982768&r1=982767&r2=982768&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/setup.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/setup.xml Thu Aug 5 20:37:46 2010
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
