From fababdd9d2cbb6eadbbebcdf089c428bf388e5ac Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 28 Oct 2010 15:09:17 +0000
Subject: [PATCH] NIHVIVO-1234 Handle routing of a request for the home page to
 the HomePageController by forwarding from TabController

---
 webapp/config/web.xml                                       | 4 ++--
 .../mannlib/vitro/webapp/controller/TabController.java      | 6 +++++-
 .../webapp/controller/freemarker/FreemarkerHttpServlet.java | 4 ++--
 .../webapp/controller/freemarker/HomePageController.java    | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

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 @@
   </servlet>
   <servlet-mapping>
     <servlet-name>HomePageController</servlet-name>
-    <url-pattern>/index.jsp</url-pattern>
+    <url-pattern>/home</url-pattern>
   </servlet-mapping>
-    
+        
   <servlet>
     <servlet-name>FreemarkerTestController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.TestController</servlet-class>
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<String, Object> getVersionInfo(UrlBuilder urlBuilder) {
+	private final Map<String, Object> getRevisionInfo(UrlBuilder urlBuilder) {
 		Map<String, Object> map = new HashMap<String, Object>();
 		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<String, Object> body = new HashMap<String, Object>();
         
         // Add home page data to body here