From 428ee5cb5d9cc32c4cba00e68d4bd4949951573e Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 4 Jan 2011 16:56:58 +0000
Subject: [PATCH] Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50488
 Update classpath required when using jsvc and add a note regarding server
 VMs.

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

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cbdb4418b..32028d310 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -234,6 +234,10 @@
       <update>
         Improve documentation of database connection factory. (rjung)
       </update>
+      <fix>
+        <bug>50488</bug>: Update classpath required when using jsvc and add a
+        note regarding server VMs. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Other">
diff --git a/webapps/docs/setup.xml b/webapps/docs/setup.xml
index 303f2ac47..f07ff7ef2 100644
--- a/webapps/docs/setup.xml
+++ b/webapps/docs/setup.xml
@@ -119,11 +119,15 @@
 
 <source>
     cd $CATALINA_HOME
-    ./bin/jsvc -cp ./bin/bootstrap.jar \
+    ./bin/jsvc -cp ./bin/bootstrap.jar:./bin/tomcat-juli.jar \
         -outfile ./logs/catalina.out -errfile ./logs/catalina.err \
         org.apache.catalina.startup.Bootstrap
 </source>
 
+    <p>You may also need to specify <code>-jvm server</code> if you JVM defaults
+       to using a server VM rather than a client VM. This has been observed on
+       OSX.</p>
+
     <p>jsvc has other useful parameters, such as <code>-user</code> which 
        causes it to switch to another user after the daemon initialization is
        complete. This allows, for example, running Tomcat as a non privileged
-- 
2.11.0