tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml
Date Thu, 18 Apr 2002 13:58:01 GMT
keith       02/04/18 06:58:01

  Modified:    .        README RELEASE-NOTES-3.3.2.txt build.xml
               src/admin index.html
               src/build/nightly start_tomcat.sh stop_tomcat.sh
               src/build/pkg prototype tomcat.spec
               src/doc  readme serverxml.html tomcat-security.html
                        tomcat-ssl-howto.html tomcat-ug.html
               src/doc/appdev processes.html
               src/native/mod_jk README
               src/shell jspc.sh shutdown.sh startup.sh tomcat.sh
               src/tests/webpages/WEB-INF test-tomcat.xml
  Log:
  Remove '.sh' extensions from shell scripts (in the build).
  Update references.
  
  Revision  Changes    Path
  1.20      +10 -10    jakarta-tomcat/README
  
  Index: README
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/README,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- README	24 Feb 2002 03:50:14 -0000	1.19
  +++ README	18 Apr 2002 13:57:59 -0000	1.20
  @@ -60,13 +60,13 @@
     This version can be executed as follows:
   
   	cd $JAKARTA_HOME/jakarta-tomcat/build/tomcat
  -	./bin/startup.sh	<-- Unix
  +	./bin/startup		<-- Unix
   	bin\startup		<-- Windows
   
     and it can be shut down as follows:
   
   	cd $JAKARTA_HOME/jakarta-tomcat/build/tomcat
  -	./bin/shutdown.sh	<-- Unix
  +	./bin/shutdown		<-- Unix
   	bin\shutdown		<-- Windows
   
   * You can also build a binary distribution version of Tomcat as follows:
  @@ -95,7 +95,7 @@
   * To start Tomcat, execute the following commands:
   
   	cd $JAKARTA_HOME/jakarta-tomcat/build/tomcat
  -	./bin/startup.sh	<-- Unix
  +	./bin/startup		<-- Unix
   	bin\startup		<-- Windows
   
   * You can now access the default web pages from a web browser at URL:
  @@ -105,7 +105,7 @@
   * To stop Tomcat, execute the following commands:
   
   	cd $JAKARTA_HOME/jakarta-tomcat/build/tomcat
  -	./bin/shutdown.sh	<-- Unix
  +	./bin/shutdown		<-- Unix
   	bin\shutdown		<-- Windows
   
   You can run the "distribution" version of Tomcat as follows:
  @@ -113,7 +113,7 @@
   * To start Tomcat, execute the following commands:
   
   	cd $JAKARTA_HOME/jakarta-tomcat/dist/tomcat
  -	./bin/startup.sh	<-- Unix
  +	./bin/startup		<-- Unix
   	bin\startup		<-- Windows
   
   * You can now access the default web pages from a web browser at URL:
  @@ -123,7 +123,7 @@
   * To stop Tomcat, execute the following commands:
   
   	cd $JAKARTA_HOME/jakarta-tomcat/dist/tomcat
  -	./bin/shutdown.sh	<-- Unix
  +	./bin/shutdown		<-- Unix
   	bin\shutdown		<-- Windows
   
   Alternatively, you can run Tomcat without changing your current working
  @@ -133,12 +133,12 @@
   "$JAKARTA_HOME/jakarta-tomcat/dist/tomcat").  Now, you can start Tomcat
   as follows:
   
  -	$TOMCAT_HOME/bin/startup.sh	<-- Unix
  +	$TOMCAT_HOME/bin/startup	<-- Unix
   	%TOMCAT_HOME%\bin\startup	<-- Windows
   
   and shut it down likewise:
   
  -	$TOMCAT_HOME/bin/shutdown.sh	<-- Unix
  +	$TOMCAT_HOME/bin/shutdown	<-- Unix
   	%TOMCAT_HOME%\bin\shutdown	<-- Windows
   
   Tomcat may be run with any XML parser that is compliant with the Java API for
  @@ -173,14 +173,14 @@
   "trusted". This can be accomplished by executing the following:
   
   	cd $JAKARTA_HOME/jakarta-tomcat/build/tomcat	<-- Unix
  -	./bin/tomcat.sh enableAdmin
  +	./bin/tomcat enableAdmin
   
   	cd %JAKARTA_HOME%\jakarta-tomcat\build\tomcat	<-- Windows
   	bin\tomcat enableAdmin
   
   Next, start Tomcat with: 
   
  -	./bin/startup.sh	<-- Unix
  +	./bin/startup		<-- Unix
   	bin\startup		<-- Windows
   
   To run the test, invoke the following URL in your browser:
  
  
  
  1.4       +2 -1      jakarta-tomcat/RELEASE-NOTES-3.3.2.txt
  
  Index: RELEASE-NOTES-3.3.2.txt
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/RELEASE-NOTES-3.3.2.txt,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- RELEASE-NOTES-3.3.2.txt	17 Apr 2002 02:44:11 -0000	1.3
  +++ RELEASE-NOTES-3.3.2.txt	18 Apr 2002 13:57:59 -0000	1.4
  @@ -3,7 +3,7 @@
                                    Release Notes
                                    =============
   
  -$Id: RELEASE-NOTES-3.3.2.txt,v 1.3 2002/04/17 02:44:11 billbarker Exp $
  +$Id: RELEASE-NOTES-3.3.2.txt,v 1.4 2002/04/18 13:57:59 keith Exp $
   
   
   This document describes the changes that have been made since the
  @@ -21,6 +21,7 @@
   
   8099     Preserve the query string when redirecting to the welcome page.
   
  +         Removed '.sh' extension from Unix shell scripts.
   
   Server:
   
  
  
  
  1.176     +10 -8     jakarta-tomcat/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/build.xml,v
  retrieving revision 1.175
  retrieving revision 1.176
  diff -u -r1.175 -r1.176
  --- build.xml	15 Apr 2002 04:25:24 -0000	1.175
  +++ build.xml	18 Apr 2002 13:57:59 -0000	1.176
  @@ -245,10 +245,12 @@
       <fixcrlf srcdir="${tomcat.build}/bin" includes="**/*.sh" eol="lf"/>
       <fixcrlf srcdir="${tomcat.build}/bin" includes="**/*.bat" eol="crlf"/>
   
  -    <chmod perm="+x" file="${tomcat.build}/bin/tomcat.sh"/>
  -    <chmod perm="+x" file="${tomcat.build}/bin/jspc.sh"/>
  -    <chmod perm="+x" file="${tomcat.build}/bin/startup.sh"/>
  -    <chmod perm="+x" file="${tomcat.build}/bin/shutdown.sh"/>
  +    <chmod perm="+x" file="${tomcat.build}/bin/*.sh"/>
  +
  +    <move todir="${tomcat.build}/bin">
  +      <fileset dir="${tomcat.build}/bin" includes="*.sh"/>
  +      <mapper type="glob" from="*.sh" to="*"/>
  +    </move>
     </target>
   
     <target name="dep.tomcat-util" unless="tomcat-util.is.uptodate"
  @@ -804,10 +806,10 @@
       </copy>
   
       <!-- Change permissions for unix -->
  -    <chmod perm="+x" file="${tomcat.dist}/bin/tomcat.sh"/>
  -    <chmod perm="+x" file="${tomcat.dist}/bin/jspc.sh"/>
  -    <chmod perm="+x" file="${tomcat.dist}/bin/startup.sh"/>
  -    <chmod perm="+x" file="${tomcat.dist}/bin/shutdown.sh"/>
  +    <chmod perm="+x" file="${tomcat.dist}/bin/tomcat"/>
  +    <chmod perm="+x" file="${tomcat.dist}/bin/jspc"/>
  +    <chmod perm="+x" file="${tomcat.dist}/bin/startup"/>
  +    <chmod perm="+x" file="${tomcat.dist}/bin/shutdown"/>
     </target>
   
     <path id="javadoc.classpath">
  
  
  
  1.6       +2 -2      jakarta-tomcat/src/admin/index.html
  
  Index: index.html
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/admin/index.html,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- index.html	20 Jul 2001 12:49:46 -0000	1.5
  +++ index.html	18 Apr 2002 13:57:59 -0000	1.6
  @@ -53,7 +53,7 @@
   You can also do that by running the command:
   <pre>
   Unix:
  -$TOMCAT_HOME/bin/tomcat.sh run -enableAdmin
  +$TOMCAT_HOME/bin/tomcat run -enableAdmin
   
   DOS:
   %TOMCAT_HOME%\bin\tomcat.bat run -enableAdmin
  @@ -74,7 +74,7 @@
   You can do both by running the command:
   <pre>
   Unix:
  -$TOMCAT_HOME/bin/tomcat.sh run -enableAdmin password
  +$TOMCAT_HOME/bin/tomcat run -enableAdmin password
   
   DOS:
   %TOMCAT_HOME%\bin\tomcat.bat run -enableAdmin password
  
  
  
  1.4       +3 -3      jakarta-tomcat/src/build/nightly/start_tomcat.sh
  
  Index: start_tomcat.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/build/nightly/start_tomcat.sh,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- start_tomcat.sh	11 Mar 2001 02:45:43 -0000	1.3
  +++ start_tomcat.sh	18 Apr 2002 13:57:59 -0000	1.4
  @@ -24,15 +24,15 @@
   # Make sure no tomcat is running
   cd $ROOT/tomcat
   echo Make sure tomcat is stopped
  -bin/tomcat.sh stop >/dev/null 2>&1
  +bin/tomcat stop >/dev/null 2>&1
   
   
   rm -f $LOGDIR/tomcat-run$EXT.log >/dev/null 2>&1
   $JAVA_HOME/bin/java -version > $LOGDIR/tomcat-run$EXT.log 2>&1 &
   if [ "$EXT" = "security" ] ; then
  -  bin/tomcat.sh run -sandbox >> $LOGDIR/tomcat-run$EXT.log 2>&1 &
  +  bin/tomcat run -sandbox >> $LOGDIR/tomcat-run$EXT.log 2>&1 &
   else
  -  bin/tomcat.sh run >> $LOGDIR/tomcat-run$EXT.log 2>&1 &
  +  bin/tomcat run >> $LOGDIR/tomcat-run$EXT.log 2>&1 &
   fi
   
   i=0
  
  
  
  1.4       +1 -1      jakarta-tomcat/src/build/nightly/stop_tomcat.sh
  
  Index: stop_tomcat.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/build/nightly/stop_tomcat.sh,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- stop_tomcat.sh	11 Mar 2001 02:45:43 -0000	1.3
  +++ stop_tomcat.sh	18 Apr 2002 13:57:59 -0000	1.4
  @@ -14,7 +14,7 @@
   
   # Make sure no tomcat is running
   cd $ROOT/tomcat
  -bin/tomcat.sh stop 
  +bin/tomcat stop 
   
   if [ -f /usr/bin/pkill ] ; then 
      pkill java
  
  
  
  1.2       +3 -3      jakarta-tomcat/src/build/pkg/prototype
  
  Index: prototype
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/build/pkg/prototype,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- prototype	10 Mar 2001 18:21:21 -0000	1.1
  +++ prototype	18 Apr 2002 13:58:00 -0000	1.2
  @@ -343,13 +343,13 @@
   f none /opt/tomcat/webpages/WEB-INF/web.xml 0644 costin staff
   f none /opt/tomcat/webpages/tomcat.gif 0644 costin staff
   f none /opt/tomcat/webpages/index.html 0644 costin staff
  -f none /opt/tomcat/tomcat.sh 0644 costin staff
  +f none /opt/tomcat/tomcat 0644 costin staff
   f none /opt/tomcat/env.tomcat 0644 costin staff
   f none /opt/tomcat/ant 0644 costin staff
  -f none /opt/tomcat/shutdown.sh 0644 costin staff
  +f none /opt/tomcat/shutdown 0644 costin staff
   f none /opt/tomcat/tomcat.bat 0644 costin staff
   f none /opt/tomcat/tomcatEnv.bat 0644 costin staff
  -f none /opt/tomcat/startup.sh 0644 costin staff
  +f none /opt/tomcat/startup 0644 costin staff
   f none /opt/tomcat/shutdown.bat 0644 costin staff
   f none /opt/tomcat/startup.bat 0644 costin staff
   f none /opt/tomcat/server.xml 0644 costin staff
  
  
  
  1.2       +1 -1      jakarta-tomcat/src/build/pkg/tomcat.spec
  
  Index: tomcat.spec
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/build/pkg/tomcat.spec,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- tomcat.spec	10 Mar 2001 18:21:21 -0000	1.1
  +++ tomcat.spec	18 Apr 2002 13:58:00 -0000	1.2
  @@ -72,7 +72,7 @@
   
   %post
   rm -f /usr/bin/tomcat
  -ln -s /opt/tomcat/bin/tomcat.sh /usr/bin/tomcat
  +ln -s /opt/tomcat/bin/tomcat /usr/bin/tomcat
   /sbin/chkconfig --add tomcat
   
   echo ""
  
  
  
  1.25      +2 -2      jakarta-tomcat/src/doc/readme
  
  Index: readme
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/doc/readme,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- readme	14 Feb 2002 14:25:53 -0000	1.24
  +++ readme	18 Apr 2002 13:58:00 -0000	1.25
  @@ -1,4 +1,4 @@
  -$Id: readme,v 1.24 2002/02/14 14:25:53 larryi Exp $
  +$Id: readme,v 1.25 2002/04/18 13:58:00 keith Exp $
           
                              Release Notes for:
                              =========================
  @@ -112,7 +112,7 @@
     change can be accomplished by executing the command from the TOMCAT_HOME
     directory with JAVA_HOME set:
   
  -	./bin/tomcat.sh enableAdmin    <-- Unix
  +	./bin/tomcat enableAdmin       <-- Unix
   	bin\tomcat enableAdmin         <-- Windows
   
     Start or restart Tomcat 3.3 and invoke the following URL in your browser:
  
  
  
  1.24      +2 -2      jakarta-tomcat/src/doc/serverxml.html
  
  Index: serverxml.html
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/doc/serverxml.html,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- serverxml.html	19 Mar 2002 11:48:05 -0000	1.23
  +++ serverxml.html	18 Apr 2002 13:58:00 -0000	1.24
  @@ -4,7 +4,7 @@
   <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
   <html>
   <head>
  -  <!-- $Id: serverxml.html,v 1.23 2002/03/19 11:48:05 larryi Exp $ -->
  +  <!-- $Id: serverxml.html,v 1.24 2002/04/18 13:58:00 keith Exp $ -->
     <!-- Copyright 1999-2001 Apache Software Foundation -->
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" >
     <link rel="stylesheet" href="style.css">
  @@ -78,7 +78,7 @@
       arguments, where <i>name</i> doesn't match any of the arguments supported
       by the <a href="tomcat-ug.html#tomcat_task_args">&quot;start&quot; task</a>.
       For example:<br>
  -    <pre>    bin/startup.sh -my.prop myvalue</pre></li>
  +    <pre>    bin/startup -my.prop myvalue</pre></li>
   </ol>
   
   <p><b>Note:</b> The property values may themselves use &quot;variable
  
  
  
  1.5       +1 -1      jakarta-tomcat/src/doc/tomcat-security.html
  
  Index: tomcat-security.html
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/doc/tomcat-security.html,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- tomcat-security.html	21 Oct 2001 16:51:00 -0000	1.4
  +++ tomcat-security.html	18 Apr 2002 13:58:00 -0000	1.5
  @@ -209,7 +209,7 @@
   <a NAME="start"></a>Starting Tomcat with a SecurityManager</h3>
   Once you have configured the tomcat.policy for use
   with a SecurityManager, Tomcat can be started with the SecurityManager
  -in place by adding the "-security" option to bin/startup.bat or bin/startup.sh.
  +in place by adding the "-security" option to bin/startup.bat or bin/startup.
   <br>&nbsp;
   <h3>
   <a NAME="violation"></a>What happens when the SecurityManager detects a
  
  
  
  1.11      +2 -2      jakarta-tomcat/src/doc/tomcat-ssl-howto.html
  
  Index: tomcat-ssl-howto.html
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/doc/tomcat-ssl-howto.html,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- tomcat-ssl-howto.html	12 Mar 2002 04:11:52 -0000	1.10
  +++ tomcat-ssl-howto.html	18 Apr 2002 13:58:00 -0000	1.11
  @@ -387,7 +387,7 @@
   <li>Alternatively, you can make these jars available via the classpath that is
       passed to Tomcat on startup. This will need to be done in the appropriate
       startup script for your environment (
  -    <code>$TOMCAT_HOME/bin/tomcat.sh</code> in Unix, or
  +    <code>$TOMCAT_HOME/bin/tomcat</code> in Unix, or
       <code>%TOMCAT_HOME%\bin\tomcat.bat</code> in Windows).</li>
   </ul>
   <b>Note:</b> The system classpath is effectively ignored by Tomcat, so
  @@ -549,7 +549,7 @@
    <li>Alternatively, you can make these jars available via the classpath that is
       passed to Tomcat on startup. This will need to be done in the appropriate
       startup script for your environment (
  -    <code>$TOMCAT_HOME/bin/tomcat.sh</code> in Unix, or
  +    <code>$TOMCAT_HOME/bin/tomcat</code> in Unix, or
       <code>%TOMCAT_HOME%\bin\tomcat.bat</code> in Windows).</li>
   </ul>
   <b>Note:</b> The system classpath is effectively ignored by Tomcat, so
  
  
  
  1.25      +20 -20    jakarta-tomcat/src/doc/tomcat-ug.html
  
  Index: tomcat-ug.html
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/doc/tomcat-ug.html,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- tomcat-ug.html	12 Mar 2002 04:14:49 -0000	1.24
  +++ tomcat-ug.html	18 Apr 2002 13:58:00 -0000	1.25
  @@ -1,7 +1,7 @@
   <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
   <html>
   <head>
  -    <!-- $Id: tomcat-ug.html,v 1.24 2002/03/12 04:14:49 larryi Exp $ -->
  +    <!-- $Id: tomcat-ug.html,v 1.25 2002/04/18 13:58:00 keith Exp $ -->
       <!-- Copyright 1999-2001 Apache Software Foundation -->
       <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
       <link rel="stylesheet" type="text/css" href="style.css">
  @@ -88,7 +88,7 @@
         <li><a href="#starting_tomcat">Starting Tomcat</a></li>
         <li><a href="#stopping_tomcat">Stopping Tomcat</a></li>
         <li><a href="#tomcat_scripts">Tomcat Shell and Batch Files</a></li>
  -      <li><a href="#tomcat_actions">tomcat.sh/tomcat.bat Actions</a></li>
  +      <li><a href="#tomcat_actions">tomcat/tomcat.bat Actions</a></li>
         <li><a href="#tomcat_task_args">Tomcat Task Arguments</a></li>
       </ul>
     </li>
  @@ -379,7 +379,7 @@
   <p>To start Tomcat 3.3, execute:</p>
   
   <ul>
  -  <li>On UNIX: bin/startup.sh</li>
  +  <li>On UNIX: bin/startup</li>
     <li>On Win32: bin\startup</li>
   </ul>
   
  @@ -447,7 +447,7 @@
   <p>To stop Tomcat 3.3, execute:</p>
   
   <ul>
  -  <li>On UNIX: bin/shutdown.sh</li>
  +  <li>On UNIX: bin/shutdown</li>
     <li>On Win32: bin\shutdown</li>
   </ul>
   
  @@ -473,8 +473,8 @@
     <tr><td>cpappend.bat</td><td>This batch file is used by <code>tomcat.bat</code>
       to build a classpath in a couple of <code>tomcat.bat</code>'s other
       functions.  It is not executed during Tomcat start and stop functions.</td></tr>
  -  <tr><td>jspc.sh</td><td>Shell script to invoke JSPC on Unix based
