Author: ludovicc-guest Date: 2010-04-21 21:48:19 +0000 (Wed, 21 Apr 2010) New Revision: 12191
Modified: trunk/tomcat6/debian/changelog trunk/tomcat6/debian/patches/jsp-api-OSGi.patch trunk/tomcat6/debian/patches/servlet-api-OSGi.patch trunk/tomcat6/debian/tomcat6-instance-create Log: Modified: trunk/tomcat6/debian/changelog =================================================================== --- trunk/tomcat6/debian/changelog 2010-04-21 21:41:20 UTC (rev 12190) +++ trunk/tomcat6/debian/changelog 2010-04-21 21:48:19 UTC (rev 12191) @@ -1,3 +1,12 @@ +tomcat6 (6.0.26-1) unstable; urgency=low + + * New upstream version + * Apply patch from Mark Scott to fix + tomcat6-instance-create which failed when multiple commandline + options are provided, fix creation of FULLPATH (Closes: #575580) + + -- Ludovic Claude <[email protected]> Wed, 21 Apr 2010 23:07:09 +0100 + tomcat6 (6.0.24-5) unstable; urgency=low * Added optimised garbage collection options to tomcat6's default options. Modified: trunk/tomcat6/debian/patches/jsp-api-OSGi.patch =================================================================== --- trunk/tomcat6/debian/patches/jsp-api-OSGi.patch 2010-04-21 21:41:20 UTC (rev 12190) +++ trunk/tomcat6/debian/patches/jsp-api-OSGi.patch 2010-04-21 21:48:19 UTC (rev 12191) @@ -1,9 +1,11 @@ Description: Adds OSGi metadata needed by eclipse. ---- a/res/META-INF/jsp-api.jar.manifest 2009-12-10 10:55:17.285283489 +0100 -+++ b/res/META-INF/jsp-api.jar.manifest 2009-12-10 10:59:35.397771728 +0100 -@@ -1,4 +1,16 @@ +--- a/res/META-INF/jsp-api.jar.manifest ++++ b/res/META-INF/jsp-api.jar.manifest +@@ -1,6 +1,18 @@ Manifest-version: 1.0 + X-Compile-Source-JDK: @source.jdk@ + X-Compile-Target-JDK: @target.jdk@ +Import-Package: javax.servlet; version=2.5,javax.servlet.http; version + =2.5,javax.servlet.resources; version=2.5 +Bundle-ManifestVersion: 2 Modified: trunk/tomcat6/debian/patches/servlet-api-OSGi.patch =================================================================== --- trunk/tomcat6/debian/patches/servlet-api-OSGi.patch 2010-04-21 21:41:20 UTC (rev 12190) +++ trunk/tomcat6/debian/patches/servlet-api-OSGi.patch 2010-04-21 21:48:19 UTC (rev 12191) @@ -1,9 +1,11 @@ Description: Adds OSGi metadata needed by eclipse. ---- a/res/META-INF/servlet-api.jar.manifest 2009-12-10 10:54:48.529282255 +0100 -+++ b/res/META-INF/servlet-api.jar.manifest 2009-12-10 11:00:11.230145721 +0100 -@@ -1,4 +1,13 @@ +--- a/res/META-INF/servlet-api.jar.manifest ++++ b/res/META-INF/servlet-api.jar.manifest +@@ -1,6 +1,15 @@ Manifest-version: 1.0 + X-Compile-Source-JDK: @source.jdk@ + X-Compile-Target-JDK: @target.jdk@ +Bundle-ManifestVersion: 2 +Export-Package: javax.servlet;version="2.5",javax.servlet.http;version + ="2.5",javax.servlet.resources;version="2.5" Modified: trunk/tomcat6/debian/tomcat6-instance-create =================================================================== --- trunk/tomcat6/debian/tomcat6-instance-create 2010-04-21 21:41:20 UTC (rev 12190) +++ trunk/tomcat6/debian/tomcat6-instance-create 2010-04-21 21:48:19 UTC (rev 12191) @@ -64,18 +64,16 @@ while getopts ":p:c:w:h" options; do case $options in - p ) HPORT=$OPTARG - shift; shift ;; - c ) CPORT=$OPTARG - shift; shift ;; - w ) CWORD=$OPTARG - shift; shift ;; + p ) HPORT=$OPTARG ;; + c ) CPORT=$OPTARG ;; + w ) CWORD=$OPTARG ;; h ) usage;; * ) echo "Error: Unknown parameter '$OPTARG'." exit 1;; esac done +shift $(($OPTIND - 1)) TARGET=$1 shift echo "You are about to create a Tomcat instance in directory '$TARGET'" @@ -110,7 +108,7 @@ mkdir -p ${TARGET} -FULLTARGET=`cd ${TARGET}; pwd` +FULLTARGET=`cd ${TARGET} > /dev/null && pwd` mkdir ${TARGET}/conf mkdir ${TARGET}/logs @@ -125,12 +123,14 @@ #!/bin/sh export CATALINA_BASE=${FULLTARGET} /usr/share/tomcat6/bin/startup.sh +echo "Tomcat started" EOT cat > ${TARGET}/bin/shutdown.sh << EOT #!/bin/sh export CATALINA_BASE=${FULLTARGET} /usr/share/tomcat6/bin/shutdown.sh +echo "Tomcat stopped" EOT chmod a+x ${TARGET}/bin/startup.sh ${TARGET}/bin/shutdown.sh _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
