Repository: incubator-juneau Updated Branches: refs/heads/master b37a47dd6 -> 261557578
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/26155757/juneau-microservice/src/main/java/org/apache/juneau/microservice/Microservice.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/src/main/java/org/apache/juneau/microservice/Microservice.java b/juneau-microservice/src/main/java/org/apache/juneau/microservice/Microservice.java index e643f97..e8ce3f5 100755 --- a/juneau-microservice/src/main/java/org/apache/juneau/microservice/Microservice.java +++ b/juneau-microservice/src/main/java/org/apache/juneau/microservice/Microservice.java @@ -438,8 +438,9 @@ public abstract class Microservice { // -------------------------------------------------------------------------------- // Resolve the config file if the path was specified. // -------------------------------------------------------------------------------- + ConfigFileBuilder cfb = new ConfigFileBuilder(); if (cfPath != null) - cf = ConfigMgr.DEFAULT.get(cfPath).getResolving(createVarResolver().build()); + cf = cfb.build(cfPath).getResolving(createVarResolver().build()); // -------------------------------------------------------------------------------- // Find config file. @@ -459,10 +460,10 @@ public abstract class Microservice { if (cfPath == null) { System.err.println("Running class ["+getClass().getSimpleName()+"] without a config file."); - cf = ConfigMgr.DEFAULT.create(); + cf = cfb.build(); } else { System.out.println("Running class ["+getClass().getSimpleName()+"] using config file ["+cfPath+"]"); - cf = ConfigMgr.DEFAULT.get(cfPath).getResolving(createVarResolver().build()); + cf = cfb.build(cfPath).getResolving(createVarResolver().build()); } } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/26155757/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/ConfigResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/ConfigResource.java b/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/ConfigResource.java index f258ec8..5bd0438 100755 --- a/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/ConfigResource.java +++ b/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/ConfigResource.java @@ -142,7 +142,7 @@ public class ConfigResource extends Resource { } ) public ConfigFile setConfigContents(@Body Reader contents) throws Exception { - ConfigFile cf2 = ConfigMgr.DEFAULT.create().load(contents); + ConfigFile cf2 = new ConfigFileBuilder().build(contents); return getConfigContents().merge(cf2).save(); } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/26155757/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/package.html ---------------------------------------------------------------------- diff --git a/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/package.html b/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/package.html index 9476291..654b6de 100644 --- a/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/package.html +++ b/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/package.html @@ -273,7 +273,7 @@ <h6 class='figure'>Code that reads an <code>SSLOpts</code> bean from the config file</h6> <p class='bcode'> <jc>// Read config file and set SSL options based on what's in that file.</jc> - ConfigFile cf = ConfigMgr.<jsf>DEFAULT</jsf>.get(<js>"MyConfig.cfg"</js>); + ConfigFile cf = <jk>new</jk> ConfigFileBuilder().build(<js>"MyConfig.cfg"</js>); SSLOpts ssl = cf.getObject(SSLOpts.<jk>class</jk>, <js>"Connection/ssl"</js>); RestClient rc = <jk>new</jk> RestClient().enableSSL(ssl); </p> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/26155757/juneau-rest/src/main/java/org/apache/juneau/rest/RestConfig.java ---------------------------------------------------------------------- diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/RestConfig.java b/juneau-rest/src/main/java/org/apache/juneau/rest/RestConfig.java index 8e10182..7eebe50 100644 --- a/juneau-rest/src/main/java/org/apache/juneau/rest/RestConfig.java +++ b/juneau-rest/src/main/java/org/apache/juneau/rest/RestConfig.java @@ -119,8 +119,10 @@ public class RestConfig implements ServletConfig { this.parentContext = parentContext; try { + ConfigFileBuilder cfb = new ConfigFileBuilder(); + properties = new ObjectMap(); - configFile = ConfigMgr.DEFAULT.create(); + configFile = cfb.build(); varResolverBuilder = new VarResolverBuilder() .vars( SystemPropertiesVar.class, @@ -141,7 +143,7 @@ public class RestConfig implements ServletConfig { configPath = r.config(); String cf = vr.resolve(configPath); if (! cf.isEmpty()) - configFile = ConfigMgr.DEFAULT.get(cf); + configFile = cfb.build(cf); configFile = configFile.getResolving(vr); // Add our config file to the variable resolver. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/26155757/juneau-rest/src/main/java/org/apache/juneau/rest/package.html ---------------------------------------------------------------------- diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/package.html b/juneau-rest/src/main/java/org/apache/juneau/rest/package.html index 79c7753..6b08a70 100644 --- a/juneau-rest/src/main/java/org/apache/juneau/rest/package.html +++ b/juneau-rest/src/main/java/org/apache/juneau/rest/package.html @@ -2438,7 +2438,7 @@ These properties are then accessible through the {@link org.apache.juneau.ini.ConfigFile} class. </p> <p class='bcode'> - ConfigFile cf = ConfigMgr.<jsf>INSTANCE</jsf>.getConfigFile(<js>"myconfig.cfg"</js>); + ConfigFile cf = <jk>new</jk> ConfigFileBuilder().build(<js>"myconfig.cfg"</js>); String path = cf.getString(<js>"MyProperties/path"</js>); File javaHome = cf.getObject(File.<jk>class</jk>, <js>"MyProperties/javaHome"</js>); String customMessage = cf.getString(<js>"MyProperties/customMessage"</js>);
