- Run Solr with java -Dsolr.clustering.enabled=true -jar start.jar to see clustered search results.
-
-
-## Replace the div content *if* Carrot^2 is available
-
diff --git a/home/src/main/resources/solr/conf/velocity/cluster_results.vm b/home/src/main/resources/solr/conf/velocity/cluster_results.vm
deleted file mode 100644
index 204480d5d..000000000
--- a/home/src/main/resources/solr/conf/velocity/cluster_results.vm
+++ /dev/null
@@ -1,31 +0,0 @@
-#**
- * Actual rendering of Clusters
- *#
-
-## For each cluster
-#foreach ($clusters in $response.response.clusters)
-
- #set($labels = $clusters.get('labels'))
- #set($docs = $clusters.get('docs'))
-
- ## This Cluster's Heading
-
- Disclaimer:
- The locations displayed in this demonstration are purely fictional.
- It is more than likely that no store with the items listed actually
- exists at that location!
-
diff --git a/home/src/main/resources/solr/conf/velocity/head.vm b/home/src/main/resources/solr/conf/velocity/head.vm
deleted file mode 100644
index d1f6ee6eb..000000000
--- a/home/src/main/resources/solr/conf/velocity/head.vm
+++ /dev/null
@@ -1,35 +0,0 @@
-#**
- * Provide elements for the section of the HTML document
- *#
-
- ## An example of using an arbitrary request parameter
-
-
- ## Has a "name" field ?
- #if($doc.getFieldValue('name'))
- #parse("product_doc.vm")
-
- ## Has a "compName_s" field ?
- #elseif($doc.getFieldValue('compName_s'))
- #parse("join_doc.vm")
-
- ## Fallback to richtext_doc
- #else
- #parse("richtext_doc.vm")
-
- #end
-
-
diff --git a/home/src/main/resources/solr/conf/velocity/hit_grouped.vm b/home/src/main/resources/solr/conf/velocity/hit_grouped.vm
deleted file mode 100644
index 5297f1e9a..000000000
--- a/home/src/main/resources/solr/conf/velocity/hit_grouped.vm
+++ /dev/null
@@ -1,43 +0,0 @@
-#**
- * Display grouped results
- *#
-
-
-
- #set($loc = $request.params.get('pt'))
- ## Normalize first trip through to "none" because
- ## an empty string generates an error message later on
- #if( ! $loc )
- #set( $loc = "none" )
- #end
-
- #set($dist = $request.params.get('d', "10"))
-
- ## Cities for The Select List
- #set( $cities = {
- "none": "No Filter",
- "45.17614,-93.87341": "Buffalo, MN",
- "37.7752,-100.0232": "Dodge City, KS",
- "35.0752,-97.032": "Oklahoma City, OK",
- "37.7752,-122.4232": "San Francisco CA"
- })
-
-
-
-
- Distance (KM):
-
-
-
-
-
-
-
-
-
-
-
-#end
diff --git a/home/src/main/resources/solr/conf/velocity/results_list.vm b/home/src/main/resources/solr/conf/velocity/results_list.vm
deleted file mode 100644
index f73532b2d..000000000
--- a/home/src/main/resources/solr/conf/velocity/results_list.vm
+++ /dev/null
@@ -1,22 +0,0 @@
-#**
- * Render the main Results List
- *#
-
-## Usually displayed inside
-
-#if($response.response.get('grouped'))
-
- #foreach($grouping in $response.response.get('grouped'))
- #parse("hit_grouped.vm")
- #end
-
-#else
-
- #foreach($doc in $response.results)
- #parse("hit.vm")
- ## Can get an extremely simple view of the doc
- ## which might be nicer for debugging
- ##parse("hit_plain.vm")
- #end
-
-#end
diff --git a/home/src/main/resources/solr/conf/velocity/richtext_doc.vm b/home/src/main/resources/solr/conf/velocity/richtext_doc.vm
deleted file mode 100644
index db6fca67b..000000000
--- a/home/src/main/resources/solr/conf/velocity/richtext_doc.vm
+++ /dev/null
@@ -1,153 +0,0 @@
-#**
- * Render a complex document in the results list
- *#
-
-## Load Mime-Type List and Mapping
-#parse('mime_type_lists.vm')
-## Sets:
-## * supportedMimeTypes, AKA supportedtypes
-## * mimeExtensionsMap, AKA extMap
-
-## Title
-#if($doc.getFieldValue('title'))
- #set($title = $esc.html($doc.getFirstValue('title')))
-#else
- #set($title = "["+$doc.getFieldValue('id')+"]")
-#end
-
-## URL
-#if($doc.getFieldValue('url'))
- #set($url = $doc.getFieldValue('url'))
-#elseif($doc.getFieldValue('resourcename'))
- #set($url = "file:///$doc.getFieldValue('resourcename')")
-#else
- #set($url = "$doc.getFieldValue('id')")
-#end
-
-## Sort out Mime-Type
-#set($ct = $list.get($doc.getFirstValue('content_type').split(";"),0))
-#set($filename = $doc.getFieldValue('resourcename'))
-#set($filetype = false)
-#set($filetype = $mimeExtensionsMap.get($ct))
-
-## TODO: falling back to file extension is convenient,
-## except when you don't have an icon for that extension
-## example "application/vnd.openxmlformats-officedocument.wordprocessingml.document"
-## document with a .docx extension.
-## It'd be nice to fall back to an "unknown" or the existing "file" type
-## We sort of do this below, but only if the filename has no extension
-## (anything after the last dot).
-
-#if(!$filetype)
- #set($filetype = $filename.substring($filename.lastIndexOf(".")).substring(1))
-#end
-
-## #if(!$filetype)
-## #set($filetype = "file")
-## #end
-## #if(!$supportedMimeTypes.contains($filetype))
-## #set($filetype = "file")
-## #end
-
-## Row 1: Icon and Title and mlt link
-
- ## Icon
- ## Small file type icons from http://www.splitbrain.org/projects/file_icons (public domain)
-

