head	1.2;
access;
symbols
	RELEASE_7_4_0:1.1
	RELEASE_8_2_0:1.1;
locks; strict;
comment	@# @;


1.2
date	2011.07.19.22.45.27;	author ohauer;	state dead;
branches;
next	1.1;

1.1
date	2010.12.12.18.46.12;	author pgollucci;	state Exp;
branches;
next	;


desc
@@


1.2
log
@- fix cronolog processing option [1]
- improve pidfile handling in rc script [2]

PR:		ports/158237 [1], ports/158410 [2]
Submitted by:	Jason Helfman <jhelfman _at_ experts-exchange.com> (maintainer) [1]
		Phil Phillips <pphillips _at_ experts-exchange.com> [2]
Approved by:	maintainer
@
text
@--- bin/catalina.sh.orig	2010-09-04 12:53:47.000000000 -0700
+++ bin/catalina.sh	2010-12-08 16:10:30.000000000 -0800
@@@@ -245,7 +245,9 @@@@
         -Dcatalina.base="$CATALINA_BASE" \
         -Dcatalina.home="$CATALINA_HOME" \
         -Djava.io.tmpdir="$CATALINA_TMPDIR" \
-        org.apache.catalina.startup.Bootstrap "$@@" start
+	org.apache.catalina.startup.Bootstrap "$@@" start %%REDIRECT%% \
+	| "%%LOG_PROCESSOR%%" "%%LOG_PROCESSOR_OPTS%%" "%%LOG_PROCESSOR_DIRECTIVES%%" &
+
     else
       exec "$_RUNJDB" "$LOGGING_CONFIG" $JAVA_OPTS  $CATALINA_OPTS \
         -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
@@@@ -253,7 +255,8 @@@@
         -Dcatalina.base="$CATALINA_BASE" \
         -Dcatalina.home="$CATALINA_HOME" \
         -Djava.io.tmpdir="$CATALINA_TMPDIR" \
-        org.apache.catalina.startup.Bootstrap "$@@" start
+	org.apache.catalina.startup.Bootstrap "$@@" start %%REDIRECT%% \
+	| "%%LOG_PROCESSOR%%" "%%LOG_PROCESSOR_OPTS%%" "%%LOG_PROCESSOR_DIRECTIVES%%" &
     fi
   fi
 
@@@@ -272,14 +275,16 @@@@
       -Dcatalina.base="$CATALINA_BASE" \
       -Dcatalina.home="$CATALINA_HOME" \
       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
-      org.apache.catalina.startup.Bootstrap "$@@" start
+      org.apache.catalina.startup.Bootstrap "$@@" start %%REDIRECT%% \
+      | "%%LOG_PROCESSOR%%" "%%LOG_PROCESSOR_OPTS%%" "%%LOG_PROCESSOR_DIRECTIVES%%" &
   else
     exec "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS  $CATALINA_OPTS \
       -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
       -Dcatalina.base="$CATALINA_BASE" \
       -Dcatalina.home="$CATALINA_HOME" \
       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
-      org.apache.catalina.startup.Bootstrap "$@@" start
+      org.apache.catalina.startup.Bootstrap "$@@" start %%REDIRECT%% \
+      | "%%LOG_PROCESSOR%%" "%%LOG_PROCESSOR_OPTS%%" "%%LOG_PROCESSOR_DIRECTIVES%%" &
   fi
 
 elif [ "$1" = "start" ] ; then
@@@@ -298,8 +303,8 @@@@
       -Dcatalina.base="$CATALINA_BASE" \
       -Dcatalina.home="$CATALINA_HOME" \
       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
-      org.apache.catalina.startup.Bootstrap "$@@" start \
-      >> "$CATALINA_OUT" 2>&1 &
+      org.apache.catalina.startup.Bootstrap "$@@" start %%REDIRECT%% \
+      | "%%LOG_PROCESSOR%%" "%%LOG_PROCESSOR_OPTS%%" "%%LOG_PROCESSOR_DIRECTIVES%%" &
 
       if [ ! -z "$CATALINA_PID" ]; then
         echo $! > $CATALINA_PID
@@@@ -310,8 +315,8 @@@@
       -Dcatalina.base="$CATALINA_BASE" \
       -Dcatalina.home="$CATALINA_HOME" \
       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
-      org.apache.catalina.startup.Bootstrap "$@@" start \
-      >> "$CATALINA_OUT" 2>&1 &
+      org.apache.catalina.startup.Bootstrap "$@@" start %%REDIRECT%% \
+      | "%%LOG_PROCESSOR%%" "%%LOG_PROCESSOR_OPTS%%" "%%LOG_PROCESSOR_DIRECTIVES%%" &
 
       if [ ! -z "$CATALINA_PID" ]; then
         echo $! > $CATALINA_PID
@@@@ -332,7 +337,8 @@@@
     -Dcatalina.base="$CATALINA_BASE" \
     -Dcatalina.home="$CATALINA_HOME" \
     -Djava.io.tmpdir="$CATALINA_TMPDIR" \
-    org.apache.catalina.startup.Bootstrap "$@@" stop
+    org.apache.catalina.startup.Bootstrap "$@@" stop %%REDIRECT%% \
+      | "%%LOG_PROCESSOR%%" "%%LOG_PROCESSOR_OPTS%%" "%%LOG_PROCESSOR_DIRECTIVES%%" &
 
   if [ $FORCE -eq 1 ]; then
     if [ ! -z "$CATALINA_PID" ]; then
@


1.1
log
@- add forgotten file
@
text
@@

