You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2011/10/26 20:19:26 UTC

svn commit: r1189356 - in /tomcat/tc5.5.x/trunk/container/webapps/docs: changelog.xml setup.xml

Author: kkolinko
Date: Wed Oct 26 18:19:25 2011
New Revision: 1189356

URL: http://svn.apache.org/viewvc?rev=1189356&view=rev
Log:
CTR: Docs
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52049
Improve setup instructions for running as a Windows service
- remove references to specific Windows OSes - it easily gets dated
- correct info on how a JRE is identified / selected
It is based on Mark's r1186957

Modified:
    tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
    tomcat/tc5.5.x/trunk/container/webapps/docs/setup.xml

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=1189356&r1=1189355&r2=1189356&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Wed Oct 26 18:19:25 2011
@@ -40,6 +40,15 @@
  General, Catalina, Coyote, Jasper, Cluster, Webapps
 -->
 <section name="Tomcat 5.5.35 (jim)" rtext="">
+  <subsection name="Webapps">
+    <changelog>
+      <fix>
+        <bug>52049</bug>: Improve setup instructions for running as a Windows
+        service: correct information on how a JRE is identified and selected.
+        (kkolinko)
+      </fix>
+    </changelog>
+  </subsection>
 </section>
 <section name="Tomcat 5.5.34 (jim)" rtext="released 2011-09-22">
   <subsection name="General">

Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/setup.xml
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/setup.xml?rev=1189356&r1=1189355&r2=1189356&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/setup.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/setup.xml Wed Oct 26 18:19:25 2011
@@ -55,25 +55,28 @@
     <p>
       <ul>
         <li><strong>Installation as a service</strong>: Tomcat will be 
-            installed as a Windows
-            NT/2k/XP service no matter what setting is selected. Using the
-            checkbox on the component page sets the service as "auto"
+            installed as a Windows service no matter what setting is selected.
+            Using the checkbox on the component page sets the service as "auto"
             startup, so that Tomcat is automatically started when Windows
             starts. For optimal security, the service should be run as a
             separate user, with reduced permissions (see the Windows Services
             administration tool and its documentation).</li>
-        <li><strong>Java location</strong>: The installer will use the registry
-            or the JAVA_HOME environment variable to determine the base path
-            of a J2SE 5 JRE.
-            </li>
+        <li><strong>Java location</strong>: The installer will provide a default
+            JRE to use to run the service. The installer uses the registry to
+            determine the base path of a JRE, including the JRE
+            installed as part of the full JDK. When running on a 64-bit
+            operating system, the installer will first look for a 64-bit JRE and
+            only look for a 32-bit JRE if a 64-bit JRE is not found. It is not
+            mandatory to use the default JRE detected by the installer. You
+            may select any installed 32-bit or 64-bit Java 5 or later JRE.</li>
         <li><strong>Tray icon</strong>: When Tomcat is run as a service, there
             will be a tray icon visible.  Note that
             when choosing to run Tomcat at the end of installation, the tray
             icon will be loaded at the same time.</li>
         <li>Refer to the
             <a href="windows-service-howto.html">Windows Service HOW-TO</a>
-            for information on how to manage Tomcat as Windows NT service.
-            </li>            
+            for information on how to manage Tomcat as Windows service.
+            </li>
       </ul>
     </p>
 
@@ -81,9 +84,12 @@
        Tomcat. It is important to note that the Tomcat administration web 
        application can only be used when Tomcat is running.</p>
 
-    <p>If using a J2SE 1.4 JRE, the compatibility package must be downloaded and
-       expanded inside the folder where Tomcat was installed.</p>
-
+    <p>Note that while Tomcat 5.5 supports running with Java 1.4, the
+       compatibility package required for that is not included in the
+       installer to minimize download size. If you need it, you have to
+       download it and expand into the folder where Tomcat is installed.
+       See <code>RUNNING.txt</code> for details.
+    </p>
   </section>
 
   <section name="Unix daemon">



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