summaryrefslogtreecommitdiff
path: root/src/net
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
commit42683efab25f2463624b73bd5a6c4c6cf63dbd89 (patch)
tree146f9c9eb9b17d80433519fca3604b6f7cba53bf /src/net
parent09ecc1653d46865d130e4f5ffbb3d257e49ac73b (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/net')
-rw-r--r--src/net/jesterpm/fmfacade/FMFacade.java15
-rw-r--r--src/net/jesterpm/fmfacade/FreeMarkerPageResource.java1
2 files changed, 13 insertions, 3 deletions
diff --git a/src/net/jesterpm/fmfacade/FMFacade.java b/src/net/jesterpm/fmfacade/FMFacade.java
index 0ea44f8..e80eeec 100644
--- a/src/net/jesterpm/fmfacade/FMFacade.java
+++ b/src/net/jesterpm/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/net/jesterpm/fmfacade/FreeMarkerPageResource.java b/src/net/jesterpm/fmfacade/FreeMarkerPageResource.java
index dfdba39..75f2b8a 100644
--- a/src/net/jesterpm/fmfacade/FreeMarkerPageResource.java
+++ b/src/net/jesterpm/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();