Skip to content

Commit

Permalink
FCREPO-1137 Upgrade to latest Fedora, Lucene and Solr
Browse files Browse the repository at this point in the history
  • Loading branch information
Gert Schmeltz Pedersen committed Sep 4, 2012
1 parent 52b3f8e commit 5e75b89
Show file tree
Hide file tree
Showing 17 changed files with 2,143 additions and 56 deletions.
20 changes: 10 additions & 10 deletions .classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,12 @@
<classpathentry kind="lib" path="FedoraGenericSearch/lib/commons-httpclient-3.1.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/commons-logging.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/dom4j-1.6.1.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/fontbox-1.6.0.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/jaxen-1.1.1.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/jaxrpc-api-1.1.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/jempbox-1.6.0.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/jrdf-0.3.4.3.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/jsr173_1.0_api.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/junit-4.5.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/log4j-1.2.15.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/pdfbox-1.6.0.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/saaj-api-1.3.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/saxon9he.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/serializer.jar"/>
Expand Down Expand Up @@ -50,13 +47,16 @@
<classpathentry kind="lib" path="FedoraGenericSearch/lib/servlet-api-2.4.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/xercesImpl-2.9.1.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/axis-1.4.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/lucene-analyzers-3.6.0.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/lucene-benchmark-3.6.0.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/lucene-core-3.6.0.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/lucene-demo-3.6.0.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/lucene-highlighter-3.6.0.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/lucene-memory-3.6.0.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/tika-app-1.1.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/fontbox-1.7.1.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/jempbox-1.7.1.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/lucene-analyzers-3.6.1.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/lucene-benchmark-3.6.1.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/lucene-core-3.6.1.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/lucene-demo-3.6.1.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/lucene-highlighter-3.6.1.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/lucene-memory-3.6.1.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/pdfbox-1.7.1.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/tika-app-1.2.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6"/>
<classpathentry kind="output" path="bin"/>
</classpath>
15 changes: 4 additions & 11 deletions FedoraGenericSearch/build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<property name="local.PROTOCOL" value="http" />
<property name="local.HOSTPORT" value="localhost:8080" />
<property name="local.FEDORA_HOME" location="/Users/gertschmeltzpedersen/f35" />
<property name="local.FEDORA_HOME" location="/Users/gertschmeltzpedersen/f36" />
<property name="local.FGSCONFIGOBJECTS_HOME" location="${local.FEDORA_HOME}" />
<property name="local.SOLR_HOME" location="/Users/gertschmeltzpedersen/Downloads/apache-solr-3.6.0" />
<property name="local.SOLR_SERVER" value="http://localhost:8983/solr" />
Expand All @@ -32,11 +32,11 @@
<property name="javac.debug" value="on"/>
<property name="javac.deprecation" value="on"/>
<property name="javac.maxwarns" value="100"/>
<property name="javac.source" value="1.5"/>
<property name="javac.target" value="1.5"/>
<property name="javac.source" value="1.6"/>
<property name="javac.target" value="1.6"/>

<property name="fedoragsearch.version" value="2.4.2"/>
<property name="fedora.version" value="3.5"/>
<property name="fedora.version" value="3.6"/>

<property name="source.dir" location="src/java"/>
<property name="lib.dir" location="lib"/>
Expand Down Expand Up @@ -307,13 +307,6 @@
<property name="test" value="gsearch.test.lucene.fgs24_1019.AllTests"/>
</target>

<target name="junit-lucene-fgs24_1009" depends="junit-set-lucene-fgs24_1009, junit">
</target>

<target name="junit-set-lucene-fgs24_1009">
<property name="test" value="gsearch.test.lucene.fgs24_1009.AllTests"/>
</target>

<target name="junit-fgs242_1076" depends="junit-set-fgs242_1076, junit">
</target>

