[pkg-java] r2777 - in branches/tomcat5.5/feature/debian/debian: .
policy webapps
Marcus Better
marcusb-guest at alioth.debian.org
Tue Nov 21 11:35:25 CET 2006
Author: marcusb-guest
Date: 2006-11-21 11:35:24 +0100 (Tue, 21 Nov 2006)
New Revision: 2777
Added:
branches/tomcat5.5/feature/debian/debian/webapps/ROOT.xml
branches/tomcat5.5/feature/debian/debian/webapps/jsp-examples.xml
branches/tomcat5.5/feature/debian/debian/webapps/servlets-examples.xml
branches/tomcat5.5/feature/debian/debian/webapps/webdav.xml
Modified:
branches/tomcat5.5/feature/debian/debian/changelog
branches/tomcat5.5/feature/debian/debian/policy/04webapps.policy
branches/tomcat5.5/feature/debian/debian/tomcat5.5-webapps.install
branches/tomcat5.5/feature/debian/debian/tomcat5.5-webapps.postinst
branches/tomcat5.5/feature/debian/debian/webapps/balancer.xml
branches/tomcat5.5/feature/debian/debian/webapps/tomcat-docs.xml
Log:
Install webapps in /usr/share/tomcat5.5-webapps. Do not re-enable them on every upgrade if re-enabled manually. Fixes #399184.
Modified: branches/tomcat5.5/feature/debian/debian/changelog
===================================================================
--- branches/tomcat5.5/feature/debian/debian/changelog 2006-11-21 10:33:50 UTC (rev 2776)
+++ branches/tomcat5.5/feature/debian/debian/changelog 2006-11-21 10:35:24 UTC (rev 2777)
@@ -7,6 +7,11 @@
cases. Thanks to Andreas Beckmann. (Closes: #393224)
* Fix typo affecting "/etc/init.d/tomcat5.5 status" command. Thanks to
Jhair Tocancipa Triana. (Closes: #398044)
+ * Webapps are now installed in /usr/share/tomcat5.5-webapps. Their
+ context definitions are copied into
+ /var/lib/tomcat5.5/conf/Catalina/localhost on first install, but if
+ removed they will no longer be re-enabled on every upgrade. Thanks to
+ Adrian Bridgett. (Closes: #399184)
* Don't use juli LogManager with java-gcj-compat, as workaround for bug
#399251.
* We no longer need xsltproc to generate documentation, since the
@@ -22,7 +27,7 @@
invocation in the "clean" target, and the script is simple enough
anyway.
- -- Marcus Better <marcus at better.se> Mon, 20 Nov 2006 11:16:36 +0100
+ -- Marcus Better <marcus at better.se> Tue, 21 Nov 2006 11:29:41 +0100
tomcat5.5 (5.5.20-1) unstable; urgency=low
Modified: branches/tomcat5.5/feature/debian/debian/policy/04webapps.policy
===================================================================
--- branches/tomcat5.5/feature/debian/debian/policy/04webapps.policy 2006-11-21 10:33:50 UTC (rev 2776)
+++ branches/tomcat5.5/feature/debian/debian/policy/04webapps.policy 2006-11-21 10:35:24 UTC (rev 2777)
@@ -57,7 +57,7 @@
};
// The permissions granted to the balancer WEB-INF/classes directory
-grant codeBase "file:${catalina.home}/webapps/balancer/WEB-INF/classes/-" {
+grant codeBase "file:/usr/share/tomcat5.5-webapps/balancer/WEB-INF/classes/-" {
permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.util.digester";
permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.util.digester.*";
};
Modified: branches/tomcat5.5/feature/debian/debian/tomcat5.5-webapps.install
===================================================================
--- branches/tomcat5.5/feature/debian/debian/tomcat5.5-webapps.install 2006-11-21 10:33:50 UTC (rev 2776)
+++ branches/tomcat5.5/feature/debian/debian/tomcat5.5-webapps.install 2006-11-21 10:35:24 UTC (rev 2777)
@@ -1,5 +1,7 @@
-build/dist/webapps /var/lib/tomcat5.5
-debian/webapps/balancer.xml /var/lib/tomcat5.5/conf/Catalina/localhost/
-debian/webapps/tomcat-docs.xml /var/lib/tomcat5.5/conf/Catalina/localhost/
-
-build/dist/webapps/jsp-examples/WEB-INF/lib /usr/share/tomcat5.5/server/webapps/jsp-examples/WEB-INF
+build/dist/webapps /usr/share/tomcat5.5-webapps
+debian/webapps/balancer.xml /usr/share/tomcat5.5-webapps
+debian/webapps/tomcat-docs.xml /usr/share/tomcat5.5-webapps
+debian/webapps/ROOT.xml /usr/share/tomcat5.5-webapps
+debian/webapps/jsp-examples.xml /usr/share/tomcat5.5-webapps
+debian/webapps/servlets-examples.xml /usr/share/tomcat5.5-webapps
+debian/webapps/webdav.xml /usr/share/tomcat5.5-webapps
Modified: branches/tomcat5.5/feature/debian/debian/tomcat5.5-webapps.postinst
===================================================================
--- branches/tomcat5.5/feature/debian/debian/tomcat5.5-webapps.postinst 2006-11-21 10:33:50 UTC (rev 2776)
+++ branches/tomcat5.5/feature/debian/debian/tomcat5.5-webapps.postinst 2006-11-21 10:35:24 UTC (rev 2777)
@@ -6,6 +6,11 @@
configure)
if [ -z "$2" ]; then
# New installation, not a package upgrade
+ # create context links
+ for context in /usr/share/tomcat5.5-webapps/*.xml; do
+ ln -s $context /var/lib/tomcat5.5/conf/Catalina/localhost/
+ done
+
if [ -x /etc/init.d/tomcat5.5 ]; then
# Only restart tomcat if it is already running
if invoke-rc.d tomcat5.5 status >/dev/null; then
Added: branches/tomcat5.5/feature/debian/debian/webapps/ROOT.xml
===================================================================
--- branches/tomcat5.5/feature/debian/debian/webapps/ROOT.xml 2006-11-21 10:33:50 UTC (rev 2776)
+++ branches/tomcat5.5/feature/debian/debian/webapps/ROOT.xml 2006-11-21 10:35:24 UTC (rev 2777)
@@ -0,0 +1,7 @@
+<!--
+ Context configuration file for the Tomcat Web App Root
+-->
+
+<Context path="/" docBase="/usr/share/tomcat5.5-webapps/ROOT"
+ debug="0" privileged="true" allowLinking="true">
+</Context>
Modified: branches/tomcat5.5/feature/debian/debian/webapps/balancer.xml
===================================================================
--- branches/tomcat5.5/feature/debian/debian/webapps/balancer.xml 2006-11-21 10:33:50 UTC (rev 2776)
+++ branches/tomcat5.5/feature/debian/debian/webapps/balancer.xml 2006-11-21 10:35:24 UTC (rev 2777)
@@ -2,6 +2,6 @@
Context configuration file for the Tomcat Balancer Web App
-->
-<Context path="/balancer" docBase="/usr/share/tomcat5.5/webapps/balancer"
+<Context path="/balancer" docBase="/usr/share/tomcat5.5-webapps/balancer"
debug="0" privileged="true" allowLinking="true">
</Context>
Added: branches/tomcat5.5/feature/debian/debian/webapps/jsp-examples.xml
===================================================================
--- branches/tomcat5.5/feature/debian/debian/webapps/jsp-examples.xml 2006-11-21 10:33:50 UTC (rev 2776)
+++ branches/tomcat5.5/feature/debian/debian/webapps/jsp-examples.xml 2006-11-21 10:35:24 UTC (rev 2777)
@@ -0,0 +1,7 @@
+<!--
+ Context configuration file for the Tomcat jsp-examples Web App
+-->
+
+<Context path="/jsp-examples" docBase="/usr/share/tomcat5.5-webapps/jsp-examples"
+ debug="0" privileged="true" allowLinking="true">
+</Context>
Added: branches/tomcat5.5/feature/debian/debian/webapps/servlets-examples.xml
===================================================================
--- branches/tomcat5.5/feature/debian/debian/webapps/servlets-examples.xml 2006-11-21 10:33:50 UTC (rev 2776)
+++ branches/tomcat5.5/feature/debian/debian/webapps/servlets-examples.xml 2006-11-21 10:35:24 UTC (rev 2777)
@@ -0,0 +1,7 @@
+<!--
+ Context configuration file for the Tomcat servlets-examples Web App
+-->
+
+<Context path="/servlets-examples" docBase="/usr/share/tomcat5.5-webapps/servlets-examples"
+ debug="0" privileged="true" allowLinking="true">
+</Context>
Modified: branches/tomcat5.5/feature/debian/debian/webapps/tomcat-docs.xml
===================================================================
--- branches/tomcat5.5/feature/debian/debian/webapps/tomcat-docs.xml 2006-11-21 10:33:50 UTC (rev 2776)
+++ branches/tomcat5.5/feature/debian/debian/webapps/tomcat-docs.xml 2006-11-21 10:35:24 UTC (rev 2777)
@@ -3,6 +3,6 @@
Needed to allow linking to the JSP/Servlet API documentations
-->
-<Context path="/tomcat-docs" docBase="/usr/share/tomcat5.5/webapps/tomcat-docs"
+<Context path="/tomcat-docs" docBase="/usr/share/tomcat5.5-webapps/tomcat-docs"
debug="0" privileged="false" allowLinking="true">
</Context>
Added: branches/tomcat5.5/feature/debian/debian/webapps/webdav.xml
===================================================================
--- branches/tomcat5.5/feature/debian/debian/webapps/webdav.xml 2006-11-21 10:33:50 UTC (rev 2776)
+++ branches/tomcat5.5/feature/debian/debian/webapps/webdav.xml 2006-11-21 10:35:24 UTC (rev 2777)
@@ -0,0 +1,7 @@
+<!--
+ Context configuration file for the Tomcat webdav Web App
+-->
+
+<Context path="/webdav" docBase="/usr/share/tomcat5.5-webapps/webdav"
+ debug="0" privileged="true" allowLinking="true">
+</Context>
More information about the pkg-java-commits
mailing list