Author: tchemit Date: 2011-12-05 23:53:19 +0100 (Mon, 05 Dec 2011) New Revision: 146 Url: http://forge.codelutin.com/repositories/revision/echobase/146 Log: make possible to change config file Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2011-12-05 16:36:41 UTC (rev 145) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2011-12-05 22:53:19 UTC (rev 146) @@ -28,11 +28,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContextFactory; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.util.ArgumentsParserException; -import org.nuiton.util.FileUtil; -import org.nuiton.util.Version; -import org.nuiton.util.VersionUtil; +import org.nuiton.util.*; import java.io.File; import java.io.IOException; @@ -40,7 +36,7 @@ import java.util.Properties; /** - * EchoBase configuration + * EchoBase configuration. * * @author tchemit <chemit@codelutin.com> * @since 0.1 @@ -61,11 +57,15 @@ protected ApplicationConfig applicationConfig; public EchoBaseConfiguration() { + this("echobase.properties"); + } + public EchoBaseConfiguration(String file) { + EchoBaseDateConverter.initDateConverter(); applicationConfig = new ApplicationConfig(); - applicationConfig.setConfigFileName("echobase.properties"); + applicationConfig.setConfigFileName(file); if (log.isInfoEnabled()) { log.info(this + " is initializing..."); @@ -163,8 +163,8 @@ Preconditions.checkNotNull( directory, "Could not find directory " + directory + " (key " + - key + - "in your configuration file named echobase.properties)" + key + + "in your configuration file named echobase.properties)" ); if (log.isInfoEnabled()) { log.info(key + " = " + directory);