Fix EZP-23394: upgrade Solr backend to 4.10.1

Removed unused and deprecated field types in schema.xml, uncommented deprecated update handlers in solrconfig.xml that are not in use in the default eZ Find installation
ezsystems · Sep 29, 2014 · 6b4c37d · 6b4c37d
1 parent 3858b88
commit 6b4c37d
Show file tree

Hide file tree

Showing 59 changed files with 62 additions and 32 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,6 @@ java/logs
 .project
 java/solr-webapp
 java/solr/lib/classes
+java/solr/ezp-default/conf/_rest_managed.json
+
 
diff --git a/java/lib/ext/jcl-over-slf4j-1.6.6.jar b/java/lib/ext/jcl-over-slf4j-1.6.6.jar
diff --git a/java/lib/ext/jcl-over-slf4j-1.7.6.jar b/java/lib/ext/jcl-over-slf4j-1.7.6.jar
diff --git a/java/lib/ext/jul-to-slf4j-1.6.6.jar b/java/lib/ext/jul-to-slf4j-1.6.6.jar
diff --git a/java/lib/ext/jul-to-slf4j-1.7.6.jar b/java/lib/ext/jul-to-slf4j-1.7.6.jar
diff --git a/java/lib/ext/log4j-1.2.16.jar b/java/lib/ext/log4j-1.2.16.jar
diff --git a/java/lib/ext/log4j-1.2.17.jar b/java/lib/ext/log4j-1.2.17.jar
diff --git a/java/lib/ext/slf4j-api-1.6.6.jar b/java/lib/ext/slf4j-api-1.6.6.jar
diff --git a/java/lib/ext/slf4j-api-1.7.6.jar b/java/lib/ext/slf4j-api-1.7.6.jar
diff --git a/java/lib/ext/slf4j-log4j12-1.6.6.jar b/java/lib/ext/slf4j-log4j12-1.6.6.jar
diff --git a/java/lib/ext/slf4j-log4j12-1.7.6.jar b/java/lib/ext/slf4j-log4j12-1.7.6.jar
diff --git a/java/solr/ezp-default/conf/admin-extra.html b/java/solr/ezp-default/conf/admin-extra.html
@@ -15,17 +15,10 @@
  limitations under the License.
 -->
 
-<!-- The content of this page will be statically included into the top
-of the admin page.  Uncomment this as an example to see there the content
-will show up.
-
-<hr>
-<i>This line will appear before the first table</i>
-<tr>
-<td colspan="2">
-This row will be appended to the end of the first table
-</td>
-</tr>
-<hr>
+<!-- The content of this page will be statically included into the top-
+right box of the cores overview page. Uncomment this as an example to
+see there the content will show up.
 
+<img src="img/ico/construction.png"> This line will appear at the top-
+right box on collection1's Overview
 -->
diff --git a/java/solr/ezp-default/conf/admin-extra.menu-bottom.html b/java/solr/ezp-default/conf/admin-extra.menu-bottom.html
@@ -0,0 +1,25 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- admin-extra.menu-bottom.html -->
+<!--
+<li>
+  <a href="#" style="background-image: url(img/ico/construction.png);">
+    LAST ITEM
+  </a>
+</li>
+-->
diff --git a/java/solr/ezp-default/conf/admin-extra.menu-top.html b/java/solr/ezp-default/conf/admin-extra.menu-top.html
@@ -0,0 +1,25 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- admin-extra.menu-top.html -->
+<!--
+<li>
+  <a href="#" style="background-image: url(img/ico/construction.png);">
+    FIRST ITEM
+  </a>
+</li>
+-->
diff --git a/java/solr/ezp-default/conf/schema.xml b/java/solr/ezp-default/conf/schema.xml
@@ -149,24 +149,7 @@
 
     <!-- A Trie based date field for faster date range queries and date faceting. -->
     <fieldType name="tdate" class="solr.TrieDateField" omitNorms="true" precisionStep="6" positionIncrementGap="0"/>
