summaryrefslogtreecommitdiff
path: root/src/com/p4square/fmfacade
diff options
context:
space:
mode:
authorJesse Morgan <jesse@jesterpm.net>2014-06-23 20:47:42 -0700
committerJesse Morgan <jesse@jesterpm.net>2014-06-23 20:47:42 -0700
commitbd1f76dba80b4ee74906e30dc932d7e409ef8a33 (patch)
tree97f24adf658c658b8dc578286ec02152ed7b3c29 /src/com/p4square/fmfacade
parentdf554b1754ffc31d2e7a116f197f7784d75039ec (diff)
Adding a domain label to the header.
The page header now displays the domain label if the domain is not prod. This is useful for quickly identifying if you are modifying prod data.
Diffstat (limited to 'src/com/p4square/fmfacade')
-rw-r--r--src/com/p4square/fmfacade/FMFacade.java15
-rw-r--r--src/com/p4square/fmfacade/FreeMarkerPageResource.java1
2 files changed, 13 insertions, 3 deletions
diff --git a/src/com/p4square/fmfacade/FMFacade.java b/src/com/p4square/fmfacade/FMFacade.java
index 54e4098..0e552b0 100644
--- a/src/com/p4square/fmfacade/FMFacade.java
+++ b/src/com/p4square/fmfacade/FMFacade.java
@@ -18,8 +18,10 @@ import freemarker.template.Template;
import org.apache.log4j.Logger;
+import com.p4square.grow.config.Config;
+
/**
- *
+ *
* @author Jesse Morgan <jesse@jesterpm.net>
*/
public class FMFacade extends Application {
@@ -32,11 +34,18 @@ public class FMFacade extends Application {
mFMConfig.setObjectWrapper(new DefaultObjectWrapper());
}
+ /**
+ * @return a Config object.
+ */
+ public Config getConfig() {
+ return null;
+ }
+
@Override
public synchronized Restlet createInboundRoot() {
return createRouter();
}
-
+
/**
* Retrieve a template.
*
@@ -75,7 +84,7 @@ public class FMFacade extends Application {
component.getServers().add(Protocol.HTTP, 8085);
component.getClients().add(Protocol.HTTP);
component.getDefaultHost().attach(new FMFacade());
-
+
// Setup shutdown hook
Runtime.getRuntime().addShutdownHook(new Thread() {
public void run() {
diff --git a/src/com/p4square/fmfacade/FreeMarkerPageResource.java b/src/com/p4square/fmfacade/FreeMarkerPageResource.java
index 46b0ec5..c6cf81e 100644
--- a/src/com/p4square/fmfacade/FreeMarkerPageResource.java
+++ b/src/com/p4square/fmfacade/FreeMarkerPageResource.java
@@ -76,6 +76,7 @@ public class FreeMarkerPageResource extends ServerResource {
root.put("attributes", getRequestAttributes());
root.put("query", getQuery().getValuesMap());
+ root.put("config", mFMF.getConfig());
if (getClientInfo().isAuthenticated()) {
final User user = getClientInfo().getUser();