systems. It
  -    uses <code>tomcat.sh</code> with the &quot;jspc&quot; option to
pre-translate
  +  <tr><td>jspc</td><td>Shell script to invoke JSPC on Unix based
systems. It
  +    uses <code>tomcat</code> with the &quot;jspc&quot; option to pre-translate
       JSP pages to Java files.</td></tr>
     <tr><td>jspc.bat</td><td>Batch file to invoke JSPC on Windows
based systems.
       It uses <code>tomcat.bat</code> with the &quot;jspc&quot; option
to
  @@ -484,11 +484,11 @@
       directory, or one of its subdirectories. It executes <code>tomcat.bat</code>
       with the &quot;start&quot; argument. Features and limitations of
       <code>tomcat.bat</code> apply to this batch file.</td></tr>
  -  <tr><td>shutdown.sh</td><td>Shell script for stopping Tomcat
on Unix based
  -    systems.  It executes <code>tomcat.sh</code> with the &quot;stop&quot;
  -     argument. Features and limitations of <code>tomcat.sh</code> apply to
  +  <tr><td>shutdown</td><td>Shell script for stopping Tomcat on
Unix based
  +    systems.  It executes <code>tomcat</code> with the &quot;stop&quot;
  +     argument. Features and limitations of <code>tomcat</code> apply to
        this script.</td></tr>
  -  <tr><td>tomcat.sh</td><td>The main script for Unix based systems.
