[or-cvs] [ernie/master 8/8] Changed package for all source files to org.torproject.ernie.web.
karsten at torproject.org
karsten at torproject.org
Wed Jul 7 09:36:48 UTC 2010
Author: Kevin Berry <xckjb88 at gmail.com>
Date: Tue, 6 Jul 2010 12:26:00 -0400
Subject: Changed package for all source files to org.torproject.ernie.web.
Commit: 1b92d13344babb71c4ec732d5faaa2b5426ed5b0
---
jsp/src/ernie/TemplateController.java | 68 --------------------
jsp/war/WEB-INF/templates/banner.tpl.jsp | 2 +-
jsp/war/bridge-users-graphs.jsp | 2 +-
jsp/war/consensus-graphs.jsp | 2 +-
jsp/war/data.jsp | 2 +-
jsp/war/exit-relays-graphs.jsp | 2 +-
jsp/war/gettor-graphs.jsp | 2 +-
jsp/war/graphs.jsp | 2 +-
jsp/war/index.jsp | 2 +-
jsp/war/new-users-graphs.jsp | 2 +-
jsp/war/papers.jsp | 2 +-
jsp/war/recurring-users-graphs.jsp | 2 +-
jsp/war/research.jsp | 2 +-
jsp/war/status.jsp | 2 +-
jsp/war/tools.jsp | 2 +-
jsp/war/torperf-graphs.jsp | 2 +-
.../torproject/ernie/web/TemplateController.java | 68 ++++++++++++++++++++
17 files changed, 83 insertions(+), 83 deletions(-)
delete mode 100644 jsp/src/ernie/TemplateController.java
create mode 100644 src/org/torproject/ernie/web/TemplateController.java
diff --git a/jsp/src/ernie/TemplateController.java b/jsp/src/ernie/TemplateController.java
deleted file mode 100644
index e719e6c..0000000
--- a/jsp/src/ernie/TemplateController.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package ernie;
-
-public class TemplateController {
-
-/*
- * TODO
- * Check if referenced template exists. If not,
- * set it to 404 page.
- */
-
-/**
- * The main parent template and layout.
- */
- private String mainTemplate;
-
-/**
- * The current template, the default is index on initialization
- */
- private String currentTemplate;
-
-/**
- * This is referencing name.
- */
- private String templateName;
-
-/**
- * The page title to be displayed.
- */
- private String title;
-
- public TemplateController() {
- this.mainTemplate = "/WEB-INF/templates/main.tpl.jsp";
- this.currentTemplate = "/WEB-INF/templates/index.tpl.jsp";
- this.templateName = "index";
- this.title = "Tor Metrics Portal";
- }
-
-/*
-* Setters
-*/
- public void setTemplate(String tpl) {
- this.templateName = tpl;
- this.currentTemplate = "/WEB-INF/templates/" + tpl + ".tpl.jsp";
- }
-
- public void setTitle(String title) {
- this.title=title;
- }
-
-/*
-* Getters
-*/
- public String getTemplate() {
- return currentTemplate;
- }
-
- public String getTemplateName() {
- return templateName;
- }
-
- public String getTitle() {
- return title;
- }
-
- public String getMainTemplate() {
- return mainTemplate;
- }
-}
diff --git a/jsp/war/WEB-INF/templates/banner.tpl.jsp b/jsp/war/WEB-INF/templates/banner.tpl.jsp
index c93b3c7..0bb94cc 100644
--- a/jsp/war/WEB-INF/templates/banner.tpl.jsp
+++ b/jsp/war/WEB-INF/templates/banner.tpl.jsp
@@ -1,4 +1,4 @@
-<jsp:useBean id="template" class="ernie.TemplateController" scope="request" />
+<jsp:useBean id="template" class="org.torproject.ernie.web.TemplateController" scope="request" />
<table class="banner" border="0" cellpadding="0" cellspacing="0" summary="">
<tr>
<td class="banner-left"><a href="/index.html"><img src="/images/top-left.png" alt="Click to go to home page" width="193" heigth="79"></a></td>
diff --git a/jsp/war/bridge-users-graphs.jsp b/jsp/war/bridge-users-graphs.jsp
index 34436aa..50278a0 100644
--- a/jsp/war/bridge-users-graphs.jsp
+++ b/jsp/war/bridge-users-graphs.jsp
@@ -1,4 +1,4 @@
-<jsp:useBean id="template" class="ernie.TemplateController" scope="request" />
+<jsp:useBean id="template" class="org.torproject.ernie.web.TemplateController" scope="request" />
<jsp:setProperty name="template" property="template" value="graphs_bridge-users"/>
<jsp:setProperty name="template" property="title" value="Tor Metrics Portal: Graphs"/>
<%@ include file="/WEB-INF/templates/main.tpl.jsp" %>
diff --git a/jsp/war/consensus-graphs.jsp b/jsp/war/consensus-graphs.jsp
index 5585e99..028bf41 100644
--- a/jsp/war/consensus-graphs.jsp
+++ b/jsp/war/consensus-graphs.jsp
@@ -1,4 +1,4 @@
-<jsp:useBean id="template" class="ernie.TemplateController" scope="request" />
+<jsp:useBean id="template" class="org.torproject.ernie.web.TemplateController" scope="request" />
<jsp:setProperty name="template" property="template" value="graphs_network-size"/>
<jsp:setProperty name="template" property="title" value="Tor Metrics Portal: Graphs"/>
<%@ include file="/WEB-INF/templates/main.tpl.jsp" %>
diff --git a/jsp/war/data.jsp b/jsp/war/data.jsp
index 7754091..4650eb7 100644
--- a/jsp/war/data.jsp
+++ b/jsp/war/data.jsp
@@ -1,4 +1,4 @@
-<jsp:useBean id="template" class="ernie.TemplateController" scope="request" />
+<jsp:useBean id="template" class="org.torproject.ernie.web.TemplateController" scope="request" />
<jsp:setProperty name="template" property="template" value="research_data"/>
<jsp:setProperty name="template" property="title" value="Tor Metrics Portal: Data"/>
<%@ include file="/WEB-INF/templates/main.tpl.jsp" %>
diff --git a/jsp/war/exit-relays-graphs.jsp b/jsp/war/exit-relays-graphs.jsp
index 8efd324..0a4c393 100644
--- a/jsp/war/exit-relays-graphs.jsp
+++ b/jsp/war/exit-relays-graphs.jsp
@@ -1,4 +1,4 @@
-<jsp:useBean id="template" class="ernie.TemplateController" scope="request" />
+<jsp:useBean id="template" class="org.torproject.ernie.web.TemplateController" scope="request" />
<jsp:setProperty name="template" property="template" value="graphs_exit-relays"/>
<jsp:setProperty name="template" property="title" value="Tor Metrics Portal: Graphs"/>
<%@ include file="/WEB-INF/templates/main.tpl.jsp" %>
diff --git a/jsp/war/gettor-graphs.jsp b/jsp/war/gettor-graphs.jsp
index 304e906..0d7d7c4 100644
--- a/jsp/war/gettor-graphs.jsp
+++ b/jsp/war/gettor-graphs.jsp
@@ -1,4 +1,4 @@
-<jsp:useBean id="template" class="ernie.TemplateController" scope="request" />
+<jsp:useBean id="template" class="org.torproject.ernie.web.TemplateController" scope="request" />
<jsp:setProperty name="template" property="template" value="graphs_gettor"/>
<jsp:setProperty name="template" property="title" value="Tor Metrics Portal: Graphs"/>
<%@ include file="/WEB-INF/templates/main.tpl.jsp" %>
diff --git a/jsp/war/graphs.jsp b/jsp/war/graphs.jsp
index 6d16419..e1c823b 100644
--- a/jsp/war/graphs.jsp
+++ b/jsp/war/graphs.jsp
@@ -1,4 +1,4 @@
-<jsp:useBean id="template" class="ernie.TemplateController" scope="request" />
+<jsp:useBean id="template" class="org.torproject.ernie.web.TemplateController" scope="request" />
<jsp:setProperty name="template" property="template" value="graphs"/>
<jsp:setProperty name="template" property="title" value="Tor Metrics Portal: Graphs"/>
<%@ include file="/WEB-INF/templates/main.tpl.jsp" %>
diff --git a/jsp/war/index.jsp b/jsp/war/index.jsp
index dfa63bf..09cdeb5 100644
--- a/jsp/war/index.jsp
+++ b/jsp/war/index.jsp
@@ -1,4 +1,4 @@
-<jsp:useBean id="template" class="ernie.TemplateController" scope="request" />
+<jsp:useBean id="template" class="org.torproject.ernie.web.TemplateController" scope="request" />
<jsp:setProperty name="template" property="template" value="index"/>
<jsp:setProperty name="template" property="title" value="Tor Metrics Portal"/>
<%@ include file="/WEB-INF/templates/main.tpl.jsp" %>
diff --git a/jsp/war/new-users-graphs.jsp b/jsp/war/new-users-graphs.jsp
index 807eec3..60469e3 100644
--- a/jsp/war/new-users-graphs.jsp
+++ b/jsp/war/new-users-graphs.jsp
@@ -1,4 +1,4 @@
-<jsp:useBean id="template" class="ernie.TemplateController" scope="request" />
+<jsp:useBean id="template" class="org.torproject.ernie.web.TemplateController" scope="request" />
<jsp:setProperty name="template" property="template" value="graphs_new-users"/>
<jsp:setProperty name="template" property="title" value="Tor Metrics Portal: Graphs"/>
<%@ include file="/WEB-INF/templates/main.tpl.jsp" %>
diff --git a/jsp/war/papers.jsp b/jsp/war/papers.jsp
index 1d0d44f..2bd6d10 100644
--- a/jsp/war/papers.jsp
+++ b/jsp/war/papers.jsp
@@ -1,4 +1,4 @@
-<jsp:useBean id="template" class="ernie.TemplateController" scope="request" />
+<jsp:useBean id="template" class="org.torproject.ernie.web.TemplateController" scope="request" />
<jsp:setProperty name="template" property="template" value="research_papers"/>
<jsp:setProperty name="template" property="title" value="Tor Metrics Portal: Papers"/>
<%@ include file="/WEB-INF/templates/main.tpl.jsp" %>
diff --git a/jsp/war/recurring-users-graphs.jsp b/jsp/war/recurring-users-graphs.jsp
index 6982251..2b6230a 100644
--- a/jsp/war/recurring-users-graphs.jsp
+++ b/jsp/war/recurring-users-graphs.jsp
@@ -1,4 +1,4 @@
-<jsp:useBean id="template" class="ernie.TemplateController" scope="request" />
+<jsp:useBean id="template" class="org.torproject.ernie.web.TemplateController" scope="request" />
<jsp:setProperty name="template" property="template" value="graphs_recurring-users"/>
<jsp:setProperty name="template" property="title" value="Tor Metrics Portal: Graphs"/>
<%@ include file="/WEB-INF/templates/main.tpl.jsp" %>
diff --git a/jsp/war/research.jsp b/jsp/war/research.jsp
index ea796fb..998a136 100644
--- a/jsp/war/research.jsp
+++ b/jsp/war/research.jsp
@@ -1,4 +1,4 @@
-<jsp:useBean id="template" class="ernie.TemplateController" scope="request" />
+<jsp:useBean id="template" class="org.torproject.ernie.web.TemplateController" scope="request" />
<jsp:setProperty name="template" property="template" value="research"/>
<jsp:setProperty name="template" property="title" value="Tor Metrics Portal: Reserch"/>
<%@ include file="/WEB-INF/templates/main.tpl.jsp" %>
diff --git a/jsp/war/status.jsp b/jsp/war/status.jsp
index 36a7aa4..449c53f 100644
--- a/jsp/war/status.jsp
+++ b/jsp/war/status.jsp
@@ -1,4 +1,4 @@
-<jsp:useBean id="template" class="ernie.TemplateController" scope="request" />
+<jsp:useBean id="template" class="org.torproject.ernie.web.TemplateController" scope="request" />
<jsp:setProperty name="template" property="template" value="status"/>
<jsp:setProperty name="template" property="title" value="Tor Metrics Portal: Status"/>
<%@ include file="/WEB-INF/templates/main.tpl.jsp" %>
diff --git a/jsp/war/tools.jsp b/jsp/war/tools.jsp
index e924bf2..36aa75a 100644
--- a/jsp/war/tools.jsp
+++ b/jsp/war/tools.jsp
@@ -1,4 +1,4 @@
-<jsp:useBean id="template" class="ernie.TemplateController" scope="request" />
+<jsp:useBean id="template" class="org.torproject.ernie.web.TemplateController" scope="request" />
<jsp:setProperty name="template" property="template" value="research_tools"/>
<jsp:setProperty name="template" property="title" value="Tor Metrics Portal: Tools"/>
<%@ include file="/WEB-INF/templates/main.tpl.jsp" %>
diff --git a/jsp/war/torperf-graphs.jsp b/jsp/war/torperf-graphs.jsp
index da786f2..5cc8a62 100644
--- a/jsp/war/torperf-graphs.jsp
+++ b/jsp/war/torperf-graphs.jsp
@@ -1,4 +1,4 @@
-<jsp:useBean id="template" class="ernie.TemplateController" scope="request" />
+<jsp:useBean id="template" class="org.torproject.ernie.web.TemplateController" scope="request" />
<jsp:setProperty name="template" property="template" value="graphs_torperf"/>
<jsp:setProperty name="template" property="title" value="Tor Metrics Portal: Graphs"/>
<%@ include file="/WEB-INF/templates/main.tpl.jsp" %>
diff --git a/src/org/torproject/ernie/web/TemplateController.java b/src/org/torproject/ernie/web/TemplateController.java
new file mode 100644
index 0000000..c505855
--- /dev/null
+++ b/src/org/torproject/ernie/web/TemplateController.java
@@ -0,0 +1,68 @@
+package org.torproject.ernie.web;
+
+public class TemplateController {
+
+/*
+ * TODO
+ * Check if referenced template exists. If not,
+ * set it to 404 page.
+ */
+
+/**
+ * The main parent template and layout.
+ */
+ private String mainTemplate;
+
+/**
+ * The current template, the default is index on initialization
+ */
+ private String currentTemplate;
+
+/**
+ * This is referencing name.
+ */
+ private String templateName;
+
+/**
+ * The page title to be displayed.
+ */
+ private String title;
+
+ public TemplateController() {
+ this.mainTemplate = "/WEB-INF/templates/main.tpl.jsp";
+ this.currentTemplate = "/WEB-INF/templates/index.tpl.jsp";
+ this.templateName = "index";
+ this.title = "Tor Metrics Portal";
+ }
+
+/*
+* Setters
+*/
+ public void setTemplate(String tpl) {
+ this.templateName = tpl;
+ this.currentTemplate = "/WEB-INF/templates/" + tpl + ".tpl.jsp";
+ }
+
+ public void setTitle(String title) {
+ this.title=title;
+ }
+
+/*
+* Getters
+*/
+ public String getTemplate() {
+ return currentTemplate;
+ }
+
+ public String getTemplateName() {
+ return templateName;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public String getMainTemplate() {
+ return mainTemplate;
+ }
+}
--
1.7.1
More information about the tor-commits
mailing list