From 69e2512750dd75fce43a21226979996c3cd7da1d Mon Sep 17 00:00:00 2001 From: Jesse Morgan Date: Sun, 9 Jun 2013 17:35:48 -0700 Subject: 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. --- src/com/p4square/grow/config/Config.java | 8 ++++++-- src/com/p4square/grow/frontend/GrowFrontend.java | 12 ++++++++---- src/com/p4square/grow/frontend/LoginPageResource.java | 2 +- src/com/p4square/grow/frontend/SurveyPageResource.java | 8 ++++---- src/grow.properties | 1 + src/templates/macros/common-page.ftl | 6 +++--- src/templates/macros/noticebox.ftl | 2 +- src/templates/pages/about.html.ftl | 2 -- src/templates/pages/index.html.ftl | 2 +- src/templates/pages/login.html.ftl | 2 +- src/templates/templates/footer.ftl | 6 +++--- src/templates/templates/nav.ftl | 12 ++++++------ src/templates/templates/question-image.ftl | 4 ++-- src/templates/templates/survey.ftl | 6 +++--- 14 files changed, 40 insertions(+), 33 deletions(-) create mode 100644 src/grow.properties (limited to 'src') 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"); } /** diff --git a/src/grow.properties b/src/grow.properties new file mode 100644 index 0000000..b1bd989 --- /dev/null +++ b/src/grow.properties @@ -0,0 +1 @@ +dev.backendUri = http://localhost:9095 diff --git a/src/templates/macros/common-page.ftl b/src/templates/macros/common-page.ftl index 1a5c3d3..5fa2740 100644 --- a/src/templates/macros/common-page.ftl +++ b/src/templates/macros/common-page.ftl @@ -4,9 +4,9 @@ Grow Process - - - + + +
diff --git a/src/templates/macros/noticebox.ftl b/src/templates/macros/noticebox.ftl index 43c36c3..eca1428 100644 --- a/src/templates/macros/noticebox.ftl +++ b/src/templates/macros/noticebox.ftl @@ -1,7 +1,7 @@ <#macro noticebox>
- +

<#nested>

diff --git a/src/templates/pages/about.html.ftl b/src/templates/pages/about.html.ftl index 65a1f1d..3ab2bc0 100644 --- a/src/templates/pages/about.html.ftl +++ b/src/templates/pages/about.html.ftl @@ -9,8 +9,6 @@ <@content> - -

About

Curabitur mattis molestie ligula, ac vestibulum Curabitur diff --git a/src/templates/pages/index.html.ftl b/src/templates/pages/index.html.ftl index 44f9dce..4e6ea73 100644 --- a/src/templates/pages/index.html.ftl +++ b/src/templates/pages/index.html.ftl @@ -11,7 +11,7 @@ <@content> - +

Grow "Buckets"

diff --git a/src/templates/pages/login.html.ftl b/src/templates/pages/login.html.ftl index 29e30e9..590649c 100644 --- a/src/templates/pages/login.html.ftl +++ b/src/templates/pages/login.html.ftl @@ -12,7 +12,7 @@ <@content>

Welcome! You will need to login with your Foursquare Church InFellowship login.

-
+

diff --git a/src/templates/templates/footer.ftl b/src/templates/templates/footer.ftl index c7f6ca6..64d6d47 100644 --- a/src/templates/templates/footer.ftl +++ b/src/templates/templates/footer.ftl @@ -1,9 +1,9 @@