setting xml updates

ldchrist · Nov 18, 2015 · bbaf6d5 · bbaf6d5
1 parent 432782e
commit bbaf6d5
Show file tree

Hide file tree

Showing 6 changed files with 543 additions and 529 deletions.
diff --git a/pom.xml b/pom.xml
@@ -334,6 +334,11 @@
             <artifactId>jdom2</artifactId>
             <version>2.0.6</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <version>10.12.1.1</version>
+        </dependency>
     </dependencies>
 
     <repositories>

diff --git a/src/main/java/password/pwm/config/PwmSetting.java b/src/main/java/password/pwm/config/PwmSetting.java
@@ -1134,15 +1134,15 @@ public StoredValue getDefaultValue(final PwmSettingTemplate template)
         return defaultValues.keySet().iterator().next(); // return top if no template matches.
     }
 
-    public Map<PwmSettingTemplate, String> getDefaultValueDebugStrings(final Locale locale)
+    public Map<PwmSettingTemplate, String> getDefaultValueDebugStrings(final Locale locale, final PwmSettingTemplate.Type templateType)
             throws PwmOperationalException, PwmUnrecoverableException
     {
         final Map<PwmSettingTemplate, String> returnObj = new LinkedHashMap<>();
         final String defaultDebugStr = this.getDefaultValue(PwmSettingTemplate.DEFAULT).toDebugString(locale);
         boolean hasNonDefaultValue = false;
         if (defaultDebugStr != null) {
             for (final PwmSettingTemplate template : PwmSettingTemplate.valuesOrderedByLabel(locale)) {
-                if (!template.isHidden()) {
+                if (!template.isHidden()  && template.getType() == templateType) {
                     final String debugStr = this.getDefaultValue(template).toDebugString(locale);
                     if (!defaultDebugStr.equals(debugStr)) {
                         hasNonDefaultValue = true;

diff --git a/src/main/java/password/pwm/http/ContextManager.java b/src/main/java/password/pwm/http/ContextManager.java
@@ -67,6 +67,8 @@ private enum ContextParameter {
         configurationFile,
     }
 
+    private final static String UNSPECIFIED_VALUE = "unspecified";
+
     public ContextManager(ServletContext servletContext) {
         this.servletContext = servletContext;
         this.instanceGuid = PwmRandom.getInstance().randomUUID().toString();
@@ -367,9 +369,16 @@ public int getRestartCount()
     public File locateConfigurationFile(final File applicationPath)
             throws Exception
     {
-        final String configurationFileSetting = servletContext.getInitParameter(
+        String configurationFileSetting = servletContext.getInitParameter(
                 ContextParameter.configurationFile.toString());
 
+        if (configurationFileSetting == null
+                || configurationFileSetting.trim().isEmpty()
+                || UNSPECIFIED_VALUE.equalsIgnoreCase(configurationFileSetting.trim())
+                ) {
+            configurationFileSetting = PwmConstants.DEFAULT_CONFIG_FILE_FILENAME;
+        }
+
         try {
             File file = new File(configurationFileSetting);
             if (file.isAbsolute()) {
@@ -402,7 +411,7 @@ public String readApplicationPath() {
                     ContextParameter.applicationPath.toString());
 
             if (contextAppPathSetting != null && !contextAppPathSetting.isEmpty()) {
-                if (!"unspecified".equalsIgnoreCase(contextAppPathSetting)) {
+                if (!UNSPECIFIED_VALUE.equalsIgnoreCase(contextAppPathSetting)) {
                     return contextAppPathSetting;
                 }
             }