[pkg-java] r3325 - branches/tomcat5.5/feature/debian/debian

[Marcus Better]

Author: marcusb-guest
Date: 2007-04-24 13:07:10 +0000 (Tue, 24 Apr 2007)
New Revision: 3325

Modified:
   branches/tomcat5.5/feature/debian/debian/changelog
   branches/tomcat5.5/feature/debian/debian/control
   branches/tomcat5.5/feature/debian/debian/tomcat5.5.init
Log:
Use the new syslog support in jsvc instead of logging to catalina.out. Fixes #402603.


Modified: branches/tomcat5.5/feature/debian/debian/changelog
===================================================================
--- branches/tomcat5.5/feature/debian/debian/changelog	2007-04-24 13:00:33 UTC (rev 3324)
+++ branches/tomcat5.5/feature/debian/debian/changelog	2007-04-24 13:07:10 UTC (rev 3325)
@@ -1,12 +1,9 @@
 tomcat5.5 (5.5.20-5) unstable; urgency=low
 
-  * The named pipe "/var/log/tomcat5.5/catalina.out" is no longer
-    created. Messages written to stdout and stderr during daemon startup
-    are now lost. The -debug flag to jsvc may be used for early
-    debugging. A proper solution is planned for future releases. (Closes:
-    #402603)
+  * Messages are now logged to the system log instead of the pipe
+    "/var/log/tomcat5.5/catalina.out". (Closes: #402603)
 
- -- Marcus Better <marcus at better.se>  Wed, 13 Dec 2006 20:05:48 +0100
+ -- Marcus Better <marcus at better.se>  Tue, 24 Apr 2007 15:04:17 +0200
 
 tomcat5.5 (5.5.20-4) unstable; urgency=low
 

Modified: branches/tomcat5.5/feature/debian/debian/control
===================================================================
--- branches/tomcat5.5/feature/debian/debian/control	2007-04-24 13:00:33 UTC (rev 3324)
+++ branches/tomcat5.5/feature/debian/debian/control	2007-04-24 13:07:10 UTC (rev 3325)
@@ -11,7 +11,7 @@
 
 Package: tomcat5.5
 Architecture: all
-Depends: java-gcj-compat-dev (>= 1.0.30-5) | kaffe (>= 2:1.1.6-3) | java2-runtime, libtomcat5.5-java (>= ${Source-Version}), adduser (>= 3.34), ecj-bootstrap, jsvc
+Depends: java-gcj-compat-dev (>= 1.0.30-5) | kaffe (>= 2:1.1.6-3) | java2-runtime, libtomcat5.5-java (>= ${Source-Version}), adduser (>= 3.34), ecj-bootstrap, jsvc (>= 1.0.2~svn20061127-5)
 Suggests: java-virtual-machine, libapache-mod-jk | libapache2-mod-jk, tomcat5.5-webapps (>= ${Source-Version}), tomcat5.5-admin (>= ${Source-Version})
 Description: Servlet and JSP engine
  Apache Tomcat is the reference implementation for the Java Servlet

Modified: branches/tomcat5.5/feature/debian/debian/tomcat5.5.init
===================================================================
--- branches/tomcat5.5/feature/debian/debian/tomcat5.5.init	2007-04-24 13:00:33 UTC (rev 3324)
+++ branches/tomcat5.5/feature/debian/debian/tomcat5.5.init	2007-04-24 13:07:10 UTC (rev 3325)
@@ -146,6 +146,7 @@
 			"$CATALINA_BASE/logs/catalina.out" || true
 
 		$DAEMON -user "$TOMCAT5_USER" -cp "$JSVC_CLASSPATH" \
+		    -outfile SYSLOG -errfile SYSLOG \
 		    -pidfile "$CATALINA_PID" $JAVA_OPTS "$BOOTSTRAP_CLASS"
 	else
 	        log_progress_msg "(already running)"