Author: ludovicc-guest
Date: 2010-02-04 00:11:53 +0000 (Thu, 04 Feb 2010)
New Revision: 11498
Added:
trunk/tomcat6/debian/patches/allow-empty-pid-file.patch
Modified:
trunk/tomcat6/debian/patches/disable-ajp-connector.patch
trunk/tomcat6/debian/patches/disable-apr-loading.patch
trunk/tomcat6/debian/patches/series
trunk/tomcat6/debian/patches/use-commons-dbcp.patch
trunk/tomcat6/debian/tomcat6.init
Log:
* Fix startup sequence with init.d
Added: trunk/tomcat6/debian/patches/allow-empty-pid-file.patch
===================================================================
--- trunk/tomcat6/debian/patches/allow-empty-pid-file.patch
(rev 0)
+++ trunk/tomcat6/debian/patches/allow-empty-pid-file.patch 2010-02-04
00:11:53 UTC (rev 11498)
@@ -0,0 +1,29 @@
+--- a/bin/catalina.sh
++++ b/bin/catalina.sh
+@@ -305,7 +305,7 @@
+ elif [ "$1" = "start" ] ; then
+
+ if [ ! -z "$CATALINA_PID" ]; then
+- if [ -f "$CATALINA_PID" ]; then
++ if [ -s "$CATALINA_PID" ]; then
+ echo "PID file ($CATALINA_PID) found. Is Tomcat still running? Start
aborted."
+ exit 1
+ fi
+@@ -363,12 +363,16 @@
+ fi
+
+ if [ ! -z "$CATALINA_PID" ]; then
+- if [ -f "$CATALINA_PID" ]; then
++ if [ -s "$CATALINA_PID" ]; then
+ kill -0 `cat $CATALINA_PID` >/dev/null 2>&1
+ if [ $? -eq 1 ]; then
+ echo "PID file ($CATALINA_PID) found but no matching process was
found. Stop aborted."
+ exit 1
+ fi
++ elif [ -f "$CATALINA_PID" ]; then
++ rm $CATALINA_PID
++ echo "\$CATALINA_PID was set ($CATALINA_PID) but the specified file
is empty. Did Tomcat fail while starting? Stop aborted."
++ exit 1
+ else
+ echo "\$CATALINA_PID was set ($CATALINA_PID) but the specified file
does not exist. Is Tomcat running? Stop aborted."
+ exit 1
Modified: trunk/tomcat6/debian/patches/disable-ajp-connector.patch
===================================================================
--- trunk/tomcat6/debian/patches/disable-ajp-connector.patch 2010-02-03
07:03:55 UTC (rev 11497)
+++ trunk/tomcat6/debian/patches/disable-ajp-connector.patch 2010-02-04
00:11:53 UTC (rev 11498)
@@ -1,8 +1,6 @@
-Index: tomcat6-6.0.18/conf/server.xml
-===================================================================
---- tomcat6-6.0.18.orig/conf/server.xml 2008-11-26 15:24:50.000000000
+0000
-+++ tomcat6-6.0.18/conf/server.xml 2008-11-26 15:25:29.000000000 +0000
-@@ -85,7 +85,9 @@
+--- a/conf/server.xml
++++ b/conf/server.xml
+@@ -87,7 +87,9 @@
-->
<!-- Define an AJP 1.3 Connector on port 8009 -->
Modified: trunk/tomcat6/debian/patches/disable-apr-loading.patch
===================================================================
--- trunk/tomcat6/debian/patches/disable-apr-loading.patch 2010-02-03
07:03:55 UTC (rev 11497)
+++ trunk/tomcat6/debian/patches/disable-apr-loading.patch 2010-02-04
00:11:53 UTC (rev 11498)
@@ -1,7 +1,5 @@
-Index: tomcat6-6.0.18/conf/server.xml
-===================================================================
---- tomcat6-6.0.18.orig/conf/server.xml 2008-11-26 15:22:41.000000000
+0000
-+++ tomcat6-6.0.18/conf/server.xml 2008-11-26 15:24:38.000000000 +0000
+--- a/conf/server.xml
++++ b/conf/server.xml
@@ -22,7 +22,9 @@
<Server port="8005" shutdown="SHUTDOWN">
@@ -11,4 +9,4 @@
+ -->
<!--Initialize Jasper prior to webapps are loaded. Documentation at
/docs/jasper-howto.html -->
<Listener className="org.apache.catalina.core.JasperListener" />
- <!-- JMX Support for the Tomcat server. Documentation at
/docs/non-existent.html -->
+ <!-- Prevent memory leaks due to use of particular java/javax APIs-->
Modified: trunk/tomcat6/debian/patches/series
===================================================================
--- trunk/tomcat6/debian/patches/series 2010-02-03 07:03:55 UTC (rev 11497)
+++ trunk/tomcat6/debian/patches/series 2010-02-04 00:11:53 UTC (rev 11498)
@@ -5,3 +5,4 @@
var_loaders.patch
servlet-api-OSGi.patch
jsp-api-OSGi.patch
+allow-empty-pid-file.patch
Modified: trunk/tomcat6/debian/patches/use-commons-dbcp.patch
===================================================================
--- trunk/tomcat6/debian/patches/use-commons-dbcp.patch 2010-02-03 07:03:55 UTC
(rev 11497)
+++ trunk/tomcat6/debian/patches/use-commons-dbcp.patch 2010-02-04 00:11:53 UTC
(rev 11498)
@@ -1,7 +1,5 @@
-Index: tomcat6-6.0.18/java/org/apache/naming/factory/Constants.java
-===================================================================
---- tomcat6-6.0.18.orig/java/org/apache/naming/factory/Constants.java
2008-11-25 10:50:38.000000000 +0000
-+++ tomcat6-6.0.18/java/org/apache/naming/factory/Constants.java
2008-11-25 10:51:49.000000000 +0000
+--- a/java/org/apache/naming/factory/Constants.java
++++ b/java/org/apache/naming/factory/Constants.java
@@ -49,7 +49,7 @@
Package + ".HandlerFactory";
@@ -11,11 +9,9 @@
public static final String OPENEJB_EJB_FACTORY =
Package + ".OpenEjbFactory";
-Index: tomcat6-6.0.18/webapps/docs/jndi-resources-howto.xml
-===================================================================
---- tomcat6-6.0.18.orig/webapps/docs/jndi-resources-howto.xml 2008-11-25
10:52:02.000000000 +0000
-+++ tomcat6-6.0.18/webapps/docs/jndi-resources-howto.xml 2008-11-25
10:53:22.000000000 +0000
-@@ -573,9 +573,9 @@
+--- a/webapps/docs/jndi-resources-howto.xml
++++ b/webapps/docs/jndi-resources-howto.xml
+@@ -653,9 +653,9 @@
<code>driverName</code> parameters to match your actual database's
JDBC driver and connection URL.</p>
Modified: trunk/tomcat6/debian/tomcat6.init
===================================================================
--- trunk/tomcat6/debian/tomcat6.init 2010-02-03 07:03:55 UTC (rev 11497)
+++ trunk/tomcat6/debian/tomcat6.init 2010-02-04 00:11:53 UTC (rev 11498)
@@ -148,11 +148,11 @@
# Run the catalina.sh script as a daemon
set +e
- touch "$CATALINA_PID"
- chown $TOMCAT6_USER "$CATALINA_PID"
+ touch "$CATALINA_PID" "$CATALINA_BASE"/logs/catalina.out
+ chown $TOMCAT6_USER "$CATALINA_PID" "$CATALINA_BASE"/logs/catalina.out
start-stop-daemon --start -u "$TOMCAT6_USER" -g "$TOMCAT6_GROUP" \
-c "$TOMCAT6_USER" -d "$CATALINA_TMPDIR" \
- -x /bin/bash -- -c "$AUTHBIND_COMMAND $TOMCAT_SH" >/dev/null
+ -x /bin/bash -- -c "$AUTHBIND_COMMAND $TOMCAT_SH"
status="$?"
set +a -e
return $status
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
