Configuration Changes

Fixing a bug in the config class and updating all templates and pages to
use the dynamicRoot and staticRoot config values to prefix URLs.

4 files changed, 19 insertions, 11 deletions

diff --git a/src/com/p4square/grow/config/Config.java b/src/com/p4square/grow/config/Config.java
index f5ebe3c..20d6ff5 100644
--- a/src/com/p4square/grow/config/Config.java
+++ b/src/com/p4square/grow/config/Config.java
@@ -49,6 +49,7 @@ public class Config {
      * @param domain The new domain.
      */
     public void setDomain(String domain) {
+        cLog.info("Setting Config domain to " + domain);
         mDomain = domain;
     }
 
@@ -99,17 +100,20 @@ public class Config {
         String result;
 
         final String domainKey = mDomain + "." + key;
-        result = mProperties.getProperty(domainKey, defaultValue);
+        result = mProperties.getProperty(domainKey);
         if (result != null) {
+            cLog.debug("Reading config for key = { " + key + " }. Got result = { " + result + " }");
             return result;
         }
 
         final String globalKey = "*." + key;
-        result = mProperties.getProperty(globalKey, defaultValue);
+        result = mProperties.getProperty(globalKey);
         if (result != null) {
+            cLog.debug("Reading config for key = { " + key + " }. Got result = { " + result + " }");
             return result;
         }
 
+        cLog.debug("Reading config for key = { " + key + " }. Got default value = { " + defaultValue + " }");
         return defaultValue;
     }
 
diff --git a/src/com/p4square/grow/frontend/GrowFrontend.java b/src/com/p4square/grow/frontend/GrowFrontend.java
index e3662d5..226929d 100644
--- a/src/com/p4square/grow/frontend/GrowFrontend.java
+++ b/src/com/p4square/grow/frontend/GrowFrontend.java
@@ -41,13 +41,15 @@ public class GrowFrontend extends FMFacade {
         super.start();
 
         final String configDomain =
-            getContext().getParameters().getFirstValue("config-domain");
+            getContext().getParameters().getFirstValue("configDomain");
         if (configDomain != null) {
             mConfig.setDomain(configDomain);
         }
 
+        mConfig.updateConfig(this.getClass().getResourceAsStream("/grow.properties"));
+
         final String configFilename =
-            getContext().getParameters().getFirstValue("config-file");
+            getContext().getParameters().getFirstValue("configFile");
 
         if (configFilename != null) {
             mConfig.updateConfig(configFilename);
@@ -58,8 +60,10 @@ public class GrowFrontend extends FMFacade {
     protected Router createRouter() {
         Router router = new Router(getContext());
 
+        final String loginPage = getConfig().getString("dynamicRoot", "") + "/login.html";
+
         final LoginAuthenticator defaultGuard =
-            new LoginAuthenticator(getContext(), true, "login.html");
+            new LoginAuthenticator(getContext(), true, loginPage);
         defaultGuard.setNext(FreeMarkerPageResource.class);
         router.attachDefault(defaultGuard);
         router.attach("/login.html", LoginPageResource.class);
@@ -69,7 +73,7 @@ public class GrowFrontend extends FMFacade {
         accountRouter.attach("/assessment", SurveyPageResource.class);
 
         final LoginAuthenticator accountGuard =
-            new LoginAuthenticator(getContext(), false, "login.html");
+            new LoginAuthenticator(getContext(), false, loginPage);
         accountGuard.setNext(accountRouter);
         router.attach("/account", accountGuard);
 
diff --git a/src/com/p4square/grow/frontend/LoginPageResource.java b/src/com/p4square/grow/frontend/LoginPageResource.java
index ac9f651..70caa3e 100644
--- a/src/com/p4square/grow/frontend/LoginPageResource.java
+++ b/src/com/p4square/grow/frontend/LoginPageResource.java
@@ -91,7 +91,7 @@ public class LoginPageResource extends FreeMarkerPageResource {
 
         if (authenticated) {
             // TODO: Better return url.
-            getResponse().redirectSeeOther("/index.html");
+            getResponse().redirectSeeOther(mGrowFrontend.getConfig().getString("dynamicRoot", "") + "/index.html");
             return null;
 
         } else {
diff --git a/src/com/p4square/grow/frontend/SurveyPageResource.java b/src/com/p4square/grow/frontend/SurveyPageResource.java
index e7fcd07..280184b 100644
--- a/src/com/p4square/grow/frontend/SurveyPageResource.java
+++ b/src/com/p4square/grow/frontend/SurveyPageResource.java
@@ -152,13 +152,13 @@ public class SurveyPageResource extends FreeMarkerPageResource {
             }
 
             // Find the next question or finish the assessment.
-            String nextPage;
+            String nextPage = mConfig.getString("dynamicRoot", "");
             {
                 String nextQuestionId = (String) questionData.get("nextQuestion");
                 if (nextQuestionId == null) {
-                    nextPage = "/account/assessment/results";
+                    nextPage += "/account/assessment/results";
                 } else {
-                    nextPage = "/account/assessment/question/" + nextQuestionId;
+                    nextPage += "/account/assessment/question/" + nextQuestionId;
                 }
             }
 
@@ -176,7 +176,7 @@ public class SurveyPageResource extends FreeMarkerPageResource {
      * @return The backend endpoint URI
      */
     private String getBackendEndpoint() {
-        return mConfig.getString("backendUri", "http://localhost:9095");
+        return mConfig.getString("backendUri", "riap://component/backend");
     }
 
     /**