[juneau] branch master updated: Additional default configuration file names.

[jamesbognar]

This is an automated email from the ASF dual-hosted git repository.

jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git


The following commit(s) were added to refs/heads/master by this push:
     new 3abc77c  Additional default configuration file names.
3abc77c is described below

commit 3abc77c20fc8a8b7347c23a65917538645b5d9e5
Author: JamesBognar <jamesbog...@apache.org>
AuthorDate: Thu Jan 10 16:54:13 2019 -0500

    Additional default configuration file names.
---
 .../src/main/java/org/apache/juneau/config/Config.java           | 6 ++++++
 .../docs/Topics/06.juneau-config/15.SystemDefaultConfig.html     | 3 +++
 .../docs/Topics/11.juneau-microservice-core/05.Config.html       | 9 ++++++++-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git 
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java 
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
index 2bfb9ec..92141f3 100644
--- 
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
+++ 
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
@@ -88,6 +88,9 @@ public final class Config extends Context implements 
ConfigEventListener, Writab
         *      <li>Any file ending in <js>".cfg"</js> in the home directory 
(names ordered alphabetically).
         *      <li><js>"juneau.cfg"</js>
         *      <li><js>"default.cfg"</js>
+        *      <li><js>"application.cfg"</js>
+        *      <li><js>"app.cfg"</js>
+        *      <li><js>"settings.cfg"</js>
         * </ol>
         * <p>
         *
@@ -120,6 +123,9 @@ public final class Config extends Context implements 
ConfigEventListener, Writab
 
                l.add("juneau.cfg");
                l.add("default.cfg");
+               l.add("application.cfg");
+               l.add("app.cfg");
+               l.add("settings.cfg");
 
                return l;
        }
diff --git 
a/juneau-doc/docs/Topics/06.juneau-config/15.SystemDefaultConfig.html 
b/juneau-doc/docs/Topics/06.juneau-config/15.SystemDefaultConfig.html
index bec6896..dc7fb72 100644
--- a/juneau-doc/docs/Topics/06.juneau-config/15.SystemDefaultConfig.html
+++ b/juneau-doc/docs/Topics/06.juneau-config/15.SystemDefaultConfig.html
@@ -46,6 +46,9 @@ System Default Config
                        <li><code>&lt;jar-name&gt;.cfg</code>
                        <li><code>juneau.cfg</code>
                        <li><code>default.cfg</code>
+                       <li><code>application.cfg</code>
+                       <li><code>app.cfg</code>
+                       <li><code>settings.cfg</code>
                </ol>
 </ol>
 <p>
diff --git a/juneau-doc/docs/Topics/11.juneau-microservice-core/05.Config.html 
b/juneau-doc/docs/Topics/11.juneau-microservice-core/05.Config.html
index af4d724..0e36fb4 100644
--- a/juneau-doc/docs/Topics/11.juneau-microservice-core/05.Config.html
+++ b/juneau-doc/docs/Topics/11.juneau-microservice-core/05.Config.html
@@ -44,7 +44,14 @@ Config
        <li>
                Resolve any <js>"*.cfg"</js> file that can be found in the 
working directory.
        <li>
-               Resolve any of the following files in the classpath:  
<js>"juneau.cfg"</js>, <js>"system.cfg"</js>
+               Resolve any of the following files in the classpath:
+               <ol>
+                       <li><code>juneau.cfg</code>
+                       <li><code>default.cfg</code>
+                       <li><code>application.cfg</code>
+                       <li><code>app.cfg</code>
+                       <li><code>settings.cfg</code>
+               </ol>
 </ol>
 <p>
        If no configuration file is found, and empty in-memory configuration is 
used.