It can start
  +  <tr><td>tomcat</td><td>The main script for Unix based systems.
It can start
       and stop Tomcat, as well as perform other functions.  It makes a number of
       attempts to guess TOMCAT_HOME if not set explicitly (see script contents
       for details). It can also guess your JAVA_HOME if it is in your PATH
  @@ -498,9 +498,9 @@
       directory, or one of its subdirectories. It executes <code>tomcat.bat</code>
       with the &quot;start&quot; argument. Features and limitations of
       <code>tomcat.bat</code> apply to this batch file.</td></tr>
  -  <tr><td>startup.sh</td><td>Shell script for starting Tomcat on
Unix based
  -     systems. It executes <code>tomcat.sh</code> with the &quot;start&quot;
  -     argument. Features and limitations of <code>tomcat.sh</code> apply to
  +  <tr><td>startup</td><td>Shell script for starting Tomcat on Unix
based
  +     systems. It executes <code>tomcat</code> with the &quot;start&quot;
  +     argument. Features and limitations of <code>tomcat</code> apply to
        this script.</td></tr>
     <tr><td>tomcat.bat</td><td>The main batch file for Windows based
systems. It
       can start and stop Tomcat, as well as perform other functions.  It can guess
  @@ -513,7 +513,7 @@
       MS-DOS window.</td></tr>
   </table>
   
  -<p>You may have noted that <code>tomcat.sh</code> and <code>tomcat.bat</code>
  +<p>You may have noted that <code>tomcat</code> and <code>tomcat.bat</code>
   are the primary scripts. They are the scripts that actually perform the
   &quot;actions&quot;. The list of actions, as well as additional environment
   variables they support, are described in the
  @@ -526,9 +526,9 @@
   arguments as well. See <a href="#tomcat_task_args">Tomcat Task Arguments</a>
   for those details.</p>
   
  -<h3><a name="tomcat_actions">tomcat.sh/tomcat.bat Actions</a></h3>
  +<h3><a name="tomcat_actions">tomcat/tomcat.bat Actions</a></h3>
   
  -<p>The <code>tomcat.sh</code> shell script and <code>tomcat.bat</code>
