Merge pull request #23 from projecthydra/solr-4.9

Solr and Jetty updates
samvera-deprecated · Aug 29, 2014 · 396ffff · 396ffff
2 parents 248a8e5 + d41af9f
commit 396ffff
Show file tree

Hide file tree

Showing 48 changed files with 448 additions and 106 deletions.
diff --git a/NOTICE.txt b/NOTICE.txt
diff --git a/README.md b/README.md
@@ -0,0 +1,69 @@
+# hydra-jetty
+
+This is a copy of jetty with the needed applications for running Hydra.  These include two java-based applications:
+
+* [Fedora repository](https://github.com/futures/fcrepo4)
+* [Solr](http://lucene.apache.org/solr/)
+
+## Included Versions
+
+* jetty: 8.1.10.v20130312
+* solr: 4.9.0
+* fedora: 3.7.1
+
+## Usage
+
+### Dependencies
+
+* [Java 7 (JRE)](https://java.com/en/download/index.jsp)
+
+#### Java 6
+
+Java 6 is unsupported under Solr 4.9, but still supported under Fedora 3.7.1.  However, hydra-jetty has only been tested under
+Java 7 so it is recommended to use Java 7 and not Java 6.
+
+### Manual
+
+    git clone https://github.com/projecthydra/hydra-jetty
+    cd hydra-jetty
+    java -Xmx256m -XX:MaxPermSize=256m -jar start.jar
+
+You can also change the port jetty starts on by editing the file etc/jetty.xml and changing this line to indicate a different port number:
+
+    <Set name="port"><SystemProperty name="jetty.port" default="8983"/></Set>
+
+### Using jettywrapper
+
+For use within your Hydra application's Rails directory.
+
+    rake jetty:install
+    rake jetty:start
+
+See [jettywrapper](https://github.com/projecthydra/jettywrapper) for more information regarding configuration and usage.
+Port numbers and other java options maybe configured via the gem. 
+
+### Interaction
+
+When jetty is finished initializing itself, Solr is available at 
+
+* [http://localhost:8983/solr/](http://localhost:8983/solr/)
+
+Fedora is available in two copies, one for developement
+
+* [http://localhost:8983/fedora/](http://localhost:8983/fedora/)
+
+and an additional copy for testing:
+
+* [http://localhost:8983/fedora-test/](http://localhost:8983/fedora-test/)
+
+You can see a list of all installed applications at
+
+* [http://localhost:8983](http://localhost:8983)
+
+### Updating
+
+#### Solr and Jetty
+
+Solr is updated by downloading the latest from [Lucene](http://lucene.apache.org/solr/), which includes an instance of Jetty in the
+`example` directory.  Updating is a process of replacing the jar files as well as the solr.war and start.jar files.  Note that the
+example from Lucene does not include the start.ini file.
diff --git a/README.txt b/README.txt
diff --git a/lib/ext/jcl-over-slf4j-1.6.6.jar b/lib/ext/jcl-over-slf4j-1.6.6.jar
diff --git a/lib/ext/jcl-over-slf4j-1.7.6.jar b/lib/ext/jcl-over-slf4j-1.7.6.jar
diff --git a/lib/ext/jul-to-slf4j-1.6.6.jar b/lib/ext/jul-to-slf4j-1.6.6.jar
diff --git a/lib/ext/jul-to-slf4j-1.7.6.jar b/lib/ext/jul-to-slf4j-1.7.6.jar
diff --git a/lib/ext/log4j-1.2.16.jar b/lib/ext/log4j-1.2.16.jar
diff --git a/lib/ext/log4j-1.2.17.jar b/lib/ext/log4j-1.2.17.jar
diff --git a/lib/ext/slf4j-api-1.6.6.jar b/lib/ext/slf4j-api-1.6.6.jar
diff --git a/lib/ext/slf4j-api-1.7.6.jar b/lib/ext/slf4j-api-1.7.6.jar
diff --git a/lib/ext/slf4j-log4j12-1.6.6.jar b/lib/ext/slf4j-log4j12-1.6.6.jar
diff --git a/lib/ext/slf4j-log4j12-1.7.6.jar b/lib/ext/slf4j-log4j12-1.7.6.jar
diff --git a/lib/jetty-continuation-8.1.8.v20121106.jar → lib/jetty-continuation-8.1.10.v20130312.jar b/lib/jetty-continuation-8.1.8.v20121106.jar → lib/jetty-continuation-8.1.10.v20130312.jar
diff --git a/lib/jetty-deploy-8.1.8.v20121106.jar → lib/jetty-deploy-8.1.10.v20130312.jar b/lib/jetty-deploy-8.1.8.v20121106.jar → lib/jetty-deploy-8.1.10.v20130312.jar
diff --git a/lib/jetty-http-8.1.10.v20130312.jar b/lib/jetty-http-8.1.10.v20130312.jar
diff --git a/lib/jetty-http-8.1.8.v20121106.jar b/lib/jetty-http-8.1.8.v20121106.jar
diff --git a/lib/jetty-io-8.1.8.v20121106.jar → lib/jetty-io-8.1.10.v20130312.jar b/lib/jetty-io-8.1.8.v20121106.jar → lib/jetty-io-8.1.10.v20130312.jar
diff --git a/lib/jetty-jmx-8.1.8.v20121106.jar → lib/jetty-jmx-8.1.10.v20130312.jar b/lib/jetty-jmx-8.1.8.v20121106.jar → lib/jetty-jmx-8.1.10.v20130312.jar
diff --git a/lib/jetty-security-8.1.8.v20121106.jar → lib/jetty-security-8.1.10.v20130312.jar b/lib/jetty-security-8.1.8.v20121106.jar → lib/jetty-security-8.1.10.v20130312.jar
diff --git a/lib/jetty-server-8.1.10.v20130312.jar b/lib/jetty-server-8.1.10.v20130312.jar
diff --git a/lib/jetty-server-8.1.8.v20121106.jar b/lib/jetty-server-8.1.8.v20121106.jar
diff --git a/lib/jetty-servlet-8.1.10.v20130312.jar b/lib/jetty-servlet-8.1.10.v20130312.jar
diff --git a/lib/jetty-servlet-8.1.8.v20121106.jar b/lib/jetty-servlet-8.1.8.v20121106.jar
diff --git a/lib/jetty-util-8.1.8.v20121106.jar → lib/jetty-util-8.1.10.v20130312.jar b/lib/jetty-util-8.1.8.v20121106.jar → lib/jetty-util-8.1.10.v20130312.jar
diff --git a/lib/jetty-webapp-8.1.8.v20121106.jar → lib/jetty-webapp-8.1.10.v20130312.jar b/lib/jetty-webapp-8.1.8.v20121106.jar → lib/jetty-webapp-8.1.10.v20130312.jar
diff --git a/lib/jetty-xml-8.1.10.v20130312.jar b/lib/jetty-xml-8.1.10.v20130312.jar
diff --git a/lib/jetty-xml-8.1.8.v20121106.jar b/lib/jetty-xml-8.1.8.v20121106.jar
diff --git a/solr/development-core/conf/solrconfig.xml b/solr/development-core/conf/solrconfig.xml
@@ -6,7 +6,7 @@
 
   <abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
 
-  <luceneMatchVersion>LUCENE_43</luceneMatchVersion>
+  <luceneMatchVersion>4.9</luceneMatchVersion>
 
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
 

diff --git a/solr/lib/contrib/analysis-extras/README.txt b/solr/lib/contrib/analysis-extras/README.txt
@@ -4,16 +4,13 @@ upon large dependencies/dictionaries.
 It includes integration with ICU for multilingual support, and 
 analyzers for Chinese and Polish.
 
-Relies upon the following lucene components (in lucene-libs/):
+ICU relies upon lucene-libs/lucene-analyzers-icu-X.Y.jar
+and lib/icu4j-X.Y.jar
 
- * lucene-analyzers-icu-X.Y.jar
- * lucene-analyzers-smartcn-X.Y.jar
- * lucene-analyzers-stempel-X.Y.jar
- * lucene-analyzers-morfologik-X.Y.jar
- * lucene-analyzers-smartcn-X.Y.jar
+Smartcn relies upon lucene-libs/lucene-analyzers-smartcn-X.Y.jar
 
-And the following third-party library (in lib/):
+Stempel relies on lucene-libs/lucene-analyzers-stempel-X.Y.jar
 
- * icu4j-X.Y.jar
- * morfologik-*.jar
+Morfologik relies on lucene-libs/lucene-analyzers-morfologik-X.Y.jar
+and lib/morfologik-*.jar
 
diff --git a/solr/lib/contrib/analysis-extras/lib/icu4j-49.1.jar b/solr/lib/contrib/analysis-extras/lib/icu4j-49.1.jar
diff --git a/solr/lib/contrib/analysis-extras/lib/icu4j-53.1.jar b/solr/lib/contrib/analysis-extras/lib/icu4j-53.1.jar
diff --git a/...lysis-extras/lib/morfologik-fsa-1.5.5.jar → ...lysis-extras/lib/morfologik-fsa-1.7.1.jar b/...lysis-extras/lib/morfologik-fsa-1.5.5.jar → ...lysis-extras/lib/morfologik-fsa-1.7.1.jar
diff --git a/solr/lib/contrib/analysis-extras/lib/morfologik-polish-1.5.5.jar b/solr/lib/contrib/analysis-extras/lib/morfologik-polish-1.5.5.jar
diff --git a/solr/lib/contrib/analysis-extras/lib/morfologik-polish-1.7.1.jar b/solr/lib/contrib/analysis-extras/lib/morfologik-polish-1.7.1.jar
diff --git a/solr/lib/contrib/analysis-extras/lib/morfologik-stemming-1.5.5.jar b/solr/lib/contrib/analysis-extras/lib/morfologik-stemming-1.5.5.jar
diff --git a/solr/lib/contrib/analysis-extras/lib/morfologik-stemming-1.7.1.jar b/solr/lib/contrib/analysis-extras/lib/morfologik-stemming-1.7.1.jar
diff --git a/solr/lib/contrib/analysis-extras/lucene-libs/lucene-analyzers-icu-4.3.0.jar b/solr/lib/contrib/analysis-extras/lucene-libs/lucene-analyzers-icu-4.3.0.jar
diff --git a/solr/lib/contrib/analysis-extras/lucene-libs/lucene-analyzers-icu-4.9.0.jar b/solr/lib/contrib/analysis-extras/lucene-libs/lucene-analyzers-icu-4.9.0.jar
diff --git a/solr/lib/contrib/analysis-extras/lucene-libs/lucene-analyzers-morfologik-4.3.0.jar b/solr/lib/contrib/analysis-extras/lucene-libs/lucene-analyzers-morfologik-4.3.0.jar
diff --git a/solr/lib/contrib/analysis-extras/lucene-libs/lucene-analyzers-morfologik-4.9.0.jar b/solr/lib/contrib/analysis-extras/lucene-libs/lucene-analyzers-morfologik-4.9.0.jar
diff --git a/...e-libs/lucene-analyzers-smartcn-4.3.0.jar → ...e-libs/lucene-analyzers-smartcn-4.9.0.jar b/...e-libs/lucene-analyzers-smartcn-4.3.0.jar → ...e-libs/lucene-analyzers-smartcn-4.9.0.jar
diff --git a/...e-libs/lucene-analyzers-stempel-4.3.0.jar → ...e-libs/lucene-analyzers-stempel-4.9.0.jar b/...e-libs/lucene-analyzers-stempel-4.3.0.jar → ...e-libs/lucene-analyzers-stempel-4.9.0.jar
diff --git a/solr/lib/solr-analysis-extras-4.3.0.jar b/solr/lib/solr-analysis-extras-4.3.0.jar
diff --git a/solr/lib/solr-analysis-extras-4.9.0.jar b/solr/lib/solr-analysis-extras-4.9.0.jar
diff --git a/solr/test-core/conf/solrconfig.xml b/solr/test-core/conf/solrconfig.xml
@@ -6,7 +6,7 @@
 
   <abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
 
-  <luceneMatchVersion>LUCENE_43</luceneMatchVersion>
+  <luceneMatchVersion>4.9</luceneMatchVersion>
 
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
 

diff --git a/start.jar b/start.jar
diff --git a/webapps/solr.war b/webapps/solr.war