aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/io/trygvis/esper/testing/Config.java
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2013-01-03 15:09:43 +0100
committerTrygve Laugstøl <trygvis@inamo.no>2013-01-03 15:09:43 +0100
commit35ba1a6f765f72a1d91a5456c7556e6274f8c3a9 (patch)
tree18d069a4512cec4fca1c93964adcb039b9ee6167 /src/main/java/io/trygvis/esper/testing/Config.java
parent84fb49088a14cff8b453e0e32f6ad7007eb2184a (diff)
downloadesper-testing-35ba1a6f765f72a1d91a5456c7556e6274f8c3a9.tar.gz
esper-testing-35ba1a6f765f72a1d91a5456c7556e6274f8c3a9.tar.bz2
esper-testing-35ba1a6f765f72a1d91a5456c7556e6274f8c3a9.tar.xz
esper-testing-35ba1a6f765f72a1d91a5456c7556e6274f8c3a9.zip
o Moving Jenkins XML objects and parsing to it's own package.
o Removing fields from JenkinsBuild that's read from the XML later on.
Diffstat (limited to 'src/main/java/io/trygvis/esper/testing/Config.java')
-rwxr-xr-x[-rw-r--r--]src/main/java/io/trygvis/esper/testing/Config.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/main/java/io/trygvis/esper/testing/Config.java b/src/main/java/io/trygvis/esper/testing/Config.java
index d1bc2bd..e184d46 100644..100755
--- a/src/main/java/io/trygvis/esper/testing/Config.java
+++ b/src/main/java/io/trygvis/esper/testing/Config.java
@@ -41,6 +41,7 @@ public class Config {
}
}
+ public final String appName;
public final GitoriousConfig gitorious;
public final long nexusUpdateInterval;
@@ -53,8 +54,10 @@ public class Config {
private BoneCPDataSource dataSource;
- public Config(GitoriousConfig gitorious, long nexusUpdateInterval, long jenkinsUpdateInterval, String databaseUrl,
- String databaseUsername, String databasePassword) {
+ public Config(String appName, GitoriousConfig gitorious,
+ long nexusUpdateInterval, long jenkinsUpdateInterval,
+ String databaseUrl, String databaseUsername, String databasePassword) {
+ this.appName = appName;
this.gitorious = gitorious;
this.nexusUpdateInterval = nexusUpdateInterval;
this.jenkinsUpdateInterval = jenkinsUpdateInterval;
@@ -73,7 +76,8 @@ public class Config {
properties.load(inputStream);
}
- return new Config(GitoriousConfig.fromProperties(properties),
+ return new Config(appName,
+ GitoriousConfig.fromProperties(properties),
getProperty(properties, "nexus.updateInterval").bind(parseInt).valueE("Missing required property: nexus.updateInterval") * 1000,
getProperty(properties, "jenkins.updateInterval").bind(parseInt).valueE("Missing required property: jenkins.updateInterval") * 1000,
trimToNull(properties.getProperty("database.url")),