[tomcat8] 01/03: No longer create the common/server/shared directories under /var/lib/tomcat8 and use a unique lib directory

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository tomcat8.

commit 6726a9d7544de723f2a20c9bf72baf1a8a3d8202
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Sep 17 14:35:56 2014 +0200

    No longer create the common/server/shared directories under /var/lib/tomcat8 and use a unique lib directory
---
 debian/changelog         | 4 ++++
 debian/tomcat8.dirs      | 4 +---
 debian/tomcat8.postinst  | 2 +-
 debian/tomcat8.postrm.in | 5 +++++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5dd4ac3..0dd2e84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ tomcat8 (8.0.12-1) UNRELEASED; urgency=medium
 
   * New upstream release
     - Refreshed the patches
+  * No longer create the common/server/shared directories under
+    /var/lib/tomcat8, and use a unique lib directory as documented
+    upstream since Tomcat 6. The old directories are still supported
+    if inherited from a previous installation (Closes: #754386)
   * Depend on libecj-java >= 3.10.0 to support the new Java 8 syntax in JSPs
   * Install the missing tomcat-dbcp.jar in libtomcat8-java and use it as
     the default JDBC pool implementation instead of Commons DBCP.
diff --git a/debian/tomcat8.dirs b/debian/tomcat8.dirs
index 0795275..5744d0f 100644
--- a/debian/tomcat8.dirs
+++ b/debian/tomcat8.dirs
@@ -1,8 +1,6 @@
 var/log/tomcat8
+var/lib/tomcat8/lib
 var/lib/tomcat8/webapps
-var/lib/tomcat8/common/classes
-var/lib/tomcat8/server/classes
-var/lib/tomcat8/shared/classes
 var/cache/tomcat8
 etc/tomcat8/Catalina/localhost
 etc/logrotate.d
diff --git a/debian/tomcat8.postinst b/debian/tomcat8.postinst
index 9bb4e98..c180c3c 100644
--- a/debian/tomcat8.postinst
+++ b/debian/tomcat8.postinst
@@ -50,7 +50,7 @@ case "$1" in
 	# but those files should be readable by tomcat8, so we set the group to tomcat8
 	chown -Rh root:$TOMCAT8_GROUP /etc/tomcat8/*
 	chmod 640 /etc/tomcat8/tomcat-users.xml
-	chown -Rh $TOMCAT8_USER:$TOMCAT8_GROUP /var/lib/tomcat8/webapps /var/lib/tomcat8/common /var/lib/tomcat8/server /var/lib/tomcat8/shared
+	chown -Rh $TOMCAT8_USER:$TOMCAT8_GROUP /var/lib/tomcat8/webapps /var/lib/tomcat8/lib
 	chmod 775 /var/lib/tomcat8/webapps
 	chmod 775 /etc/tomcat8/Catalina /etc/tomcat8/Catalina/localhost
 
diff --git a/debian/tomcat8.postrm.in b/debian/tomcat8.postrm.in
index 9d50993..9343591 100644
--- a/debian/tomcat8.postrm.in
+++ b/debian/tomcat8.postrm.in
@@ -38,6 +38,11 @@ case "$1" in
                 /var/lib/tomcat8/shared/classes \
                 /var/lib/tomcat8/shared || true
         fi
+        if [ -d /var/lib/tomcat8/lib ] && [ -z "`(find var/lib/tomcat8/lib/classes -type f)`" ] ; then
+            rmdir --ignore-fail-on-non-empty \
+                /var/lib/tomcat8/lib/classes \
+                /var/lib/tomcat8/lib || true
+        fi
         if [ -d "/var/cache/tomcat8" ] ; then
             rm -rf /var/cache/tomcat8
         fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git