From 7f2f3118e975a31f937d68ae2f1d73828d1808b0 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <adellam@isti.cnr.it>
Date: Tue, 13 Apr 2021 15:30:25 +0200
Subject: [PATCH] Optionally add paths to the common loader.

---
 README.md                        | 2 +-
 defaults/main.yml                | 4 ++++
 templates/catalina.properties.j2 | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 96ffff0..b0129cb 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ A role that installs multiple instances of tomcat, using the binaries from the d
 Role Variables
 --------------
 
-The most important variables are listed below:
+The most important variables are listed below. See the **defaults/main.yml** file for a complete reference:
 
 ``` yaml
 tomcat_m_instances:
diff --git a/defaults/main.yml b/defaults/main.yml
index b8a122e..22a3617 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -50,6 +50,10 @@ tomcat_m_java_opts_permgen: "-XX:MaxPermSize={{ tomcat_m_permgen_size }}"
 tomcat_m_additional_java_8_opts: "-XX:+CrashOnOutOfMemoryError"
 tomcat_m_java_opts: ""
 tomcat_m_java_gc_opts: "-XX:+UseConcMarkSweepGC"
+tomcat_m_catalina_classloader_paths: []
+# - lib/mylibdir
+# - lib/mylibdir/*.jar
+
 # Use "-XX:+UseConcMarkSweepGC" to enable the CMS garbage collector (improved
 # response time). If you use that option and you run Tomcat on a machine with
 # exactly one CPU chip that contains one or two cores, you should also add
diff --git a/templates/catalina.properties.j2 b/templates/catalina.properties.j2
index bc1d204..8108fc3 100644
--- a/templates/catalina.properties.j2
+++ b/templates/catalina.properties.j2
@@ -44,7 +44,7 @@ package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache
 #     "foo/*.jar": Add all the JARs of the specified folder as class
 #                  repositories
 #     "foo/bar.jar": Add bar.jar as a class repository
-common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar,${catalina.base}/common/classes,${catalina.base}/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{% for target in tomcat_m_catalina_classloader_paths %},${catalina.base}/{{ target }}{% endfor %}
 
 #
 # List of comma-separated paths defining the contents of the "server"