You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by pi...@apache.org on 2001/08/14 20:50:10 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util CGIProcessEnvironment.java
pier 01/08/14 11:50:10
Modified: . RELEASE-NOTES-4.0-B8.txt
catalina/docs/appdev build.xml.txt deployment.html
installation.html processes.html source.html
catalina/docs/appdev/sample build.bat build.sh build.xml
catalina/docs/dev/xdocs building.xml
catalina/src/share/org/apache/catalina/servlets
CGIServlet.java
catalina/src/share/org/apache/catalina/util
CGIProcessEnvironment.java
Log:
Changed references to TOMCAT_HOME into CATALINA_HOME. Thanks to Dennis
Doubleday <dday at mail.yourfit.com> for noticing.
Revision Changes Path
1.3 +12 -4 jakarta-tomcat-4.0/RELEASE-NOTES-4.0-B8.txt
Index: RELEASE-NOTES-4.0-B8.txt
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/RELEASE-NOTES-4.0-B8.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RELEASE-NOTES-4.0-B8.txt 2001/08/10 14:14:15 1.2
+++ RELEASE-NOTES-4.0-B8.txt 2001/08/14 18:50:09 1.3
@@ -3,7 +3,7 @@
Release Notes
=============
-$Id: RELEASE-NOTES-4.0-B8.txt,v 1.2 2001/08/10 14:14:15 pier Exp $
+$Id: RELEASE-NOTES-4.0-B8.txt,v 1.3 2001/08/14 18:50:09 pier Exp $
============
@@ -72,6 +72,14 @@
BUG FIXES AND IMPROVEMENTS:
==========================
+------------------
+Generic Bug Fixes:
+------------------
+
+Documentation: Updated all references to TOMCAT_HOME in the documentation to
+be CATALINA_HOME. (Thanks to Dennis Doubleday for noticing)
+
+
------------------
Catalina Bug Fixes:
@@ -107,12 +115,12 @@
* If you wish to make the JAXP/1.1 RI XML parser available to all web
applications, simply move the "jaxp.jar" and "crimson.jar" files from
- the "$TOMCAT_HOME/jasper" directory to the "$TOMCAT_HOME/lib" directory.
+ the "$CATALINA_HOME/jasper" directory to the "$CATALINA_HOME/lib" directory.
* If you wish to make another XML parser that is JAXP/1.1-compatible
available to all web applications, install that parser into the
- "$TOMCAT_HOME/lib" directory and remove "jaxp.jar" and "crimson.jar"
- from the "$TOMCAT_HOME/jasper" directory. It has been reported that
+ "$CATALINA_HOME/lib" directory and remove "jaxp.jar" and "crimson.jar"
+ from the "$CATALINA_HOME/jasper" directory. It has been reported that
Xerces 1.3.1 can be used in this fashion, but 2.x alpha releases
can not be.
1.2 +3 -3 jakarta-tomcat-4.0/catalina/docs/appdev/build.xml.txt
Index: build.xml.txt
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/docs/appdev/build.xml.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml.txt 2001/02/14 22:26:33 1.1
+++ build.xml.txt 2001/08/14 18:50:09 1.2
@@ -16,7 +16,7 @@
build file. The values specified can be overridden at run time by
adding a "-Dname=value" argument to the command line that invokes Ant.
This technique is normally used to copy the values of the ANT_HOME
- and TOMCAT_HOME environment variables into the "ant.home" and
+ and CATALINA_HOME environment variables into the "ant.home" and
"tomcat.home" properties, which are normally not defined explicitly.
app.name Base name of this application, used to
@@ -25,7 +25,7 @@
deploy.home The name of the directory into which the
deployment hierarchy will be created.
Normally, this will be the name of a
- subdirectory under $TOMCAT_HOME/webapps.
+ subdirectory under $CATALINA_HOME/webapps.
dist.home The name of the base directory in which
distribution files are created.
@@ -46,7 +46,7 @@
tomcat.home The name of the base directory in which
Tomcat has been installed. This value is
normally set automatically from the value
- of the TOMCAT_HOME environment variable.
+ of the CATALINA_HOME environment variable.
In the example below, the application being developed will be deployed
to a subdirectory named "myapp", and will therefore be accessible at:
1.2 +4 -4 jakarta-tomcat-4.0/catalina/docs/appdev/deployment.html
Index: deployment.html
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/docs/appdev/deployment.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deployment.html 2001/02/14 22:26:33 1.1
+++ deployment.html 2001/08/14 18:50:09 1.2
@@ -144,13 +144,13 @@
approaches:
<ul>
<li><i>Copy unpacked directory hierarchy into a subdirectory in directory
- <code>$TOMCAT_HOME/webapps/</code></i>. Tomcat will assign a context path
+ <code>$CATALINA_HOME/webapps/</code></i>. Tomcat will assign a context path
to your application based on the subdirectory name you choose. We will
use this technique in the <code>build.xml</code> file that we construct,
because it is the quickest and easiest approach during development.
<br><br>
<li><i>Copy the web application archive file into directory
- <code>$TOMCAT_HOME/webapps/</code></i>. When Tomcat is started, it will
+ <code>$CATALINA_HOME/webapps/</code></i>. When Tomcat is started, it will
automatically expand the web application archive file into its unpacked
form, and execute the application that way. This approach would typically
be used to install an additional application, provided by a third party
@@ -165,14 +165,14 @@
<code>server.xml</code> configuration file</i>. This approach is
described briefly below, and allows you to position the document root
of your web application at some point other than the
- <code>$TOMCAT_HOME/webapps/</code> directory. Doing this requires
+ <code>$CATALINA_HOME/webapps/</code> directory. Doing this requires
the following steps (for Tomcat 4.0):
</ul>
<p>Adding a new <code><Context></code> entry in Tomcat's
<code>server.xml</code> file involves the following steps (for Tomcat 4.0):
<ul>
-<li>Open file <code>$TOMCAT_HOME/conf/server.xml</code> in an editor.
+<li>Open file <code>$CATALINA_HOME/conf/server.xml</code> in an editor.
<br><br>
<li>Navigate to the bottom of the file (after the last existing
<code><Context></code> element).
1.2 +1 -1 jakarta-tomcat-4.0/catalina/docs/appdev/installation.html
Index: installation.html
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/docs/appdev/installation.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- installation.html 2001/02/14 22:26:33 1.1
+++ installation.html 2001/08/14 18:50:09 1.2
@@ -64,7 +64,7 @@
<li>You have added directory <code>$JAVA_HOME/bin</code> to your
<code>PATH</code> environment variable, so that the <code>java</code>
command is recognized and executed.
-<li>The <code>TOMCAT_HOME</code> environment variable points at the base
+<li>The <code>CATALINA_HOME</code> environment variable points at the base
directory where you have installed Tomcat (for example,
<code>/opt/tomcat</code> or <code>/usr/local/tomcat</code>).
</ul>
1.2 +4 -4 jakarta-tomcat-4.0/catalina/docs/appdev/processes.html
Index: processes.html
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/docs/appdev/processes.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- processes.html 2001/02/14 22:26:34 1.1
+++ processes.html 2001/08/14 18:50:09 1.2
@@ -125,9 +125,9 @@
Any of the proposed techniques can be used. For our purposes, we will assume
that you are using the first approach (unpacked hierarchy), because we set
the deployment home to be an appropriate directory under the
-<code>$TOMCAT_HOME/webapps</code> directory. With multiple developers, it
+<code>$CATALINA_HOME/webapps</code> directory. With multiple developers, it
is easiest to install Tomcat separately for each of them, so that they can
-have their own TOMCAT_HOME (as well as start and stop Tomcat) independently.
+have their own CATALINA_HOME (as well as start and stop Tomcat) independently.
<!-- 5.3 Edit -->
@@ -214,12 +214,12 @@
Assuming you have integrated your application as described earlier, this
is very simple. Under Unix, simply execute:
<pre>
- $TOMCAT_HOME/bin/startup.sh
+ $CATALINA_HOME/bin/startup.sh
</pre>
<p>or, under Windows, execute:
<pre>
- %TOMCAT_HOME%\bin\startup
+ %CATALINA_HOME%\bin\startup
</pre>
<p>This command starts Tomcat as a background process. Now, point your
1.2 +9 -9 jakarta-tomcat-4.0/catalina/docs/appdev/source.html
Index: source.html
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/docs/appdev/source.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- source.html 2001/02/14 22:26:34 1.1
+++ source.html 2001/08/14 18:50:09 1.2
@@ -208,16 +208,16 @@
<pre>
#!/bin/sh
# build -- Build Script for the "Hello, World" Application
-# $Id: source.html,v 1.1 2001/02/14 22:26:34 remm Exp $
+# $Id: source.html,v 1.2 2001/08/14 18:50:09 pier Exp $
# Identify the custom class path components we need
-CP=$TOMCAT_HOME/lib/ant.jar:$TOMCAT_HOME/lib/servlet.jar
-CP=$CP:$TOMCAT_HOME/lib/jaxp.jar:$TOMCAT_HOME/lib/parser.jar
+CP=$CATALINA_HOME/lib/ant.jar:$CATALINA_HOME/lib/servlet.jar
+CP=$CP:$CATALINA_HOME/lib/jaxp.jar:$CATALINA_HOME/lib/parser.jar
CP=$CP:$JAVA_HOME/lib/tools.jar
# Execute ANT to perform the requested build target
java -classpath $CP:$CLASSPATH org.apache.tools.ant.Main \
- -Dtomcat.home=$TOMCAT_HOME "$@"
+ -Dtomcat.home=$CATALINA_HOME "$@"
</pre>
<p>On Windows-based systems, the following script should be saved as file
@@ -227,17 +227,17 @@
<pre>
@echo off
rem build.bat -- Build Script for the "Hello, World" Application
-rem $Id: source.html,v 1.1 2001/02/14 22:26:34 remm Exp $
+rem $Id: source.html,v 1.2 2001/08/14 18:50:09 pier Exp $
set _CP=%CP%
rem Identify the custom class path components we need
-set CP=%TOMCAT_HOME%\lib\ant.jar;%TOMCAT_HOME%\lib\servlet.jar
-set CP=%TOMCAT_HOME%\lib\jaxp.jar;%TOMCAT_HOME%\lib\parser.jar
+set CP=%CATALINA_HOME%\lib\ant.jar;%CATALINA_HOME%\lib\servlet.jar
+set CP=%CATALINA_HOME%\lib\jaxp.jar;%CATALINA_HOME%\lib\parser.jar
set CP=%CP%;%JAVA_HOME%\lib\tools.jar
rem Execute ANT to perform the requird build target
-java -classpath %CP%;%CLASSPATH% org.apache.tools.ant.Main -Dtomcat.home=%TOMCAT_HOME% %1 %2 %3 %4 %5 %6 %7 %8 %9
+java -classpath %CP%;%CLASSPATH% org.apache.tools.ant.Main -Dtomcat.home=%CATALINA_HOME% %1 %2 %3 %4 %5 %6 %7 %8 %9
set CP=%_CP%
set _CP=
@@ -245,7 +245,7 @@
<p>Build script customizations you might consider include:
<ul>
-<li>Setting the JAVA_HOME and TOMCAT_HOME environment variables (probably
+<li>Setting the JAVA_HOME and CATALINA_HOME environment variables (probably
near the top of the script) if they are not defined already.
<br><br>
<li>Overriding properties defined in the <code>build.xml</code> file
1.2 +4 -4 jakarta-tomcat-4.0/catalina/docs/appdev/sample/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/docs/appdev/sample/build.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.bat 2001/02/14 22:26:35 1.1
+++ build.bat 2001/08/14 18:50:09 1.2
@@ -1,16 +1,16 @@
@echo off
rem build.bat -- Build Script for the "Hello, World" Application
-rem $Id: build.bat,v 1.1 2001/02/14 22:26:35 remm Exp $
+rem $Id: build.bat,v 1.2 2001/08/14 18:50:09 pier Exp $
set _CP=%CP%
rem Identify the custom class path components we need
-set CP=%TOMCAT_HOME%\lib\ant.jar;%TOMCAT_HOME%\lib\servlet.jar
-set CP=%TOMCAT_HOME%\lib\jaxp.jar;%TOMCAT_HOME%\lib\parser.jar
+set CP=%CATALINA_HOME%\lib\ant.jar;%CATALINA_HOME%\lib\servlet.jar
+set CP=%CATALINA_HOME%\lib\jaxp.jar;%CATALINA_HOME%\lib\parser.jar
set CP=%CP%;%JAVA_HOME%\lib\tools.jar
rem Execute ANT to perform the requird build target
-java -classpath %CP%;%CLASSPATH% org.apache.tools.ant.Main -Dtomcat.home=%TOMCAT_HOME% %1 %2 %3 %4 %5 %6 %7 %8 %9
+java -classpath %CP%;%CLASSPATH% org.apache.tools.ant.Main -Dtomcat.home=%CATALINA_HOME% %1 %2 %3 %4 %5 %6 %7 %8 %9
set CP=%_CP%
set _CP=
1.2 +4 -4 jakarta-tomcat-4.0/catalina/docs/appdev/sample/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/docs/appdev/sample/build.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.sh 2001/02/14 22:26:36 1.1
+++ build.sh 2001/08/14 18:50:09 1.2
@@ -1,12 +1,12 @@
#!/bin/sh
# build.sh -- Build Script for the "Hello, World" Application
-# $Id: build.sh,v 1.1 2001/02/14 22:26:36 remm Exp $
+# $Id: build.sh,v 1.2 2001/08/14 18:50:09 pier Exp $
# Identify the custom class path components we need
-CP=$TOMCAT_HOME/lib/ant.jar:$TOMCAT_HOME/lib/servlet.jar
-CP=$CP:$TOMCAT_HOME/lib/jaxp.jar:$TOMCAT_HOME/lib/parser.jar
+CP=$CATALINA_HOME/lib/ant.jar:$CATALINA_HOME/lib/servlet.jar
+CP=$CP:$CATALINA_HOME/lib/jaxp.jar:$CATALINA_HOME/lib/parser.jar
CP=$CP:$JAVA_HOME/lib/tools.jar
# Execute ANT to perform the requested build target
java -classpath $CP:$CLASSPATH org.apache.tools.ant.Main \
- -Dtomcat.home=$TOMCAT_HOME "$@"
+ -Dtomcat.home=$CATALINA_HOME "$@"
1.2 +1 -1 jakarta-tomcat-4.0/catalina/docs/appdev/sample/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/docs/appdev/sample/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 2001/02/14 22:26:36 1.1
+++ build.xml 2001/08/14 18:50:09 1.2
@@ -7,7 +7,7 @@
values for the properties that are defined below.
In particular, it is assumed that you wish to install this
application under context path "/${app.name}" in the Tomcat installation
- defined by your TOMCAT_HOME environment variable.
+ defined by your CATALINA_HOME environment variable.
-->
<property name="app.name" value="myapp"/>
1.3 +21 -21 jakarta-tomcat-4.0/catalina/docs/dev/xdocs/building.xml
Index: building.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/docs/dev/xdocs/building.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- building.xml 2001/05/19 01:07:50 1.2
+++ building.xml 2001/08/14 18:50:10 1.3
@@ -4,7 +4,7 @@
<properties>
<author email="craigmcc@apache.org">Craig McClanahan</author>
<title>Building Catalina</title>
- <revision>$Id: building.xml,v 1.2 2001/05/19 01:07:50 craigmcc Exp $</revision>
+ <revision>$Id: building.xml,v 1.3 2001/08/14 18:50:10 pier Exp $</revision>
</properties>
<body>
@@ -205,23 +205,23 @@
<p>After downloading and installing the Tomcat source code, and all of the
prerequisites listed above, you can build Tomcat by executing the following
- commands (assuming that TOMCAT_HOME is an environment variable containing
+ commands (assuming that CATALINA_HOME is an environment variable containing
the path to the Tomcat 4.0 source repository directory).</p>
<p>On UNIX platforms:</p>
<source>
- cd $TOMCAT_HOME
+ cd $CATALINA_HOME
./build.sh
</source>
<p>On Windows platforms:</p>
<source>
- cd %TOMCAT_HOME%
+ cd %CATALINA_HOME%
build
</source>
<p>On either platform, this script will use the Ant build tool to create
- a runnable version of Tomcat 4.0 in the <code>TOMCAT_HOME/build</code>
+ a runnable version of Tomcat 4.0 in the <code>CATALINA_HOME/build</code>
directory on your computer.</p>
</section>
@@ -230,62 +230,62 @@
<section name="Executing and Testing Your Build">
<p>To execute Tomcat once you have built it, issue one of the following
- commands (assuming that TOMCAT_HOME is an environment variable containing
+ commands (assuming that CATALINA_HOME is an environment variable containing
the path to the Tomcat 4.0 source repository directory).</p>
<p>On UNIX platforms:</p>
<source>
- $TOMCAT_HOME/build/bin/startup.sh
+ $CATALINA_HOME/build/bin/startup.sh
</source>
<p>On Windows platforms:</p>
<source>
- %TOMCAT_HOME%\build\bin\startup
+ %CATALINA_HOME%\build\bin\startup
</source>
<p>To shut down Tomcat once you have started it, issue one of the following
- commands (assuming that TOMCAT_HOME is an environment variable containing
+ commands (assuming that CATALINA_HOME is an environment variable containing
the path to the Tomcat 4.0 source repository directory).</p>
<p>On UNIX platforms:</p>
<source>
- $TOMCAT_HOME/build/bin/shutdown.sh
+ $CATALINA_HOME/build/bin/shutdown.sh
</source>
<p>On Windows platforms:</p>
<source>
- %TOMCAT_HOME%\build\bin\shutdown
+ %CATALINA_HOME%\build\bin\shutdown
</source>
<p>You can also compile and install the unit test suite by executing one
- of the following commands (assuming TOMCAT_HOME is an environment variable
+ of the following commands (assuming CATALINA_HOME is an environment variable
containing the path to the Tomcat 4.0 source repository directory).</p>
<p>On UNIX platforms:</p>
<source>
- cd $TOMCAT_HOME/tester
+ cd $CATALINA_HOME/tester
./build.sh deploy-main
</source>
<p>On Windows platforms:</p>
<source>
- cd %TOMCAT_HOME%\tester
+ cd %CATALINA_HOME%\tester
build deploy-main
</source>
<p>After restarting Tomcat, you can execute the unit test suite by
- executing one of the following commands (assuming TOMCAT_HOME is an
+ executing one of the following commands (assuming CATALINA_HOME is an
environment variable containing the path to the Tomcat 4.0 source
repository directory).</p>
<p>On UNIX platforms:</p>
<source>
- $TOMCAT_HOME/build/bin/tester.sh
+ $CATALINA_HOME/build/bin/tester.sh
</source>
<p>On Windows platforms:</p>
<source>
- %TOMCAT_HOME%\build\bin\tester
+ %CATALINA_HOME%\build\bin\tester
</source>
</section>
@@ -295,23 +295,23 @@
<p>To create a complete binary distribution of Tomcat 4.0 (such as for a
nightly build or a release), execute one of the following commands
- (assuming TOMCAT_HOME is an environment variable containing the path to
+ (assuming CATALINA_HOME is an environment variable containing the path to
the Tomcat 4.0 source repository directory).</p>
<p>On UNIX platforms:</p>
<source>
- cd $TOMCAT_HOME
+ cd $CATALINA_HOME
./build.sh dist
</source>
<p>On Windows platforms:</p>
<source>
- cd %TOMCAT_HOME%
+ cd %CATALINA_HOME%
build dist
</source>
<p>On either platform, this will create a complete binary distribution in
- the <code>$TOMCAT_HOME/dist</code> directory on your computer.</p>
+ the <code>$CATALINA_HOME/dist</code> directory on your computer.</p>
</section>
1.4 +8 -8 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
Index: CGIServlet.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CGIServlet.java 2001/07/22 20:25:11 1.3
+++ CGIServlet.java 2001/08/14 18:50:10 1.4
@@ -1,6 +1,6 @@
/*
- * CGIServlet.java $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java,v 1.3 2001/07/22 20:25:11 pier Exp $
- * $Revision: 1.3 $, $Date: 2001/07/22 20:25:11 $
+ * CGIServlet.java $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java,v 1.4 2001/08/14 18:50:10 pier Exp $
+ * $Revision: 1.4 $, $Date: 2001/08/14 18:50:10 $
*
* ====================================================================
*
@@ -281,7 +281,7 @@
*
* @author Martin T Dengler [root@martindengler.com]
* @author Amy Roh
- * @version $Revision: 1.3 $, $Date: 2001/07/22 20:25:11 $
+ * @version $Revision: 1.4 $, $Date: 2001/08/14 18:50:10 $
* @since Tomcat 4.0
*
*/
@@ -627,7 +627,7 @@
try {
ServletOutputStream out = res.getOutputStream();
out.println("<HTML><HEAD><TITLE>$Name: $</TITLE></HEAD>");
- out.println("<BODY>$Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java,v 1.3 2001/07/22 20:25:11 pier Exp $<p>");
+ out.println("<BODY>$Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java,v 1.4 2001/08/14 18:50:10 pier Exp $<p>");
if (cgiEnv.isValid()) {
out.println(cgiEnv.toString());
@@ -669,7 +669,7 @@
/** For future testing use only; does nothing right now */
public static void main(String[] args) {
- System.out.println("$Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java,v 1.3 2001/07/22 20:25:11 pier Exp $");
+ System.out.println("$Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java,v 1.4 2001/08/14 18:50:10 pier Exp $");
}
@@ -685,7 +685,7 @@
* </p>
*
* @author Martin Dengler [root@martindengler.com]
- * @version $Revision: 1.3 $, $Date: 2001/07/22 20:25:11 $
+ * @version $Revision: 1.4 $, $Date: 2001/08/14 18:50:10 $
* @since Tomcat 4.0
*
*/
@@ -793,7 +793,7 @@
* Example URI:
* <PRE> /servlet/cgigateway/dir1/realCGIscript/pathinfo1 </PRE>
* <ul>
- * <LI><b>path</b> = $TOMCAT_HOME/mywebapp/dir1/realCGIscript
+ * <LI><b>path</b> = $CATALINA_HOME/mywebapp/dir1/realCGIscript
* <LI><b>scriptName</b> = /servlet/cgigateway/dir1/realCGIscript
* <LI><b>cgiName</b> = /dir1/realCGIscript
* <LI><b>name</b> = realCGIscript
@@ -1307,7 +1307,7 @@
* </p>
*
* @author Martin Dengler [root@martindengler.com]
- * @version $Revision: 1.3 $, $Date: 2001/07/22 20:25:11 $
+ * @version $Revision: 1.4 $, $Date: 2001/08/14 18:50:10 $
*/
protected class CGIRunner {
1.3 +4 -4 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/CGIProcessEnvironment.java
Index: CGIProcessEnvironment.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/CGIProcessEnvironment.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CGIProcessEnvironment.java 2001/07/22 20:25:13 1.2
+++ CGIProcessEnvironment.java 2001/08/14 18:50:10 1.3
@@ -1,6 +1,6 @@
/*
-* CGIProcessEnvironment.java $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/CGIProcessEnvironment.java,v 1.2 2001/07/22 20:25:13 pier Exp $
-* $Revision: 1.2 $, $Date: 2001/07/22 20:25:13 $
+* CGIProcessEnvironment.java $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/CGIProcessEnvironment.java,v 1.3 2001/08/14 18:50:10 pier Exp $
+* $Revision: 1.3 $, $Date: 2001/08/14 18:50:10 $
*
* ====================================================================
*
@@ -105,7 +105,7 @@
* Encapsulates the CGI Process' environment and rules to derive
* that environment from the servlet container and request information.
* @author Martin Dengler [root@martindengler.com]
- * @version $Revision: 1.2 $, $Date: 2001/07/22 20:25:13 $
+ * @version $Revision: 1.3 $, $Date: 2001/08/14 18:50:10 $
* @since Tomcat 4.0
*/
@@ -357,7 +357,7 @@
/**
* Resolves core information about the cgi script. <p> Example URI:
* <PRE> /servlet/cgigateway/dir1/realCGIscript/pathinfo1 </PRE> <ul>
- * <LI><b>path</b> = $TOMCAT_HOME/mywebapp/dir1/realCGIscript
+ * <LI><b>path</b> = $CATALINA_HOME/mywebapp/dir1/realCGIscript
* <LI><b>scriptName</b> = /servlet/cgigateway/dir1/realCGIscript</LI>
* <LI><b>cgiName</b> = /dir1/realCGIscript
* <LI><b>name</b> = realCGIscript