Hello,

I have attached 3 patches that patch the following 3 documentation files:

  Attachment            CVS File to Patch
  ----------            -----------------
  server-noexamples.xml.config.patch
        jakarta-tomcat-4.0/catalina/src/conf/server-noexamples.xml.config
  server.xml.patch      jakarta-tomcat-4.0/catalina/src/conf/server.xml
                jakarta-tomcat-4.0/catalina/src/conf
  ssl-howto.xml.patch   jakarta-tomcat-4.0/webapps/tomcat-docs/ssl-howto.xml
  
The only change to each of the following 3 files was to replace "keytool" with 
"%JAVA_HOME%\bin\keytool" and "$JAVA_HOME/bin/keytool" in the documentation. 
This change is necessary because the keytool in the same $JAVA_HOME as is used 
by Tomcat must be used. Otherwise, keytool may fail.

Patrick 

_____________________________________________________________________
Patrick Luby                          Email: [EMAIL PROTECTED]
Software Engineering Manager          Phone: 408-863-3284
Sun Microsystems
901 San Antonio Road, UCUP01-103
Palo Alto, CA 94303-4900
_____________________________________________________________________
Index: server-noexamples.xml.config
===================================================================
RCS file: 
/home/cvspublic/jakarta-tomcat-4.0/catalina/src/conf/server-noexamples.xml.config,v
retrieving revision 1.2
diff -u -r1.2 server-noexamples.xml.config
--- server-noexamples.xml.config        2001/08/10 14:14:15     1.2
+++ server-noexamples.xml.config        2001/09/19 19:59:57
@@ -37,7 +37,9 @@
            into "$JAVA_HOME/jre/lib/ext".
          * Edit "$JAVA_HOME/jre/lib/security/java.security" and add
              security.provider.2=com.sun.net.ssl.internal.ssl.Provider
-         * Execute: keytool -genkey -alias tomcat -keyalg RSA
+         * Execute:
+             %JAVA_HOME%\bin\keytool -genkey -alias tomcat -keyalg RSA (Windows)
+             $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA  (Unix)
            with a password value of "changeit".
 
          By default, DNS lookups are enabled when a web application calls
Index: server.xml
===================================================================
RCS file: /home/cvspublic/jakarta-tomcat-4.0/catalina/src/conf/server.xml,v
retrieving revision 1.29
diff -u -r1.29 server.xml
--- server.xml  2001/09/09 04:00:08     1.29
+++ server.xml  2001/09/19 20:02:20
@@ -37,7 +37,9 @@
            into "$JAVA_HOME/jre/lib/ext".
          * Edit "$JAVA_HOME/jre/lib/security/java.security" and add
              security.provider.2=com.sun.net.ssl.internal.ssl.Provider
-         * Execute: keytool -genkey -alias tomcat -keyalg RSA
+         * Execute:
+             %JAVA_HOME%\bin\keytool -genkey -alias tomcat -keyalg RSA (Windows)
+             $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA  (Unix)
            with a password value of "changeit".
 
          By default, DNS lookups are enabled when a web application calls
Index: ssl-howto.xml
===================================================================
RCS file: /home/cvspublic/jakarta-tomcat-4.0/webapps/tomcat-docs/ssl-howto.xml,v
retrieving revision 1.7
diff -u -r1.7 ssl-howto.xml
--- ssl-howto.xml       2001/09/12 17:38:47     1.7
+++ ssl-howto.xml       2001/09/19 20:07:12
@@ -35,9 +35,15 @@
    set an environment variable <code>JSSE_HOME</code> that points at the
    directory into which you installed JSSE.</li><br/><br/>
 <li>Create a certificate keystore by executing the following command:
+<p>Windows:</p>
 <source>
-keytool -genkey -alias tomcat -keyalg RSA
+%JAVA_HOME%\bin\keytool -genkey -alias tomcat -keyalg RSA
 </source>
+<p>Unix:</p>
+<source>
+$JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA
+</source>
+<p></p>
     and specify a password value of "changeit".</li><br/><br/>
 <li>Uncomment the "SSL HTTP/1.1 Connector" entry in
     <code>$CATALINA_HOME/conf/server.xml</code> and tweak as necessary.</li>
@@ -202,8 +208,13 @@
 
 <p>To create a new keystore from scratch, containing a single self-signed
 Certificate, execute the following from a terminal command line:</p>
+<p>Windows:</p>
+<source>
+%JAVA_HOME%\bin\keytool -genkey -alias tomcat -keyalg RSA
+</source>
+<p>Unix:</p>
 <source>
-keytool -genkey -alias tomcat -keyalg RSA
+$JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA
 </source>
 
 <p>(The RSA algorithm should be preferred as a secure algorithm, and this
@@ -216,8 +227,14 @@
 to the <code>keytool</code> command shown above.  You will also need to
 reflect this new location in the <code>server.xml</code> configuration file,
 as described later.  For example:</p>
+<p>Windows:</p>
+<source>
+%JAVA_HOME%\bin\keytool -genkey -alias tomcat -keyalg RSA \
+  -keystore /path/to/my/keystore
+</source>
+<p>Unix:</p>
 <source>
-keytool -genkey -alias tomcat -keyalg RSA \
+$JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA \
   -keystore /path/to/my/keystore
 </source>
 

Reply via email to