Move test config file to a external file

This commit is contained in:
SunZhaonan 2016-02-24 16:59:12 -08:00
parent a7ca2ce996
commit 8a76f9f931
4 changed files with 8 additions and 13 deletions

View File

@ -83,11 +83,3 @@ task "dist" (type: Exec) {
commandLine playExec, 'dist' commandLine playExec, 'dist'
} }
/*
// optional: if using 'eclipse' plugin
eclipse {
classpath {
plusConfigurations += configurations.provided
}
}
*/

View File

@ -48,7 +48,6 @@ sourceSets {
} }
resources { resources {
srcDir 'src/resources' srcDir 'src/resources'
exclude '**/application.properties'
} }
} }
} }

View File

@ -13,6 +13,7 @@
*/ */
package metadata.etl; package metadata.etl;
import java.io.FileInputStream;
import org.python.core.PyDictionary; import org.python.core.PyDictionary;
import org.python.core.PyString; import org.python.core.PyString;
import org.python.core.PySystemState; import org.python.core.PySystemState;
@ -35,12 +36,15 @@ import java.util.Properties;
* Created by zsun on 7/29/15. * Created by zsun on 7/29/15.
*/ */
public abstract class EtlJob { public abstract class EtlJob {
private final static String CONFIG_FILE = "application.properties";
public PythonInterpreter interpreter; public PythonInterpreter interpreter;
public Properties prop; public Properties prop;
public ClassLoader classLoader = getClass().getClassLoader(); public ClassLoader classLoader = getClass().getClassLoader();
protected final Logger logger = LoggerFactory.getLogger(getClass()); protected final Logger logger = LoggerFactory.getLogger(getClass());
// default location of local test configuration file
private final static String DEFAULT_CONFIG_FILE_LOCATION = System.getProperty("user.home") + "/.wherehows/local_test.properties";
/** /**
* Constructor for using config file * Constructor for using config file
* @param appId * @param appId
@ -48,7 +52,7 @@ public abstract class EtlJob {
*/ */
@Deprecated @Deprecated
public EtlJob(Integer appId, Integer dbId, long whExecId) { public EtlJob(Integer appId, Integer dbId, long whExecId) {
this(appId, dbId, whExecId, CONFIG_FILE); this(appId, dbId, whExecId, DEFAULT_CONFIG_FILE_LOCATION);
} }
/** /**
@ -102,10 +106,10 @@ public abstract class EtlJob {
} }
prop.setProperty(Constant.WH_EXEC_ID_KEY, String.valueOf(whExecId)); prop.setProperty(Constant.WH_EXEC_ID_KEY, String.valueOf(whExecId));
try (InputStream propFile = classLoader.getResourceAsStream(configFile)) { try (InputStream propFile = new FileInputStream(configFile)) {
prop.load(propFile); prop.load(propFile);
} catch (IOException e) { } catch (IOException e) {
logger.error("property file '{}' not found in the classpath" , configFile); logger.error("property file '{}' not found" , configFile);
e.printStackTrace(); e.printStackTrace();
} }