Expand Down
Binary file renamed FedoraGenericSearch/lib/fontbox-1.6.0.jar → FedoraGenericSearch/lib/fontbox-1.7.1.jar
View file
Binary file not shown.
Binary file renamed FedoraGenericSearch/lib/jempbox-1.6.0.jar → FedoraGenericSearch/lib/jempbox-1.7.1.jar
View file
Binary file not shown.
Binary file renamed ...ericSearch/lib/lucene-analyzers-3.6.0.jar → ...ericSearch/lib/lucene-analyzers-3.6.1.jar
View file
Binary file not shown.
Binary file renamed ...ericSearch/lib/lucene-benchmark-3.6.0.jar → ...ericSearch/lib/lucene-benchmark-3.6.1.jar
View file
Binary file not shown.
Binary file renamed ...raGenericSearch/lib/lucene-core-3.6.0.jar → ...raGenericSearch/lib/lucene-core-3.6.1.jar
View file
Binary file not shown.
Binary file renamed ...raGenericSearch/lib/lucene-demo-3.6.0.jar → ...raGenericSearch/lib/lucene-demo-3.6.1.jar
View file
Binary file not shown.
Binary file renamed ...icSearch/lib/lucene-highlighter-3.6.0.jar → ...icSearch/lib/lucene-highlighter-3.6.1.jar
View file
Binary file not shown.
Binary file renamed ...GenericSearch/lib/lucene-memory-3.6.0.jar → ...GenericSearch/lib/lucene-memory-3.6.1.jar
View file
Binary file not shown.
Binary file renamed FedoraGenericSearch/lib/pdfbox-1.6.0.jar → FedoraGenericSearch/lib/pdfbox-1.7.1.jar
View file
Binary file not shown.
Binary file renamed FedoraGenericSearch/lib/tika-app-1.1.jar → FedoraGenericSearch/lib/tika-app-1.2.jar
View file
Binary file not shown.
16 changes: 13 additions & 3 deletions FedoraGenericSearch/src/html/fedoragsearch-doc.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
<div id="header">
<a href="" id="logo"></a>
<div id="title">
<h1>Fedora Generic Search Service Version 2.4.2</h1>
<h2>compatible with Fedora Version 3.5</h2>
<h1>Fedora Generic Search Service Version 2.5</h1>
<h2>compatible with Fedora Version 3.6.1</h2>
</div>
</div>

Expand Down Expand Up @@ -95,6 +95,7 @@ <h2>compatible with Fedora Version 3.5</h2>
<dt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="#embeddedqueries">Embedded queries</a></dt>
<dt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="#source">Building from source</a></dt>
<dt><a href="#HISTORY">V. HISTORY</a></dt>
<dt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="#new25">New features in version 2.5</a></dt>
<dt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="#new242">New features in version 2.4.2</a></dt>
<dt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="#new241">New features in version 2.4.1</a></dt>
<dt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="#new24">New features in version 2.4</a></dt>
Expand Down Expand Up @@ -316,7 +317,7 @@ <h4><a href="http://lucene.apache.org/solr">Solr</a></h4>
resulting in the set of GSearch configuration files.</p>
<p>The Solr plugin has dependencies on the configuration of the Solr server.
You should begin with the schema.xml file provided by GSearch in
FgsConfig/FgsConfigIndexTemplate/Solr/conf/schema-3.6.0-for-fgs-2.4.2.xml .
FgsConfig/FgsConfigIndexTemplate/Solr/conf/schema-3.6.1-for-fgs-2.5.xml .
It has a few modifications aimed at the Fedora demo objects.
You should uncomment the autoCommit element in solrconfig.xml and set values to 1.
Besides, you need to go through all the Solr conf files
Expand Down Expand Up @@ -772,6 +773,15 @@ <h4><a href="http://www.indexdata.dk/zebra/">Zebra</a></h4>
<a name="HISTORY"><h1>V. HISTORY</h1></a>
</div>

<div>
<a name="new25"><h2>New features in version 2.5</h2></a>
<ul>
<li>Compatibility with Lucene 3.6.1, Solr 3.6.1, PDFBox 1.7.1, and Tika 1.2
(<a href="https://jira.duraspace.org/browse/FCREPO-1137">FCREPO-1137</a>)
</li>
</ul>
</div>

<div>
<a name="new242"><h2>New features in version 2.4.2</h2></a>
<ul>
Expand Down
31 changes: 0 additions & 31 deletions FedoraGenericSearch/src/test/junit/gsearch/test/lucene/fgs24_1009/AllTests.java
View file

This file was deleted.

Loading

0 comments on commit 5e75b89

Please sign in to comment.