Think I did this right, didn't I? (I diff'ed my changes against
tomcat_404_b2 jakarta-tomcat-4.0/catalina/src/bin/catalina.sh)
The patchfile is attached:
-Mark
Mark Diggory wrote:
> Which Tag is for 4.0.4 ? (tomcat_404_b2_01 or tomcat_404_b2)
>
> or do I want to do it against 4.1 (HEAD)
>
> -Mark
>
> GOMEZ Henri wrote:
>
>>>> BTW, as rpm packager I'm trying to works closely with projects to
>>>> have such add-ons included directly in original tarball which
>>>> help developpers fixes problems of rpm users.
>>>>
>>>>
>>> I'm all for that. Do you know who is currently managing the
>>> /usr/bin/dtomcat file in the current tarball? Maybe they can get in
>>> on the conversation.
>>>
>>
>> dtomcat is just the rpm renaming of original catalina.sh...
Index: catalina.sh
===================================================================
RCS file: /home/cvspublic/jakarta-tomcat-4.0/catalina/src/bin/catalina.sh,v
retrieving revision 1.20.2.3
diff -u -r1.20.2.3 catalina.sh
--- catalina.sh 19 Mar 2002 18:24:36 -0000 1.20.2.3
+++ catalina.sh 30 Apr 2002 17:39:06 -0000
@@ -17,6 +17,9 @@
# the JVM should use (java.io.tmpdir). Defaults to
# $CATALINA_BASE/temp.
#
+# CATALINA_LOG (Optional) Provides alternate output locations for StandardOut
+# and StandardErr
+#
# JAVA_HOME Must point at your Java Development Kit installation.
#
# JAVA_OPTS (Optional) Java runtime options used when the "start",
@@ -94,6 +97,11 @@
CATALINA_TMPDIR="$CATALINA_BASE"/temp
fi
+if [ -z "$CATALINA_LOG" ] ; then
+ # Define the default location for StandardErr and StandardOut to use for Catalina
+ CATALINA_LOG="$CATALINA_BASE"/logs/catalina.out
+fi
+
# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
@@ -107,6 +115,7 @@
echo "Using CATALINA_BASE: $CATALINA_BASE"
echo "Using CATALINA_HOME: $CATALINA_HOME"
echo "Using CATALINA_TMPDIR: $CATALINA_TMPDIR"
+echo "Using CATALINA_LOG: $CATALINA_LOG"
echo "Using JAVA_HOME: $JAVA_HOME"
if [ "$1" = "jpda" ] ; then
@@ -197,7 +206,7 @@
-Dcatalina.home="$CATALINA_HOME" \
-Djava.io.tmpdir="$CATALINA_TMPDIR" \
org.apache.catalina.startup.Bootstrap "$@" start \
- >> "$CATALINA_BASE"/logs/catalina.out 2>&1 &
+ >> "$CATALINA_LOG" 2>&1 &
else
"$_RUNJAVA" $JAVA_OPTS $CATALINA_OPTS \
-Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
@@ -205,7 +214,7 @@
-Dcatalina.home="$CATALINA_HOME" \
-Djava.io.tmpdir="$CATALINA_TMPDIR" \
org.apache.catalina.startup.Bootstrap "$@" start \
- >> "$CATALINA_BASE"/logs/catalina.out 2>&1 &
+ >> "$CATALINA_LOG" 2>&1 &
fi
elif [ "$1" = "stop" ] ; then
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
