summaryrefslogtreecommitdiff
path: root/src/com/p4square/grow/backend/GrowBackend.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/p4square/grow/backend/GrowBackend.java')
-rw-r--r--src/com/p4square/grow/backend/GrowBackend.java23
1 files changed, 5 insertions, 18 deletions
diff --git a/src/com/p4square/grow/backend/GrowBackend.java b/src/com/p4square/grow/backend/GrowBackend.java
index 09c1d84..7da6fff 100644
--- a/src/com/p4square/grow/backend/GrowBackend.java
+++ b/src/com/p4square/grow/backend/GrowBackend.java
@@ -34,7 +34,11 @@ public class GrowBackend extends Application {
private final CassandraDatabase mDatabase;
public GrowBackend() {
- mConfig = new Config();
+ this(new Config());
+ }
+
+ public GrowBackend(Config config) {
+ mConfig = config;
mDatabase = new CassandraDatabase();
}
@@ -71,23 +75,6 @@ public class GrowBackend extends Application {
public void start() throws Exception {
super.start();
- // Load config
- final String configDomain =
- getContext().getParameters().getFirstValue("configDomain");
- if (configDomain != null) {
- mConfig.setDomain(configDomain);
- }
-
- mConfig.updateConfig(this.getClass().getResourceAsStream("/grow.properties"));
-
- final String configFilename =
- getContext().getParameters().getFirstValue("configFile");
-
- if (configFilename != null) {
- LOG.info("Loading configuration from " + configFilename);
- mConfig.updateConfig(configFilename);
- }
-
// Setup database
mDatabase.setClusterName(mConfig.getString("clusterName", "Dev Cluster"));
mDatabase.setKeyspaceName(mConfig.getString("keyspace", "GROW"));