From 2771276eced87ed0f503c1b510ed24e6c0301b7b Mon Sep 17 00:00:00 2001
From: ryounes <ryounes@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Wed, 13 Jul 2011 15:20:00 +0000
Subject: [PATCH] NIHVIVO-2775 Remove Lucene controllers, libraries, and all
 references to Lucene throughout the code.

---
 doc/3rd-party-licenses.txt                   |  3 --
 doc/install.html                             |  2 +-
 doc/upgrade-1.3.html                         |  2 +-
 example.deploy.properties                    |  2 +-
 productMods/WEB-INF/ontologies/app/search.n3 |  6 ++--
 productMods/WEB-INF/web.xml                  | 36 --------------------
 6 files changed, 6 insertions(+), 45 deletions(-)

diff --git a/doc/3rd-party-licenses.txt b/doc/3rd-party-licenses.txt
index 2482fb01..fd81ee7a 100644
--- a/doc/3rd-party-licenses.txt
+++ b/doc/3rd-party-licenses.txt
@@ -30,9 +30,6 @@ jmeter
 joda-time
 json-taglib
 log4j
-lucene-analyzers
-lucene-core
-lucene-highlighter
 solr
 spring
 stax-api
diff --git a/doc/install.html b/doc/install.html
index 3d03a8e2..503cc73d 100644
--- a/doc/install.html
+++ b/doc/install.html
@@ -394,7 +394,7 @@
                     <tr>
                         <td colspan="2">
                             Directory where the VIVO application will store the data that it creates.
-                            This includes uploaded files (usually imageS) and the Lucene search index. 
+                            This includes uploaded files (usually imageS) and the Solr search index. 
                             Be sure this directory exists and is writable by the user who  
                             the Tomcat service is running as. 
                         </td>
diff --git a/doc/upgrade-1.3.html b/doc/upgrade-1.3.html
index 419a85ea..1397d85f 100644
--- a/doc/upgrade-1.3.html
+++ b/doc/upgrade-1.3.html
@@ -28,7 +28,7 @@
                 </ul>
             </toc>
             
-            <h3>upload.directory and LuceneSetup.indexDir are merged into vitro.home.directory [see JB for further details]</h3>
+            <h3>upload.directory and SolrSetup.indexDir are merged into vitro.home.directory [see JB for further details]</h3>
 
             <h3>Email parameters in deploy.properties have changed. [see JB for further details]</h3>
             <ul>
diff --git a/example.deploy.properties b/example.deploy.properties
index 2636a178..b82e2868 100644
--- a/example.deploy.properties
+++ b/example.deploy.properties
@@ -49,7 +49,7 @@ 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.
+# This includes uploaded files (usually images) and the search index.
 #
 vitro.home.directory = /usr/local/vivo/data
 
diff --git a/productMods/WEB-INF/ontologies/app/search.n3 b/productMods/WEB-INF/ontologies/app/search.n3
index cf87f684..ed0b3d31 100644
--- a/productMods/WEB-INF/ontologies/app/search.n3
+++ b/productMods/WEB-INF/ontologies/app/search.n3
@@ -7,12 +7,12 @@
 @prefix localNav: <http://vitro.mannlib.cornell.edu/ns/localnav#> .
 @prefix bibo: <http://purl.org/ontology/bibo/> .
 
-# All instances of a class can be excluded from the lucene 
+# All instances of a class can be excluded from the search 
 # index by adding a vitroDisplay:excludeClass property between 
-# vitroDisplay:PrimaryLuceneIndex and the URI of the class 
+# vitroDisplay:PrimarySearchIndex and the URI of the class 
 # that you would like to exclude.
 
- vitroDisplay:PrimaryLuceneIndex 
+ vitroDisplay:PrimarySearchIndex 
 	rdf:type owl:Thing ; 
 	vitroDisplay:excludeClass core:Role ;
 	vitroDisplay:excludeClass core:AdvisingRelationship ;
diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml
index 8329be0b..f22dd23d 100644
--- a/productMods/WEB-INF/web.xml
+++ b/productMods/WEB-INF/web.xml
@@ -163,12 +163,6 @@
     <listener-class> edu.cornell.mannlib.vivo.auth.policy.SelfEditorRelationshipPolicy$Setup</listener-class>
   </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
@@ -940,12 +934,6 @@
     <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>
@@ -955,12 +943,6 @@
     <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>
@@ -970,12 +952,6 @@
     <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>
@@ -999,12 +975,6 @@
     <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>
@@ -1055,12 +1025,6 @@
     <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>