Adopt chain-loading properties as the default setup

James Moger

2014-10-27 17ae31a20e9ad1294bc8a872644d90d61a9dd890

 src/main/java/com/gitblit/FileSettings.java

@@ -80,6 +80,7 @@
      if (propertiesFile != null && propertiesFile.exists() && (forceReload || (propertiesFile.lastModified() > lastModified))) {

         FileInputStream is = null;

         try {

            logger.debug("loading {}", propertiesFile);

            Properties props = new Properties();

            is = new FileInputStream(propertiesFile);

            props.load(is);

@@ -124,8 +125,12 @@
      if (!StringUtils.isEmpty(include)) {



         // allow for multiples

         List<String> names = StringUtils.getStringsFromValue(include, " ");

         List<String> names = StringUtils.getStringsFromValue(include, ",");

         for (String name : names) {



            if (StringUtils.isEmpty(name)) {

               continue;

            }



            // try co-located

            File file = new File(propertiesFile.getParentFile(), name.trim());

@@ -134,16 +139,19 @@
               file = new File(name.trim());

            }



            if (file.exists()) {

            if (!file.exists()) {

               logger.warn("failed to locate {}", file);

               continue;

            }



               // load properties

            logger.debug("loading {}", file);

               try (FileInputStream iis = new FileInputStream(file)) {

                  baseProperties.load(iis);

               }



               // read nested includes

               baseProperties = readIncludes(baseProperties);



            }



         }