summaryrefslogtreecommitdiff
path: root/src/com/p4square/grow/frontend
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/p4square/grow/frontend')
-rw-r--r--src/com/p4square/grow/frontend/GrowFrontend.java20
1 files changed, 4 insertions, 16 deletions
diff --git a/src/com/p4square/grow/frontend/GrowFrontend.java b/src/com/p4square/grow/frontend/GrowFrontend.java
index 305622d..a1e3488 100644
--- a/src/com/p4square/grow/frontend/GrowFrontend.java
+++ b/src/com/p4square/grow/frontend/GrowFrontend.java
@@ -55,28 +55,16 @@ public class GrowFrontend extends FMFacade {
mConfig = new Config();
}
+ public GrowFrontend(Config config) {
+ mConfig = config;
+ }
+
public Config getConfig() {
return mConfig;
}
@Override
public synchronized void start() throws Exception {
- 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);
- }
-
Template errorTemplate = getTemplate("templates/error.ftl");
if (errorTemplate != null) {
ErrorPage.setTemplate(errorTemplate);