batch
  +<p>The <code>tomcat</code> shell script and <code>tomcat.bat</code>
batch
   files contain the code that invokes the various features of Tomcat 3.3.  It
   supports a number of actions specified by the first argument.  The following
   table lists the supported actions. Almost all of the actions involve starting
  @@ -544,7 +544,7 @@
   sign. If you need an additional system property setting, you will need to
   modify your <code>tomcat.bat</code> to include it on the command line.</p>
   
  -<h4>Actions supported by the tomcat.sh and tomcat.bat scripts</h4>
  +<h4>Actions supported by the tomcat and tomcat.bat scripts</h4>
   <table border="1">
     <tr><th bgcolor="#c0c0c0">Action</th><th bgcolor="#c0c0c0">Description</th></tr>
     <tr><td>start</td><td>This action starts up Tomcat in the background
on Unix
  @@ -580,7 +580,7 @@
   
   <p>Except for the <code>env</code> action, each action corresponds to
a
   &quot;task&quot; supported by the <code>org.apache.tomcat.startup.Main</code>
  -class. The <code>tomcat.sh</code> and <code>tomcat.bat</code> files,
as well
  +class. The <code>tomcat</code> and <code>tomcat.bat</code> files,
as well
   as the files that call them, will pass additional arguments on the command line
   to the <code>Main</code> class as arguments. See the next section for what
   arguments are supported by each of the tasks.</p>
  @@ -703,7 +703,7 @@
   arguments is a ContextManager property name and the next command line argument
   is its value.  Thus a command such as:</p>
   
  -<pre>bin/startup.sh myprop myvalue</pre>
  +<pre>bin/startup myprop myvalue</pre>
   
   <p>would define a ContextManager property named &quot;myprop&quot; with a
   String value of &quot;myvalue&quot;.  ContextManager properties can used for
  @@ -1432,7 +1432,7 @@
   <code>trusted</code> attribute to <code>true</code>.  You can do
