Add extra properties support

Author: zigarn

src/main/java/org/apache/catalina/startup/CatalinaProperties.java

@@ -23,6 +23,8 @@
 import java.util.Enumeration;
 import java.util.Properties;
 
+import org.apache.catalina.Globals;
+
 
 /**
  * Utility class to read the bootstrap Catalina configuration.
@@ -105,6 +107,8 @@ private static void loadProperties() {
             properties=new Properties();
         }
 
+        loadExtraProperties();
+
         // Register the properties as system properties
         Enumeration<?> enumeration = properties.propertyNames();
         while (enumeration.hasMoreElements()) {
@@ -125,6 +129,83 @@ private static String getConfigUrl() {
     }
 
 
+    /**
+     * Load extra properties files.
+     */
+    private static void loadExtraProperties() {
+        String extraPropertiesURLs = properties.getProperty("catalina.extra.properties.urls");
+        if (extraPropertiesURLs != null) {
+            for (String extraPropertiesURL : extraPropertiesURLs.split(",")) {
+                InputStream is = null;
+                try {
+                    String configUrl = replace(extraPropertiesURL.trim());
+                    if (configUrl != null) {
+                        is = (new URL(configUrl)).openStream();
+                    }
+                } catch (Throwable t) {
+                    handleThrowable(t);
+                }
+                if (is != null) {
+                    try {
+                        properties.load(is);
+                        is.close();
+                    } catch (Throwable t) {
+                        handleThrowable(t);
+                        log.warn("Unable to load extra properties " + extraPropertiesURL);
+                    }
+                } else {
+                    log.warn("Unable to find extra properties " + extraPropertiesURL);
+                }
+            }
+        }
+    }
+
+
+    /**
+     * System property replacement in the given string.
+     *
+     * @param str The original string
+     * @return the modified string
+     */
+    private static String replace(String str) {
+        // Copied from Bootstrap.replace().
+        String result = str;
+        int pos_start = str.indexOf("${");
+        if (pos_start >= 0) {
+            StringBuilder builder = new StringBuilder();
+            int pos_end = -1;
+            while (pos_start >= 0) {
+                builder.append(str, pos_end + 1, pos_start);
+                pos_end = str.indexOf('}', pos_start + 2);
+                if (pos_end < 0) {
+                    pos_end = pos_start - 1;
+                    break;
+                }
+                String propName = str.substring(pos_start + 2, pos_end);
+                String replacement;
+                if (propName.length() == 0) {
+                    replacement = null;
+                } else if (Globals.CATALINA_HOME_PROP.equals(propName)) {
+                    replacement = Bootstrap.getCatalinaHome();
+                } else if (Globals.CATALINA_BASE_PROP.equals(propName)) {
+                    replacement = Bootstrap.getCatalinaBase();
+                } else {
+                    replacement = System.getProperty(propName);
+                }
+                if (replacement != null) {
+                    builder.append(replacement);
+                } else {
+                    builder.append(str, pos_start, pos_end + 1);
+                }
+                pos_start = str.indexOf("${", pos_end + 1);
+            }
+            builder.append(str, pos_end + 1, str.length());
+            result = builder.toString();
+        }
+        return result;
+    }
+
+
     // Copied from ExceptionUtils since that class is not visible during start
     private static void handleThrowable(Throwable t) {
         if (t instanceof ThreadDeath) {

src/test/java/org/apache/catalina/startup/CatalinaPropertiesTest.java

@@ -0,0 +1,25 @@
+package org.apache.catalina.startup;
+
+import static org.junit.Assert.assertEquals;
+
+import java.net.URL;
+
+import org.apache.catalina.Globals;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class CatalinaPropertiesTest {
+
+    @BeforeClass
+    public static void setUpClass() {
+        URL url = CatalinaPropertiesTest.class.getClassLoader().getResource("org/apache/catalina/startup/");
+        System.setProperty(Globals.CATALINA_HOME_PROP, url.getFile());
+    }
+
+    @Test
+    public void loadProperties() {
+        assertEquals("Catalina extra properties 1 not loaded", "true", CatalinaProperties.getProperty("catalina.extra.1.loaded"));
+        assertEquals("Catalina extra properties 2 not loaded", "true", CatalinaProperties.getProperty("catalina.extra.2.loaded"));
+    }
+
+}

src/test/resources/org/apache/catalina/startup/catalina.extra.1.properties

@@ -0,0 +1 @@
+catalina.extra.1.loaded=true

src/test/resources/org/apache/catalina/startup/catalina.extra.2.properties

@@ -0,0 +1 @@
+catalina.extra.2.loaded=true

src/test/resources/org/apache/catalina/startup/catalina.properties

@@ -0,0 +1 @@
+catalina.extra.properties.urls=file://${catalina.home}/catalina.extra.1.properties,file://${catalina.home}/catalina.extra.2.properties