diff --git a/webapp/config/web.xml b/webapp/config/web.xml
index 61c79bba8..e7fca4777 100644
--- a/webapp/config/web.xml
+++ b/webapp/config/web.xml
@@ -343,9 +343,9 @@
HomePageController
- /index.jsp
+ /home
-
+
FreemarkerTestController
edu.cornell.mannlib.vitro.webapp.controller.freemarker.TestController
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/TabController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/TabController.java
index 9dfec3a4f..91b71fac5 100755
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/TabController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/TabController.java
@@ -54,7 +54,11 @@ public class TabController extends VitroHttpServlet {
if (leadingTab.getTabId()==portal.getRootTabId()) {
request.setAttribute("homePageRequested", "true");
- request.setAttribute("title",portal.getAppName());
+ request.setAttribute("title", portal.getAppName());
+ // This will break Datastar, but this may be gone by the time Datastar integrates new Vitro code
+ RequestDispatcher rd = request.getRequestDispatcher("/home");
+ rd.forward(request, response);
+ return;
}
else
request.setAttribute("title",leadingTab.getTitle());
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java
index 4b4638bef..e85f55e8a 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java
@@ -436,7 +436,7 @@ public class FreemarkerHttpServlet extends VitroHttpServlet {
map.put("bannerImage", UrlBuilder.getUrl(themeDir + "site_icons/" + bannerImage));
}
- map.put("version", getVersionInfo(urlBuilder));
+ map.put("version", getRevisionInfo(urlBuilder));
return map;
}
@@ -480,7 +480,7 @@ public class FreemarkerHttpServlet extends VitroHttpServlet {
return copyright;
}
- private final Map getVersionInfo(UrlBuilder urlBuilder) {
+ private final Map getRevisionInfo(UrlBuilder urlBuilder) {
Map map = new HashMap();
map.put("label", RevisionInfoBean.getBean(getServletContext())
.getReleaseLabel());
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/HomePageController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/HomePageController.java
index b7472ec67..1c82db1f5 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/HomePageController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/HomePageController.java
@@ -22,7 +22,7 @@ public class HomePageController extends FreemarkerHttpServlet {
private static final String BODY_TEMPLATE = "home.ftl";
@Override
- protected ResponseValues processRequest(VitroRequest vreq) {
+ protected ResponseValues processRequest(VitroRequest vreq) {
Map body = new HashMap();
// Add home page data to body here