[pkg-java] r2780 - in branches/tomcat5.5/feature/debian/debian: . context context/webapps

[Marcus Better]

Author: marcusb-guest
Date: 2006-11-21 12:34:45 +0100 (Tue, 21 Nov 2006)
New Revision: 2780

Added:
   branches/tomcat5.5/feature/debian/debian/context/
   branches/tomcat5.5/feature/debian/debian/context/admin/
   branches/tomcat5.5/feature/debian/debian/context/webapps/
   branches/tomcat5.5/feature/debian/debian/context/webapps/ROOT.xml
   branches/tomcat5.5/feature/debian/debian/context/webapps/balancer.xml
   branches/tomcat5.5/feature/debian/debian/context/webapps/jsp-examples.xml
   branches/tomcat5.5/feature/debian/debian/context/webapps/servlets-examples.xml
   branches/tomcat5.5/feature/debian/debian/context/webapps/tomcat-docs.xml
   branches/tomcat5.5/feature/debian/debian/context/webapps/webdav.xml
Removed:
   branches/tomcat5.5/feature/debian/debian/context/webapps/balancer.xml
   branches/tomcat5.5/feature/debian/debian/context/webapps/tomcat-docs.xml
   branches/tomcat5.5/feature/debian/debian/webapps/
Modified:
   branches/tomcat5.5/feature/debian/debian/tomcat5.5-admin.install
   branches/tomcat5.5/feature/debian/debian/tomcat5.5-webapps.install
Log:
Move context definitions for webapps and admin packages to separate directories to simplify install files.


Copied: branches/tomcat5.5/feature/debian/debian/context/webapps (from rev 2756, branches/tomcat5.5/feature/debian/debian/webapps)

Copied: branches/tomcat5.5/feature/debian/debian/context/webapps/ROOT.xml (from rev 2779, branches/tomcat5.5/feature/debian/debian/webapps/ROOT.xml)

Deleted: branches/tomcat5.5/feature/debian/debian/context/webapps/balancer.xml
===================================================================
--- branches/tomcat5.5/feature/debian/debian/webapps/balancer.xml	2006-11-15 11:05:19 UTC (rev 2756)
+++ branches/tomcat5.5/feature/debian/debian/context/webapps/balancer.xml	2006-11-21 11:34:45 UTC (rev 2780)
@@ -1,7 +0,0 @@
-<!--
-    Context configuration file for the Tomcat Balancer Web App
--->
-
-<Context path="/balancer" docBase="/usr/share/tomcat5.5/webapps/balancer" 
-   debug="0" privileged="true" allowLinking="true">
-</Context>

Copied: branches/tomcat5.5/feature/debian/debian/context/webapps/balancer.xml (from rev 2779, branches/tomcat5.5/feature/debian/debian/webapps/balancer.xml)

Copied: branches/tomcat5.5/feature/debian/debian/context/webapps/jsp-examples.xml (from rev 2779, branches/tomcat5.5/feature/debian/debian/webapps/jsp-examples.xml)

Copied: branches/tomcat5.5/feature/debian/debian/context/webapps/servlets-examples.xml (from rev 2779, branches/tomcat5.5/feature/debian/debian/webapps/servlets-examples.xml)

Deleted: branches/tomcat5.5/feature/debian/debian/context/webapps/tomcat-docs.xml
===================================================================
--- branches/tomcat5.5/feature/debian/debian/webapps/tomcat-docs.xml	2006-11-15 11:05:19 UTC (rev 2756)
+++ branches/tomcat5.5/feature/debian/debian/context/webapps/tomcat-docs.xml	2006-11-21 11:34:45 UTC (rev 2780)
@@ -1,8 +0,0 @@
-<!--
-    Context configuration file for the Tomcat Documentation
-    Needed to allow linking to the JSP/Servlet API documentations
--->
-
-<Context path="/tomcat-docs" docBase="/usr/share/tomcat5.5/webapps/tomcat-docs"
-         debug="0" privileged="false" allowLinking="true">
-</Context>

Copied: branches/tomcat5.5/feature/debian/debian/context/webapps/tomcat-docs.xml (from rev 2779, branches/tomcat5.5/feature/debian/debian/webapps/tomcat-docs.xml)

Copied: branches/tomcat5.5/feature/debian/debian/context/webapps/webdav.xml (from rev 2779, branches/tomcat5.5/feature/debian/debian/webapps/webdav.xml)

Modified: branches/tomcat5.5/feature/debian/debian/tomcat5.5-admin.install
===================================================================
--- branches/tomcat5.5/feature/debian/debian/tomcat5.5-admin.install	2006-11-21 11:08:45 UTC (rev 2779)
+++ branches/tomcat5.5/feature/debian/debian/tomcat5.5-admin.install	2006-11-21 11:34:45 UTC (rev 2780)
@@ -1,5 +1,3 @@
-debian/webapps/admin.xml			/var/lib/tomcat5.5/conf/Catalina/localhost/
-debian/webapps/manager.xml			/var/lib/tomcat5.5/conf/Catalina/localhost/
-debian/webapps/host-manager.xml			/var/lib/tomcat5.5/conf/Catalina/localhost/
+debian/context/admin/*.xml			/var/lib/tomcat5.5/conf/Catalina/localhost/
 debian/policy/10admin.policy			/etc/tomcat5.5/policy.d/
 build/dist/server/webapps			/usr/share/tomcat5.5/server

Modified: branches/tomcat5.5/feature/debian/debian/tomcat5.5-webapps.install
===================================================================
--- branches/tomcat5.5/feature/debian/debian/tomcat5.5-webapps.install	2006-11-21 11:08:45 UTC (rev 2779)
+++ branches/tomcat5.5/feature/debian/debian/tomcat5.5-webapps.install	2006-11-21 11:34:45 UTC (rev 2780)
@@ -1,7 +1,2 @@
-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
+build/dist/webapps/*					/usr/share/tomcat5.5-webapps
+debian/context/webapps/*.xml			 	/usr/share/tomcat5.5-webapps