-
-
-    <!--
-      Note:
-      These should only be used for compatibility with existing indexes (created with older Solr versions)
-      or if "sortMissingFirst" or "sortMissingLast" functionality is needed. Use Trie based fields instead.
-
-      Plain numeric field types that store and index the text
-      value verbatim (and hence don't support range queries, since the
-      lexicographic ordering isn't equal to the numeric ordering)
-    -->
-    <fieldType name="pint" class="solr.IntField" omitNorms="true"/>
-    <fieldType name="plong" class="solr.LongField" omitNorms="true"/>
-    <fieldType name="pfloat" class="solr.FloatField" omitNorms="true"/>
-    <fieldType name="pdouble" class="solr.DoubleField" omitNorms="true"/>
-    <fieldType name="pdate" class="solr.DateField" sortMissingLast="true" omitNorms="true"/>
-
-
+
     <!--
       Note:
       These should only be used for compatibility with existing indexes (created with older Solr versions)

diff --git a/java/solr/ezp-default/conf/solrconfig.xml b/java/solr/ezp-default/conf/solrconfig.xml
@@ -35,7 +35,7 @@
        that you fully re-index after changing this setting as it can
        affect both how text is indexed and queried.
   -->
-  <luceneMatchVersion>4.6</luceneMatchVersion>
+  <luceneMatchVersion>4.10.1</luceneMatchVersion>
 
   <!-- <lib/> directives can be used to instruct Solr to load an Jars
        identified and use them to resolve any "plugins" specified in
@@ -1108,6 +1108,7 @@
   </requestHandler>
 
   <!-- for back compat with clients using /update/json and /update/csv -->
+  <!--
   <requestHandler name="/update/json" class="solr.UpdateRequestHandler">
         <lst name="defaults">
          <str name="stream.contentType">application/json</str>
@@ -1118,6 +1119,7 @@
          <str name="stream.contentType">application/csv</str>
        </lst>
   </requestHandler>
+  -->
 
   <!-- Solr Cell Update Request Handler
 

diff --git a/java/solr/lib/attributes-binder-1.2.0.jar → java/solr/lib/attributes-binder-1.2.1.jar b/java/solr/lib/attributes-binder-1.2.0.jar → java/solr/lib/attributes-binder-1.2.1.jar
diff --git a/java/solr/lib/carrot2-mini-3.8.0.jar → java/solr/lib/carrot2-mini-3.9.0.jar b/java/solr/lib/carrot2-mini-3.8.0.jar → java/solr/lib/carrot2-mini-3.9.0.jar
diff --git a/java/solr/lib/ezsystems-ezfind-solr-extension-solr-4.10.1.jar b/java/solr/lib/ezsystems-ezfind-solr-extension-solr-4.10.1.jar
diff --git a/java/solr/lib/ezsystems-ezfind-solr-extension-solr-4.7.0.jar b/java/solr/lib/ezsystems-ezfind-solr-extension-solr-4.7.0.jar
diff --git a/java/solr/lib/icu4j-49.1.jar b/java/solr/lib/icu4j-49.1.jar
diff --git a/java/solr/lib/icu4j-52.1.jar → java/solr/lib/icu4j-53.1.jar b/java/solr/lib/icu4j-52.1.jar → java/solr/lib/icu4j-53.1.jar
diff --git a/java/solr/lib/jackson-core-asl-1.7.4.jar b/java/solr/lib/jackson-core-asl-1.7.4.jar
diff --git a/java/solr/lib/jackson-mapper-asl-1.7.4.jar b/java/solr/lib/jackson-mapper-asl-1.7.4.jar
diff --git a/java/solr/lib/lucene-analyzers-icu-4.10.1.jar b/java/solr/lib/lucene-analyzers-icu-4.10.1.jar
diff --git a/java/solr/lib/lucene-analyzers-icu-4.7.0.jar b/java/solr/lib/lucene-analyzers-icu-4.7.0.jar
diff --git a/java/solr/lib/lucene-analyzers-morfologik-4.10.1.jar b/java/solr/lib/lucene-analyzers-morfologik-4.10.1.jar
diff --git a/java/solr/lib/lucene-analyzers-morfologik-4.7.0.jar b/java/solr/lib/lucene-analyzers-morfologik-4.7.0.jar
diff --git a/...lr/lib/lucene-analyzers-smartcn-4.7.0.jar → ...r/lib/lucene-analyzers-smartcn-4.10.1.jar b/...lr/lib/lucene-analyzers-smartcn-4.7.0.jar → ...r/lib/lucene-analyzers-smartcn-4.10.1.jar
diff --git a/...lr/lib/lucene-analyzers-stempel-4.7.0.jar → ...r/lib/lucene-analyzers-stempel-4.10.1.jar b/...lr/lib/lucene-analyzers-stempel-4.7.0.jar → ...r/lib/lucene-analyzers-stempel-4.10.1.jar
diff --git a/java/solr/lib/morfologik-fsa-1.7.1.jar b/java/solr/lib/morfologik-fsa-1.7.1.jar
diff --git a/java/solr/lib/morfologik-polish-1.7.1.jar b/java/solr/lib/morfologik-polish-1.7.1.jar
diff --git a/java/solr/lib/morfologik-stemming-1.7.1.jar b/java/solr/lib/morfologik-stemming-1.7.1.jar
diff --git a/java/solr/lib/solr-analysis-extras-4.10.1.jar b/java/solr/lib/solr-analysis-extras-4.10.1.jar
diff --git a/java/solr/lib/solr-analysis-extras-4.7.0.jar b/java/solr/lib/solr-analysis-extras-4.7.0.jar
diff --git a/java/solr/lib/solr-cell-4.10.1.jar b/java/solr/lib/solr-cell-4.10.1.jar
diff --git a/java/solr/lib/solr-cell-4.7.0.jar b/java/solr/lib/solr-cell-4.7.0.jar
diff --git a/java/solr/lib/solr-clustering-4.10.1.jar b/java/solr/lib/solr-clustering-4.10.1.jar
diff --git a/java/solr/lib/solr-clustering-4.7.0.jar b/java/solr/lib/solr-clustering-4.7.0.jar
diff --git a/java/solr/lib/solr-core-4.10.1.jar b/java/solr/lib/solr-core-4.10.1.jar
diff --git a/java/solr/lib/solr-core-4.7.0.jar b/java/solr/lib/solr-core-4.7.0.jar
diff --git a/java/solr/lib/solr-dataimporthandler-4.10.1.jar b/java/solr/lib/solr-dataimporthandler-4.10.1.jar
diff --git a/java/solr/lib/solr-dataimporthandler-4.7.0.jar b/java/solr/lib/solr-dataimporthandler-4.7.0.jar
diff --git a/java/solr/lib/solr-dataimporthandler-extras-4.10.1.jar b/java/solr/lib/solr-dataimporthandler-extras-4.10.1.jar
diff --git a/java/solr/lib/solr-dataimporthandler-extras-4.7.0.jar b/java/solr/lib/solr-dataimporthandler-extras-4.7.0.jar
diff --git a/java/solr/lib/solr-langid-4.7.0.jar → java/solr/lib/solr-langid-4.10.1.jar b/java/solr/lib/solr-langid-4.7.0.jar → java/solr/lib/solr-langid-4.10.1.jar
diff --git a/java/solr/lib/solr-map-reduce-4.10.1.jar b/java/solr/lib/solr-map-reduce-4.10.1.jar
diff --git a/java/solr/lib/solr-morphlines-cell-4.10.1.jar b/java/solr/lib/solr-morphlines-cell-4.10.1.jar
diff --git a/java/solr/lib/solr-morphlines-core-4.10.1.jar b/java/solr/lib/solr-morphlines-core-4.10.1.jar
diff --git a/java/solr/lib/solr-solrj-4.10.1.jar b/java/solr/lib/solr-solrj-4.10.1.jar
diff --git a/java/solr/lib/solr-solrj-4.7.0.jar b/java/solr/lib/solr-solrj-4.7.0.jar
diff --git a/java/solr/lib/solr-test-framework-4.10.1.jar b/java/solr/lib/solr-test-framework-4.10.1.jar
diff --git a/java/solr/lib/solr-test-framework-4.7.0.jar b/java/solr/lib/solr-test-framework-4.7.0.jar
diff --git a/java/solr/lib/solr-uima-4.10.1.jar b/java/solr/lib/solr-uima-4.10.1.jar
diff --git a/java/solr/lib/solr-uima-4.7.0.jar b/java/solr/lib/solr-uima-4.7.0.jar
diff --git a/java/solr/lib/solr-velocity-4.10.1.jar b/java/solr/lib/solr-velocity-4.10.1.jar
diff --git a/java/solr/lib/solr-velocity-4.7.0.jar b/java/solr/lib/solr-velocity-4.7.0.jar
diff --git a/java/src/ezfind/build.xml b/java/src/ezfind/build.xml
@@ -23,7 +23,7 @@
   <property name="ezfind-java-path" value="../.." />
   <property name="ezfind-src-path" value="./src/main/java/" />
   <property name="dest" value="${solr-path}/lib" />
-  <property name="version" value="solr-4.7.0" />
+  <property name="version" value="solr-4.10.1" />
   <property name="fullnamever" value="ezsystems-${ant.project.name}-${version}"/>
 
   <description>

diff --git a/java/webapps/solr.war b/java/webapps/solr.war