packages (DEVEL): tomcat/apache-tomcat.init, tomcat/tomcat-context.xml.patc...

[baggins]

Author: baggins                      Date: Thu Mar 17 22:52:49 2011 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- set swallowOutput=true to redirect System.out to logger
- use logging.properties for logging
- use catalina.out as a last resort sinkhole

---- Files affected:
packages/tomcat:
   apache-tomcat.init (1.19.2.1 -> 1.19.2.2) , tomcat-context.xml.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/tomcat/apache-tomcat.init
diff -u packages/tomcat/apache-tomcat.init:1.19.2.1 packages/tomcat/apache-tomcat.init:1.19.2.2
--- packages/tomcat/apache-tomcat.init:1.19.2.1	Tue Dec  7 00:14:19 2010
+++ packages/tomcat/apache-tomcat.init	Thu Mar 17 23:52:43 2011
@@ -47,9 +47,7 @@
 
 JSVC_OPTS="-classpath ${CLASSPATH} \
 	-home ${JAVA_HOME} \
-	-pidfile /var/run/tomcat.pid \
-	-outfile /var/log/tomcat/catalina.out \
-	-errfile /var/log/tomcat/catalina.err"
+	-pidfile /var/run/tomcat.pid"
 
 if is_yes "${SECURITY_MANAGER}"; then
 	CATALINA_OPTS="$CATALINA_OPTS \
@@ -73,8 +71,10 @@
 			-Dcatalina.home=${CATALINA_HOME} \
 			-Djava.io.tmpdir=${CATALINA_TMPDIR} \
 			-Djava.library.path=/usr/lib64:/usr/lib \
+			-Djava.util.logging.config.file="${CATALINA_BASE}/conf/logging.properties" \
+			-Djava.util.logging.manager="org.apache.juli.ClassLoaderLogManager" \
 			$CATALINA_OPTS \
-			org.apache.catalina.startup.Bootstrap
+			org.apache.catalina.startup.Bootstrap >> /var/log/tomcat/catalina.out 2>&1
 		[ $? -ne 0 ] && RETVAL=1
 		if [ $RETVAL -eq 0 ]; then
 		   	ok

================================================================
Index: packages/tomcat/tomcat-context.xml.patch
diff -u /dev/null packages/tomcat/tomcat-context.xml.patch:1.1
--- /dev/null	Thu Mar 17 23:52:49 2011
+++ packages/tomcat/tomcat-context.xml.patch	Thu Mar 17 23:52:43 2011
@@ -0,0 +1,11 @@
+--- apache-tomcat-7.0.11-src/conf/context.xml~	2011-03-10 12:16:35.000000000 +0100
++++ apache-tomcat-7.0.11-src/conf/context.xml	2011-03-17 23:49:31.208011844 +0100
+@@ -16,7 +16,7 @@
+   limitations under the License.
+ -->
+ <!-- The contents of this file will be loaded for each web application -->
+-<Context>
++<Context swallowOutput="true">
+ 
+     <!-- Default set of monitored resources -->
+     <WatchedResource>WEB-INF/web.xml</WatchedResource>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/apache-tomcat.init?r1=1.19.2.1&r2=1.19.2.2&f=u