diff options
| author | Jesse Morgan <jesse@jesterpm.net> | 2014-05-29 20:31:37 -0700 |
|---|---|---|
| committer | Jesse Morgan <jesse@jesterpm.net> | 2014-05-29 20:31:37 -0700 |
| commit | f09fc6ab4d9da8c24333b4d96c51c72816e86768 (patch) | |
| tree | b0d62407990c35c74a78e957cfb5caaa02085f39 /src | |
| parent | d2e16b63849189de8e872452ac101f9ed954c754 (diff) | |
Loading config earlier.20140529b
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/p4square/grow/GrowProcessComponent.java | 6 | ||||
| -rw-r--r-- | src/grow.properties | 10 |
2 files changed, 5 insertions, 11 deletions
diff --git a/src/com/p4square/grow/GrowProcessComponent.java b/src/com/p4square/grow/GrowProcessComponent.java index 9a7de6f..18b3d5b 100644 --- a/src/com/p4square/grow/GrowProcessComponent.java +++ b/src/com/p4square/grow/GrowProcessComponent.java @@ -41,7 +41,7 @@ public class GrowProcessComponent extends Component { this(new Config()); } - public GrowProcessComponent(Config config) { + public GrowProcessComponent(Config config) throws Exception { // Clients getClients().add(Protocol.FILE); getClients().add(Protocol.HTTP); @@ -49,6 +49,7 @@ public class GrowProcessComponent extends Component { // Prepare mConfig mConfig = config; + mConfig.updateConfig(this.getClass().getResourceAsStream("/grow.properties")); // Frontend GrowFrontend frontend = new GrowFrontend(mConfig); @@ -69,9 +70,6 @@ public class GrowProcessComponent extends Component { @Override public void start() throws Exception { - // Load mConfigs - mConfig.updateConfig(this.getClass().getResourceAsStream("/grow.properties")); - String configDomain = getContext().getParameters().getFirstValue("com.p4square.grow.configDomain"); if (configDomain != null) { mConfig.setDomain(configDomain); diff --git a/src/grow.properties b/src/grow.properties index cb3b86b..53075fe 100644 --- a/src/grow.properties +++ b/src/grow.properties @@ -1,17 +1,13 @@ # Frontend Settings -dev.staticRoot = -dev.dynamicRoot = - *.backendUri = riap://component/backend -*.staticRoot = /grow-frontend -*.dynamicRoot = /grow-frontend +*.staticRoot = +*.dynamicRoot = prod.postAccountCreationPage = http://foursquaregrow.com/login.html # Backend Settings -dev.clusterName = Dev Cluster - prod.clusterName = Prod Cluster +dev.clusterName = Dev Cluster *.awsRegion = us-west-2 prod.dynamoTablePrefix = grow-prod- |