From cc0d131ff60edf97512ce8c958b1220783bcf4e7 Mon Sep 17 00:00:00 2001
From: Graham Triggs <gtriggs@duraspace.org>
Date: Tue, 24 May 2016 14:34:26 +0100
Subject: [PATCH] [VIVO-1245] Cleanup of IndividualSearchResult (add new
 startup listener to configure for VIVO) and new SiteAdminController

---
 ...oller.java => VIVOSiteAdminController.java} |  4 ++--
 ...lt.java => VIVOIndividualSearchResult.java} |  9 ++++++---
 .../SearchResultTemplateModelSetup.java        | 18 ++++++++++++++++++
 .../WEB-INF/resources/startup_listeners.txt    |  2 ++
 webapp/src/main/webapp/WEB-INF/web.xml         |  2 +-
 5 files changed, 29 insertions(+), 6 deletions(-)
 rename api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/{SiteAdminController.java => VIVOSiteAdminController.java} (89%)
 rename api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/{IndividualSearchResult.java => VIVOIndividualSearchResult.java} (86%)
 create mode 100644 api/src/main/java/org/vivoweb/webapp/startup/SearchResultTemplateModelSetup.java

diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/VIVOSiteAdminController.java
similarity index 89%
rename from api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/VIVOSiteAdminController.java
index 3a0b3ce1..80b00825 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/VIVOSiteAdminController.java
@@ -11,10 +11,10 @@ import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.visualization.tools.ToolsRequestHandler;
 
-public class SiteAdminController extends BaseSiteAdminController {
+public class VIVOSiteAdminController extends BaseSiteAdminController {
     
     private static final long serialVersionUID = 1L;
-    private static final Log log = LogFactory.getLog(SiteAdminController.class);
+    private static final Log log = LogFactory.getLog(VIVOSiteAdminController.class);
     
     @Override
 	protected Map<String, Object> getSiteMaintenanceUrls(VitroRequest vreq) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/IndividualSearchResult.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/VIVOIndividualSearchResult.java
similarity index 86%
rename from api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/IndividualSearchResult.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/VIVOIndividualSearchResult.java
index efaaccae..c7cec1d0 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/IndividualSearchResult.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/VIVOIndividualSearchResult.java
@@ -13,8 +13,8 @@ import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.QueryUtils;
 
-public class IndividualSearchResult extends BaseIndividualSearchResult {
-    private static final Log log = LogFactory.getLog(IndividualSearchResult.class);
+public class VIVOIndividualSearchResult extends IndividualSearchResult {
+    private static final Log log = LogFactory.getLog(VIVOIndividualSearchResult.class);
 
     private static String VCARD_DATA_QUERY = ""
             + "PREFIX obo: <http://purl.obolibrary.org/obo/> \n"
@@ -33,7 +33,7 @@ public class IndividualSearchResult extends BaseIndividualSearchResult {
     private String email = "";
     private String title = "";
        
-    public IndividualSearchResult(Individual individual, VitroRequest vreq) {
+    public VIVOIndividualSearchResult(Individual individual, VitroRequest vreq) {
     	super(individual, vreq);
     	log.debug("Called Individual Search Result");
     	findVcardInfo();
@@ -71,4 +71,7 @@ public class IndividualSearchResult extends BaseIndividualSearchResult {
     	return email;
     }
 
+    public static void register() {
+        IndividualSearchResult.registerResultClass(VIVOIndividualSearchResult.class);
+    }
 }
\ No newline at end of file
diff --git a/api/src/main/java/org/vivoweb/webapp/startup/SearchResultTemplateModelSetup.java b/api/src/main/java/org/vivoweb/webapp/startup/SearchResultTemplateModelSetup.java
new file mode 100644
index 00000000..ef9b2687
--- /dev/null
+++ b/api/src/main/java/org/vivoweb/webapp/startup/SearchResultTemplateModelSetup.java
@@ -0,0 +1,18 @@
+package org.vivoweb.webapp.startup;
+
+import edu.cornell.mannlib.vitro.webapp.web.templatemodels.searchresult.VIVOIndividualSearchResult;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+public class SearchResultTemplateModelSetup implements ServletContextListener {
+    @Override
+    public void contextInitialized(ServletContextEvent servletContextEvent) {
+        VIVOIndividualSearchResult.register();
+    }
+
+    @Override
+    public void contextDestroyed(ServletContextEvent servletContextEvent) {
+
+    }
+}
diff --git a/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt b/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt
index 63c37f33..15de8aff 100644
--- a/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt
+++ b/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt
@@ -57,6 +57,8 @@ edu.cornell.mannlib.vitro.webapp.services.shortview.ShortViewServiceSetup
 
 edu.cornell.mannlib.vitro.webapp.visualization.setup.VisualizationSetup
 
+org.vivoweb.webapp.startup.SearchResultTemplateModelSetup
+
 edu.ucsf.vitro.opensocial.OpenSocialSmokeTests
 
 # For multiple language support
diff --git a/webapp/src/main/webapp/WEB-INF/web.xml b/webapp/src/main/webapp/WEB-INF/web.xml
index c2dc7296..2f7b50ce 100644
--- a/webapp/src/main/webapp/WEB-INF/web.xml
+++ b/webapp/src/main/webapp/WEB-INF/web.xml
@@ -326,7 +326,7 @@
   
   <servlet>
     <servlet-name>SiteAdminController</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.SiteAdminController</servlet-class>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.VIVOSiteAdminController</servlet-class>
   </servlet>
   <servlet-mapping>
     <servlet-name>SiteAdminController</servlet-name>