this from
   the command line using the &quot;tomcat&quot; script/batch file and the
   <code>enableAdmin</code> action (see
  -<a href="#tomcat_actions">tomcat.sh/tomcat.bat Actions</a> for details).
  +<a href="#tomcat_actions">tomcat/tomcat.bat Actions</a> for details).
   The <code>trusted</code> attribute is set <code>false</code> by
default for
   security reasons.  When you change it to <code>true</code>, it is also
   recommended that you change the password in the
  
  
  
  1.4       +1 -1      jakarta-tomcat/src/doc/appdev/processes.html
  
  Index: processes.html
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/doc/appdev/processes.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- processes.html	21 Oct 2001 04:21:36 -0000	1.3
  +++ processes.html	18 Apr 2002 13:58:00 -0000	1.4
  @@ -214,7 +214,7 @@
   Assuming you have integrated your application as described earlier, this
   is very simple.  Under Unix, simply execute:
   <pre>
  -	$TOMCAT_HOME/bin/startup.sh
  +	$TOMCAT_HOME/bin/startup
   </pre>
   
   <p>or, under Windows, execute:
  
  
  
  1.2       +3 -3      jakarta-tomcat/src/native/mod_jk/README
  
  Index: README
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/native/mod_jk/README,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- README	26 Aug 2000 01:21:38 -0000	1.1
  +++ README	18 Apr 2002 13:58:00 -0000	1.2
  @@ -1,6 +1,6 @@
   README for mod_jk
   
  -$Id: README,v 1.1 2000/08/26 01:21:38 alex Exp $
  +$Id: README,v 1.2 2002/04/18 13:58:00 keith Exp $
   
   Please see doc/mod_jk-howto.html for more verbose instructions
   
  @@ -66,12 +66,12 @@
      Include TOMCAT_HOME/conf/mod_jk.conf
   
   Note that Tomcat must be started *before* Apache for mod_jk to
  -initialize correctly.  Since "tomcat.sh start" launches Tomcat in the
  +initialize correctly.  Since "tomcat start" launches Tomcat in the
   background, you may have to do something like the following in your
   startup script:
   
   	cd $TOMCAT_HOME/bin
  -	./tomcat.sh start
  +	./tomcat start
   	sleep 4
   	$APACHE_HOME/bin/apachectl start
   
  
  
  
  1.6       +2 -2      jakarta-tomcat/src/shell/jspc.sh
  
  Index: jspc.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/shell/jspc.sh,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- jspc.sh	27 Sep 2001 12:40:35 -0000	1.5
  +++ jspc.sh	18 Apr 2002 13:58:01 -0000	1.6
  @@ -1,10 +1,10 @@
   #!/bin/sh
   #
  -# $Id: jspc.sh,v 1.5 2001/09/27 12:40:35 hgomez Exp $
  +# $Id: jspc.sh,v 1.6 2002/04/18 13:58:01 keith Exp $
   
   # Shell script to runt JspC
   
   
   BASEDIR=`dirname $0`
   
  -$BASEDIR/tomcat.sh jspc "$@"
  +$BASEDIR/tomcat jspc "$@"
  
  
  
  1.5       +2 -2      jakarta-tomcat/src/shell/shutdown.sh
  
  Index: shutdown.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/shell/shutdown.sh,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- shutdown.sh	17 Sep 2001 04:59:32 -0000	1.4
  +++ shutdown.sh	18 Apr 2002 13:58:01 -0000	1.5
  @@ -1,9 +1,9 @@
   #! /bin/sh
   #
  -# $Id: shutdown.sh,v 1.4 2001/09/17 04:59:32 costin Exp $
  +# $Id: shutdown.sh,v 1.5 2002/04/18 13:58:01 keith Exp $
   
   # Shell script to shutdown the server
   
   BASEDIR=`dirname $0`
   
  -$BASEDIR/tomcat.sh stop $@
  +$BASEDIR/tomcat stop $@
  
  
  
  1.5       +2 -2      jakarta-tomcat/src/shell/startup.sh
  
  Index: startup.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/shell/startup.sh,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- startup.sh	17 Sep 2001 04:59:32 -0000	1.4
  +++ startup.sh	18 Apr 2002 13:58:01 -0000	1.5
  @@ -1,9 +1,9 @@
   #! /bin/sh
   #
  -# $Id: startup.sh,v 1.4 2001/09/17 04:59:32 costin Exp $
  +# $Id: startup.sh,v 1.5 2002/04/18 13:58:01 keith Exp $
   
   # Shell script to startup the server
   
   BASEDIR=`dirname $0`
   
  -$BASEDIR/tomcat.sh start $@
  +$BASEDIR/tomcat start $@
  
  
  
  1.33      +4 -4      jakarta-tomcat/src/shell/tomcat.sh
  
  Index: tomcat.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.sh,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- tomcat.sh	31 Jan 2002 03:58:13 -0000	1.32
  +++ tomcat.sh	18 Apr 2002 13:58:01 -0000	1.33
  @@ -1,6 +1,6 @@
   #!/bin/sh
   #
  -# $Id: tomcat.sh,v 1.32 2002/01/31 03:58:13 larryi Exp $
  +# $Id: tomcat.sh,v 1.33 2002/04/18 13:58:01 keith Exp $
   
   # Shell script to start and stop the server
   
  @@ -20,7 +20,7 @@
   
   # -------------------- Guess TOMCAT_HOME --------------------
   DEBUG_HOMEFIND=false
  -# Follow symbolic links to the real tomcat.sh
  +# Follow symbolic links to the real tomcat
   # Extract the base dir.
   # Look in well-known places if this fails
   if [ "$TOMCAT_INSTALL" = "" ] ; then
  @@ -40,7 +40,7 @@
     
     TOMCAT_INSTALL_1=`dirname "$PRG"`/..
     if [ "$DEBUG_HOMEFIND" != "false" ] ; then
  -    echo "Guessing TOMCAT_INSTALL from tomcat.sh to ${TOMCAT_INSTALL_1}" 
  +    echo "Guessing TOMCAT_INSTALL from tomcat to ${TOMCAT_INSTALL_1}" 
     fi
       if [ -d ${TOMCAT_INSTALL_1}/lib ] ; then 
           TOMCAT_INSTALL=${TOMCAT_INSTALL_1}
  @@ -235,7 +235,7 @@
       (cd $TOMCAT_HOME; $JAVACMD $JSPC_OPTS -Dtomcat.home=${TOMCAT_HOME} org.apache.jasper.JspC
$@ )
   
   elif [ "$1" = "env" ] ; then 
  -  ## Call it with source tomcat.sh to set the env for tomcat
  +  ## Call it with source tomcat to set the env for tomcat
     shift 
     echo Setting classpath to: ${CLASSPATH}
     # -------------------- Add all classes in common, container, apps - 
  
  
  
  1.52      +3 -3      jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml
  
  Index: test-tomcat.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- test-tomcat.xml	7 Feb 2002 04:01:07 -0000	1.51
  +++ test-tomcat.xml	18 Apr 2002 13:58:01 -0000	1.52
  @@ -1,12 +1,12 @@
   <project name="TestRun" default="client">
      <!-- 
           To test tomcat standalone, type:
  -          bin/tomcat.sh ant -f conf/test-tomcat.xml client
  +          bin/tomcat ant -f conf/test-tomcat.xml client
           or for Windows systems, type:
             bin\tomcat.bat ant -f conf/test-tomcat.xml client
           
           To test apache, type:
  -          bin/tomcat.sh ant -f conf/test-tomcat.xml -Dport=<your port> -Dhttp.protocol=HTTP/1.1
client-apache
  +          bin/tomcat ant -f conf/test-tomcat.xml -Dport=<your port> -Dhttp.protocol=HTTP/1.1
client-apache
           or for Windows systems, type:
             bin/tomcat.bat ant -f conf/test-tomcat.xml -Dport=<your port> -Dhttp.protocol=HTTP/1.1
client-apache
   	  Specify <your port> from "Port" setting in apache's httpd.conf file.
  @@ -16,7 +16,7 @@
           early tests.
       -->
   
  -     <property name="revision" value="$Revision: 1.51 $" />  
  +     <property name="revision" value="$Revision: 1.52 $" />  
        <property name="host" value="127.0.0.1" />
        <property name="port"     value="8080" />
        <property name="colonPort" value=":${port}" />
  
  
  

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


Mime
View raw message