-
- ## Title, hyperlinked
-
- $title
-
- ## Link for MLT / More Like This / Find Similar
-
- #if($params.getBool('mlt', false) == false)
-
- More Like This
- #end
-
-
-
-
-## Row 2?: ID / URL
-
- Id: #field('id')
-
-
-## Resource Name
-
- #if($doc.getFieldValue('resourcename'))
- Resource name: $filename
- #elseif($url)
- URL: $url
- #end
- #if($ct)
- ($ct)
- #end
-
-
-## Author
-#if($doc.getFieldValue('author'))
-
- Author: #field('author')
-
-#end
-
-## Last_Modified Date
-#if($doc.getFieldValue('last_modified'))
-
- last-modified:
- #field('last_modified')
-
-#end
-
-## Main content of doc
-
- #field('content')
-
-
-## Display Similar Documents / MLT = More Like This
-
- #set($mlt = $mltResults.get($docId))
- #set($mltOn = $params.getBool('mlt'))
- #if($mltOn == true)
-
- Similar Items
-
- #end
- ## If has MLT enabled An Entries to show
- #if ($mltOn && $mlt && $mlt.size() > 0)
-
- ## Else MLT Enabled but no mlt results for this query
- #elseif($mltOn && $mlt.size() == 0)
-
No Similar Items Found
- #end
-
## div class=mlt
-
-#parse('debug.vm')
diff --git a/home/src/main/resources/solr/conf/velocity/suggest.vm b/home/src/main/resources/solr/conf/velocity/suggest.vm
deleted file mode 100644
index dae6b830d..000000000
--- a/home/src/main/resources/solr/conf/velocity/suggest.vm
+++ /dev/null
@@ -1,8 +0,0 @@
-#**
- * Provides cynamic spelling suggestions
- * as you type in the search form
- *#
-
-#foreach($t in $response.response.terms.name)
- $t.key
-#end
diff --git a/home/src/main/resources/solr/conf/velocity/tabs.vm b/home/src/main/resources/solr/conf/velocity/tabs.vm
deleted file mode 100644
index da19cbc0b..000000000
--- a/home/src/main/resources/solr/conf/velocity/tabs.vm
+++ /dev/null
@@ -1,50 +0,0 @@
-#**
- * Provides navigation/access to Advanced search options
- * Usually displayed near the top of the page
- *#
-
-##TODO: Make some nice tabs here
-
-#set($queryOpts = $params.get("queryOpts"))
-
-
-
-
Type of Search:
-
- ##queryOpts=$queryOpts
-
- ## return to Simple Search
- ##set( $selected = ($queryOpts && $queryOpts != "") )
- #set( $selected = ! $queryOpts )
-
- #if($selected)
- Simple
- #else
-
- Simple
- #end
-
-
- ## GEO-Spatial / Location Based
- #set( $selected = ($queryOpts == "spatial") )
-
- #if($selected)
- Spatial
- #else
-
- Spatial
- #end
-
-
- ## Group By Field
- #set( $selected = ($queryOpts == "group") )
-
- #if($selected)
- Group By
- #else
-
- Group By
- #end
-
-
-
diff --git a/home/src/main/resources/solr/conf/xslt/example.xsl b/home/src/main/resources/solr/conf/xslt/example.xsl
deleted file mode 100644
index aa5465937..000000000
--- a/home/src/main/resources/solr/conf/xslt/example.xsl
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- This has been formatted by the sample "example.xsl" transform -
- use your own XSLT to get a nicer page
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- |
-
-
-
-
-
-
- javascript:toggle("");?
-
-
- exp
-
-
-
-
-
-
- |
-
-
-
-
-
-
-
- |
-
-
- |
-
-
-
-
-
-
-
-
- |
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
diff --git a/home/src/main/resources/solr/conf/xslt/example_atom.xsl b/home/src/main/resources/solr/conf/xslt/example_atom.xsl
deleted file mode 100644
index 86e775074..000000000
--- a/home/src/main/resources/solr/conf/xslt/example_atom.xsl
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- Example Solr Atom 1.0 Feed
-
- This has been formatted by the sample "example_atom.xsl" transform -
- use your own XSLT to get a nicer Atom feed.
-
-
- Apache Solr
- solr-user@lucene.apache.org
-
-
-
-
-
- tag:localhost,2007:example
-
-
-
-
-
-
-
-
-
-
- tag:localhost,2007:
-
-
-
-
-
-
diff --git a/home/src/main/resources/solr/conf/xslt/example_rss.xsl b/home/src/main/resources/solr/conf/xslt/example_rss.xsl
deleted file mode 100644
index 407e65a79..000000000
--- a/home/src/main/resources/solr/conf/xslt/example_rss.xsl
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- Example Solr RSS 2.0 Feed
- http://localhost:8983/solr
-
- This has been formatted by the sample "example_rss.xsl" transform -
- use your own XSLT to get a nicer RSS feed.
-
- en-us
- http://localhost:8983/solr
-
-
-
-
-
-
-
-
-
- -
-
-
- http://localhost:8983/solr/select?q=id:
-
-
-
-
-
-
- http://localhost:8983/solr/select?q=id:
-
-
-
-
diff --git a/home/src/main/resources/solr/conf/xslt/luke.xsl b/home/src/main/resources/solr/conf/xslt/luke.xsl
deleted file mode 100644
index 6e988afe5..000000000
--- a/home/src/main/resources/solr/conf/xslt/luke.xsl
+++ /dev/null
@@ -1,337 +0,0 @@
-
-
-
-
-
-
-
-
- Solr Luke Request Handler Response
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Index Statistics
-
-
-
- Field Statistics
-
-
-
- Document statistics
-
-
-
-
-
-
-
-
-
-
-
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- |
-
-
-
-
-
-
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 50
- 800
- 160
- blue
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- background-color: ; width: px; height: px;
-
- |
-
-
-
-
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
-
- |
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- |
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
- |
-
-
-
-
- 1
-
-
-
-
-
-
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/home/src/main/resources/solr/conf/xslt/updateXml.xsl b/home/src/main/resources/solr/conf/xslt/updateXml.xsl
deleted file mode 100644
index f0794237e..000000000
--- a/home/src/main/resources/solr/conf/xslt/updateXml.xsl
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/home/src/main/resources/solr/solr.xml b/home/src/main/resources/solr/solr.xml
deleted file mode 100644
index ce025f2ee..000000000
--- a/home/src/main/resources/solr/solr.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/home/src/main/resources/solr/solr_newversion.xml b/home/src/main/resources/solr/solr_newversion.xml
deleted file mode 100644
index d68cd6a97..000000000
--- a/home/src/main/resources/solr/solr_newversion.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
-
-
- ${host:}
- ${jetty.port:8983}
- ${hostContext:solr}
- ${zkClientTimeout:30000}
- ${genericCoreNodeNames:true}
-
-
-
- ${socketTimeout:0}
- ${connTimeout:0}
-
-
-
diff --git a/installer/pom.xml b/installer/pom.xml
index f60bc18e1..b861258f5 100644
--- a/installer/pom.xml
+++ b/installer/pom.xml
@@ -105,18 +105,11 @@
home
- solr
webapp
-
- org.vivoweb
- vitro-solr
- ${vitro-version}
- war
-
org.vivoweb
vitro-home
diff --git a/pom.xml b/pom.xml
index 1f66dd1d5..2274ee995 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,6 @@
api
dependencies
webapp
- solr
home
diff --git a/solr/pom.xml b/solr/pom.xml
deleted file mode 100644
index 30a83f66f..000000000
--- a/solr/pom.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
- 4.0.0
-
- org.vivoweb
- vitro-solr
- 1.11.0-SNAPSHOT
- war
-
-
- org.vivoweb
- vitro-project
- 1.11.0-SNAPSHOT
- ..
-
-
- Vitro Solr App
-
-
-
-
- maven-clean-plugin
-
-
-
- overlays
-
-
-
-
-
-
-
-
-
- org.apache.solr
- solr
- 4.10.4
- war
-
-
- org.slf4j
- jcl-over-slf4j
- 1.6.1
-
-
- com.vividsolutions
- jts
- 1.13
-
-
- org.slf4j
- jul-to-slf4j
- 1.6.1
-
-
- log4j
- log4j
- 1.2.16
-
-
- org.slf4j
- slf4j-api
- 1.6.1
-
-
- org.slf4j
- slf4j-log4j12
- 1.6.1
-
-
-
diff --git a/solr/src/main/resources/log4j.properties b/solr/src/main/resources/log4j.properties
deleted file mode 100644
index dcc389c9a..000000000
--- a/solr/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-log4j.appender.AllAppender=org.apache.log4j.RollingFileAppender
-log4j.appender.AllAppender.File= ${catalina.base}/logs/solr.log
-log4j.appender.AllAppender.MaxFileSize=10MB
-log4j.appender.AllAppender.MaxBackupIndex=10
-log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.AllAppender.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c{1}] %m%n
-
-log4j.rootLogger=INFO, AllAppender
-
-# Make all of the Solr classes quieter...
-log4j.logger.org.apache.solr.level = WARNING
-# ...except for this one.
-log4j.logger.org.apache.solr.core.SolrResourceLoader.level = INFO
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 3acf9d7ad..cd3feb29c 100644
--- a/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt
+++ b/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt
@@ -67,5 +67,5 @@ org.apache.commons.fileupload.servlet.FileCleanerCleanup
# and the PermissionRegistry must already be set up.
edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache$Setup
-# This should be near the end, because it will issue a warning if the connection to Solr times out.
-edu.cornell.mannlib.vitro.webapp.servlet.setup.SolrSmokeTest
+# This should be near the end, because it will issue a warning if the connection to Solr or ElasticSearch times out.
+edu.cornell.mannlib.vitro.webapp.servlet.setup.SearchEngineSmokeTest