Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Major] Refactored StrolchConfiguration.xml to use environments 

Now the agent requires an environment parameter to start, and the
configuration of that environment is used to load different sections of
the configuration file
This commit is contained in:
Robert von Burg 2014-08-13 23:36:52 +02:00
parent e6cdb4db83
commit e9d7ea8369
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/li/strolch/runtime/configuration/StrolchSystemProperties.java → src/main/java/li/strolch/runtime/configuration/StrolchEnvironment.java
View File

@ -15,17 +15,23 @@
*/
package li.strolch.runtime.configuration;
import java.io.File;
import java.io.FileInputStream;
import java.text.MessageFormat;
import java.util.Properties;
import li.strolch.runtime.StrolchConstants;
import ch.eitchnet.utils.dbc.DBC;
import ch.eitchnet.utils.helper.StringHelper;
/**
* @author Robert von Burg <eitch@eitchnet.ch>
*/
public class StrolchSystemProperties {
public class StrolchEnvironment {
public static String getEnvironment() {
public static final String ENV_PROPERTIES_FILE = "ENV.properties";
public static String getEnvironmentFromSystemProperties() {
String environment = System.getProperties().getProperty(StrolchConstants.ENV_STROLCH);
if (StringHelper.isEmpty(environment)) {
String msg = "The system property {0} is missing!";
@ -35,4 +41,23 @@ public class StrolchSystemProperties {
return environment;
}
public static String getEnvironmentFromEnvProperties(File rootPath) {
File envF = new File(rootPath, ENV_PROPERTIES_FILE);
DBC.PRE.assertExists(ENV_PROPERTIES_FILE + " does not exist in " + rootPath.getAbsolutePath(), envF);
Properties envP = new Properties();
try (FileInputStream fin = new FileInputStream(envF)) {
envP.load(fin);
} catch (Exception e) {
throw new StrolchConfigurationException("Failed to load " + ENV_PROPERTIES_FILE + " in " + rootPath, e);
}
String environment = envP.getProperty(StrolchConstants.ENV_STROLCH);
if (StringHelper.isEmpty(environment)) {
String msg = "The property {0} does not exist in {1}";
msg = MessageFormat.format(msg, StrolchConstants.ENV_STROLCH, envF.getAbsolutePath());
throw new StrolchConfigurationException(msg);
}
return environment;
}
}