Update the conf util to support multiple configuration files Signed-off-by: Manula Thantriwatte <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ff5ecf1a Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ff5ecf1a Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ff5ecf1a Branch: refs/heads/master Commit: ff5ecf1aef9afe704647355a5ee6973e4a1a68c4 Parents: a896d2c Author: gayan <[email protected]> Authored: Wed Dec 3 19:37:42 2014 +0530 Committer: Manula Thantriwatte <[email protected]> Committed: Thu Dec 4 13:48:38 2014 +0000 ---------------------------------------------------------------------- .../apache/stratos/autoscaler/util/ConfUtil.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/ff5ecf1a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/ConfUtil.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/ConfUtil.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/ConfUtil.java index a393563..9701336 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/ConfUtil.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/ConfUtil.java @@ -24,13 +24,12 @@ import org.apache.commons.configuration.XMLConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.autoscaler.Constants; -import org.wso2.carbon.utils.CarbonUtils; import java.io.File; import java.util.HashMap; /** - * This class contains utility methods for read Autoscaler configuration file. + * This class contains utility methods for read configuration file. */ public class ConfUtil { @@ -38,20 +37,25 @@ public class ConfUtil { private XMLConfiguration config; + //To maintain the map of config files private static HashMap<String,ConfUtil> instanceMap=new HashMap<String, ConfUtil>(); private ConfUtil(String configFilePath) { - // log.info("Loading configuration....."); try { File confFile=new File(configFilePath); config = new XMLConfiguration(confFile); } catch (ConfigurationException e) { - log.error("Unable to load autoscaler configuration file",e); + log.error("Unable to load configuration file",e); config = new XMLConfiguration(); // continue with default values } } + /** + * Get the instance of the configuration file + * @param configFilePath configuration file name + * @return ConfUtil instance + */ public static ConfUtil getInstance(String configFilePath) { if (configFilePath == null || configFilePath.isEmpty()) { @@ -65,6 +69,10 @@ public class ConfUtil { return instance; } + /** + * Get configurations + * @return XMLConfiguration + */ public XMLConfiguration getConfiguration(){ return config; }
