From 2d450029fbd626fb3493d6a69d7ce4390ac5301c Mon Sep 17 00:00:00 2001
From: ryounes <ryounes@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Wed, 25 May 2011 15:46:46 +0000
Subject: [PATCH] NIHVIVO-2437 Switch to Solr index and controllers

---
 example.deploy.properties   | 13 +++++++---
 productMods/WEB-INF/web.xml | 51 ++++++++++++++++++-------------------
 2 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/example.deploy.properties b/example.deploy.properties
index 323dcc04..aaf87500 100644
--- a/example.deploy.properties
+++ b/example.deploy.properties
@@ -41,6 +41,12 @@ tomcat.home = /usr/local/tomcat
 #
 webapp.name = vivo
 
+# 
+# URL of Solr context used in local VIVO search. Should consist of
+# scheme + servername + port + contextpath + "solr"
+#
+vitro.local.solr.url = http://localhost:8080/vivosolr
+
 #
 # The location where the VIVO application will store the data that it creates.
 # This includes uploaded files (usually images) and the Lucene search index.
@@ -48,10 +54,11 @@ webapp.name = vivo
 vitro.home.directory = /usr/local/vivo/data
 
 #
-# SMTP host which the "Contact Us" form can use to send mail. If this is left 
-# empty, the "Contact Us" form will be disabled.
+# SMTP host used to send email, and the email recipient. 
+# If these are left empty, email is disabled.
 #
-Vitro.smtpHost =
+email.smtpHost = 
+email.replyTo = 
 
 #
 # The basic parameters for a database connection. Change the end of the 
diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml
index e05793fa..be35c672 100644
--- a/productMods/WEB-INF/web.xml
+++ b/productMods/WEB-INF/web.xml
@@ -148,17 +148,17 @@
   </listener>
 
   <!-- The Lucene index uses a "public" filter, so the PropertyRestrictionPolicyHelper must already be set up. -->
-
+  <!--
   <listener>
     <listener-class> edu.cornell.mannlib.vitro.webapp.search.lucene.LuceneSetup </listener-class>
   </listener>
-  <!--
+  -->
   <listener>
     <listener-class>
       edu.cornell.mannlib.vitro.webapp.search.solr.SolrSetup
     </listener-class>
   </listener>
-  -->
+
   
   <!--  vivo specific, must appear before other policies -->
   <listener>
@@ -904,47 +904,46 @@
     <url-pattern>/listObjectPropertyStatements</url-pattern>
   </servlet-mapping>
 
-
+  <!-- 
   <servlet>
     <servlet-name>IndividualListController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.IndividualListController</servlet-class>
   </servlet>
-  <!-- 
+  -->
   <servlet>
     <servlet-name>IndividualListController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.SolrIndividualListController</servlet-class>
   </servlet>
-  -->
   <servlet-mapping>
     <servlet-name>IndividualListController</servlet-name>
     <url-pattern>/individuallist</url-pattern>
   </servlet-mapping>
 
+  <!--
   <servlet>
     <servlet-name>IndividualListRdf</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.EntityURLController</servlet-class>
   </servlet>
-  <!--
+  -->
   <servlet>
     <servlet-name>IndividualListRdf</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.IndividualListRdfController</servlet-class>
   </servlet>
-  -->
   <servlet-mapping>
     <servlet-name>IndividualListRdf</servlet-name>
     <url-pattern>/listrdf/*</url-pattern>
   </servlet-mapping>
 
+  <!--
   <servlet>
     <servlet-name>SearchController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.search.controller.PagedSearchController</servlet-class>
   </servlet>
-  <!--
+  -->
   <servlet>
     <servlet-name>SearchController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.search.controller.SolrPagedSearchController</servlet-class>
   </servlet>
-  -->
   <servlet-mapping>
     <servlet-name>SearchController</servlet-name>
     <url-pattern>/search</url-pattern>
@@ -964,16 +963,17 @@
     <url-pattern>/searchcontroller</url-pattern>
   </servlet-mapping>
 
+  <!--
   <servlet>
     <servlet-name>AutocompleteController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.search.controller.AutocompleteController</servlet-class>
   </servlet>
-  <!--
+  -->
   <servlet>
     <servlet-name>AutocompleteController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.search.controller.SolrAutocompleteController</servlet-class>
   </servlet>
-  -->
+
   <servlet-mapping>
     <servlet-name>AutocompleteController</servlet-name>
     <url-pattern>/autocomplete</url-pattern>
@@ -1019,45 +1019,44 @@
     <url-pattern>/contact</url-pattern>
   </servlet-mapping>
   
-
+  <!-- 
   <servlet>
     <servlet-name>JSON Service</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.JSONServlet</servlet-class>
   </servlet>
-  <!-- 
+  -->
   <servlet>
     <servlet-name>JSON Service</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.SolrJsonServlet</servlet-class>
   </servlet>
-  -->
   <servlet-mapping>
     <servlet-name>JSON Service</servlet-name>
     <url-pattern>/dataservice</url-pattern>
   </servlet-mapping>
-
+  
+  <!-- 
   <servlet>
     <servlet-name>JSON Reconcile Service</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.JSONReconcileServlet</servlet-class>
   </servlet>
-  <!-- 
+  -->
   <servlet>
     <servlet-name>JSON Reconcile Service</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.SolrJsonReconcileServlet</servlet-class>
   </servlet>
-  -->
   <servlet-mapping>
     <servlet-name>JSON Reconcile Service</servlet-name>
     <url-pattern>/reconcile</url-pattern>
   </servlet-mapping>
 
-    <servlet>
-      <servlet-name>HomePageController</servlet-name>
-      <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.HomePageController</servlet-class>
-    </servlet>
-    <servlet-mapping>
-      <servlet-name>HomePageController</servlet-name>
-      <url-pattern>/home</url-pattern>
-    </servlet-mapping>
+  <servlet>
+    <servlet-name>HomePageController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.HomePageController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>HomePageController</servlet-name>
+    <url-pattern>/home</url-pattern>
+  </servlet-mapping>
 
   <servlet>
     <servlet-name>DashboardPropertyListController</servlet-name>