[tomcat8] 03/04: Restored the classloading from the common, server and shared directories under CATALINA_BASE (Closes: #847137)

[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 33ec083dff0f506f5458a19844e1db6539bc5125
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Dec 7 12:55:18 2016 +0100

    Restored the classloading from the common, server and shared directories under CATALINA_BASE (Closes: #847137)
---
 debian/changelog                                           |  2 ++
 .../patches/0006-add-JARs-below-var-to-class-loader.patch  | 14 ++++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7afc858..74cbbe3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ tomcat8 (8.5.9-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release
     - Refreshed the patches
+  * Restored the classloading from the common, server and shared directories
+    under CATALINA_BASE (Closes: #847137)
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 05 Dec 2016 22:47:09 +0100
 
diff --git a/debian/patches/0006-add-JARs-below-var-to-class-loader.patch b/debian/patches/0006-add-JARs-below-var-to-class-loader.patch
index 6105e29..f9bd272 100644
--- a/debian/patches/0006-add-JARs-below-var-to-class-loader.patch
+++ b/debian/patches/0006-add-JARs-below-var-to-class-loader.patch
@@ -1,6 +1,8 @@
-From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Date: Mon, 28 Jun 2010 21:32:57 +0200
-Subject: [PATCH] add JARs below /var to class loader
+Description: Restores the classloading from the common, server and shared
+ directories under the CATALINA_HOME and CATALINA_BASE directories to ease
+ the migration from older versions of Tomcat.
+Author: Miguel Landaeta <nomadium at debian.org>
+Forwarded: not-needed
 --- a/conf/catalina.properties
 +++ b/conf/catalina.properties
 @@ -50,7 +50,7 @@
@@ -8,7 +10,7 @@ Subject: [PATCH] add JARs below /var to class loader
  #       Because double quotes are used for quoting, the double quote character
  #       may not appear in a path.
 -common.loader="${catalina.base}/lib","${catalina.base}/lib/*.jar","${catalina.home}/lib","${catalina.home}/lib/*.jar"
-+common.loader="${catalina.base}/lib","${catalina.base}/lib/*.jar","${catalina.home}/lib","${catalina.home}/lib/*.jar","${catalina.home}/common/classes","${catalina.home}/common/*.jar"
++common.loader="${catalina.base}/lib","${catalina.base}/lib/*.jar","${catalina.home}/lib","${catalina.home}/lib/*.jar","${catalina.base}/common/classes","${catalina.base}/common/*.jar","${catalina.home}/common/classes","${catalina.home}/common/*.jar"
  
  #
  # List of comma-separated paths defining the contents of the "server"
@@ -17,7 +19,7 @@ Subject: [PATCH] add JARs below /var to class loader
  #       Because double quotes are used for quoting, the double quote character
  #       may not appear in a path.
 -server.loader=
-+server.loader=${catalina.home}/server/classes,${catalina.home}/server/*.jar
++server.loader="${catalina.base}/server/classes","${catalina.base}/server/*.jar","${catalina.home}/server/classes","${catalina.home}/server/*.jar"
  
  #
  # List of comma-separated paths defining the contents of the "shared"
@@ -26,7 +28,7 @@ Subject: [PATCH] add JARs below /var to class loader
  #       Because double quotes are used for quoting, the double quote character
  #       may not appear in a path.
 -shared.loader=
-+shared.loader=${catalina.home}/shared/classes,${catalina.home}/shared/*.jar
++shared.loader="${catalina.base}/shared/classes","${catalina.base}/shared/*.jar","${catalina.home}/shared/classes","${catalina.home}/shared/*.jar"
  
  # Default list of JAR files that should not be scanned using the JarScanner
  # functionality. This is typically used to scan JARs for configuration

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