SEARCH-2454 Remove old lucene (#23)

This PR removes legacy Lucene code and dependency to the lucene 2.4.1 library. The data type analysers were removed with an exception of the definitions in models (datadictionaryModel.xml and cmisModel.xml) to be backwards compatible with existing components (like older versions of Search Services) and to ensure the current old-style models can still work with repository and pass validation.
2025-10-08 14:51:49 +00:00 · 2020-10-19 14:15:27 +01:00
parent 88cb7a0be2
commit 7ddb31d5e8
161 changed files with 2738 additions and 16852 deletions
--- a/data-model/src/main/resources/alfresco/data-model-stand-alone-context.xml
+++ b/data-model/src/main/resources/alfresco/data-model-stand-alone-context.xml
@@ -41,9 +41,6 @@
        <property name="dictionaryRegistryCache">
            <ref bean="compiledModelsCache"/>
        </property>
-        <property name="defaultAnalyserResourceBundleName">
-            <value>${lucene.defaultAnalyserResourceBundleName}</value>
-        </property>
    </bean>
 	
    <bean id="threadFactory" class="org.alfresco.util.TraceableThreadFactory">
--- a/data-model/src/main/resources/alfresco/model/cmisModel.xml
+++ b/data-model/src/main/resources/alfresco/model/cmisModel.xml
@@ -16,16 +16,19 @@
  <data-types>

    <data-type name="cmis:id">
+      <!-- Analysers are EOLed, left here for backwards compatibility -->
      <default-analyser-class>org.alfresco.repo.search.impl.lucene.analysis.AlfrescoStandardAnalyser</default-analyser-class>
      <java-class>java.lang.String</java-class>
    </data-type>

    <data-type name="cmis:uri">
+      <!-- Analysers are EOLed, left here for backwards compatibility -->
      <default-analyser-class>org.alfresco.repo.search.impl.lucene.analysis.AlfrescoStandardAnalyser</default-analyser-class>
      <java-class>java.lang.String</java-class>
    </data-type>

    <data-type name="cmis:html">
+      <!-- Analysers are EOLed, left here for backwards compatibility -->
      <default-analyser-class>org.alfresco.repo.search.impl.lucene.analysis.AlfrescoStandardAnalyser</default-analyser-class>
      <java-class>java.lang.String</java-class>
    </data-type>
@@ -436,4 +439,4 @@
    
  </types>

-</model>
+</model>
--- a/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers.properties
+++ b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers.properties
@@ -1,18 +0,0 @@
-# Data Type Index Analyzers
-
-d_dictionary.datatype.d_any.analyzer=org.alfresco.repo.search.impl.lucene.analysis.AlfrescoStandardAnalyser
-d_dictionary.datatype.d_text.analyzer=org.alfresco.repo.search.impl.lucene.analysis.AlfrescoStandardAnalyser
-d_dictionary.datatype.d_content.analyzer=org.alfresco.repo.search.impl.lucene.analysis.AlfrescoStandardAnalyser
-d_dictionary.datatype.d_int.analyzer=org.alfresco.repo.search.impl.lucene.analysis.IntegerAnalyser
-d_dictionary.datatype.d_long.analyzer=org.alfresco.repo.search.impl.lucene.analysis.LongAnalyser
-d_dictionary.datatype.d_float.analyzer=org.alfresco.repo.search.impl.lucene.analysis.FloatAnalyser
-d_dictionary.datatype.d_double.analyzer=org.alfresco.repo.search.impl.lucene.analysis.DoubleAnalyser
-d_dictionary.datatype.d_date.analyzer=org.alfresco.repo.search.impl.lucene.analysis.DateAnalyser
-d_dictionary.datatype.d_datetime.analyzer=org.alfresco.repo.search.impl.lucene.analysis.DateAnalyser
-d_dictionary.datatype.d_boolean.analyzer=org.alfresco.repo.search.impl.lucene.analysis.AlfrescoStandardAnalyser
-d_dictionary.datatype.d_qname.analyzer=org.alfresco.repo.search.impl.lucene.analysis.AlfrescoStandardAnalyser
-d_dictionary.datatype.d_guid.analyzer=org.alfresco.repo.search.impl.lucene.analysis.AlfrescoStandardAnalyser
-d_dictionary.datatype.d_category.analyzer=org.alfresco.repo.search.impl.lucene.analysis.AlfrescoStandardAnalyser
-d_dictionary.datatype.d_noderef.analyzer=org.alfresco.repo.search.impl.lucene.analysis.AlfrescoStandardAnalyser
-d_dictionary.datatype.d_path.analyzer=org.alfresco.repo.search.impl.lucene.analysis.AlfrescoStandardAnalyser
-d_dictionary.datatype.d_locale.analyzer=org.alfresco.repo.search.impl.lucene.analysis.LowerCaseVerbatimAnalyser
--- a/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_cs.properties
+++ b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_cs.properties
@@ -1,4 +0,0 @@
-# Data Type Index Analyzers
-
-d_dictionary.datatype.d_text.analyzer=org.apache.lucene.analysis.cz.CzechAnalyzer
-d_dictionary.datatype.d_content.analyzer=org.apache.lucene.analysis.cz.CzechAnalyzer
--- a/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_da.properties
+++ b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_da.properties
@@ -1,4 +0,0 @@
-# Data Type Index Analyzers
-
-d_dictionary.datatype.d_text.analyzer=org.alfresco.repo.search.impl.lucene.analysis.DanishSnowballAnalyser
-d_dictionary.datatype.d_content.analyzer=org.alfresco.repo.search.impl.lucene.analysis.DanishSnowballAnalyser
--- a/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_de.properties
+++ b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_de.properties
@@ -1,4 +0,0 @@
-# Data Type Index Analyzers
-
-d_dictionary.datatype.d_text.analyzer=org.apache.lucene.analysis.de.GermanAnalyzer
-d_dictionary.datatype.d_content.analyzer=org.apache.lucene.analysis.de.GermanAnalyzer
--- a/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_el.properties
+++ b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_el.properties
@@ -1,4 +0,0 @@
-# Data Type Index Analyzers
-
-d_dictionary.datatype.d_text.analyzer=org.apache.lucene.analysis.el.GreekAnalyzer
-d_dictionary.datatype.d_content.analyzer=org.apache.lucene.analysis.el.GreekAnalyzer
--- a/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_en.properties
+++ b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_en.properties
@@ -1,4 +0,0 @@
-# Data Type Index Analyzers
-
-d_dictionary.datatype.d_text.analyzer=org.alfresco.repo.search.impl.lucene.analysis.AlfrescoStandardAnalyser
-d_dictionary.datatype.d_content.analyzer=org.alfresco.repo.search.impl.lucene.analysis.AlfrescoStandardAnalyser
--- a/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_es.properties
+++ b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_es.properties
@@ -1,4 +0,0 @@
-# Data Type Index Analyzers
-
-d_dictionary.datatype.d_text.analyzer=org.alfresco.repo.search.impl.lucene.analysis.SpanishSnowballAnalyser
-d_dictionary.datatype.d_content.analyzer=org.alfresco.repo.search.impl.lucene.analysis.SpanishSnowballAnalyser
--- a/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_fi.properties
+++ b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_fi.properties
@@ -1,4 +0,0 @@
-# Data Type Index Analyzers
-
-d_dictionary.datatype.d_text.analyzer=org.alfresco.repo.search.impl.lucene.analysis.FinnishSnowballAnalyser
-d_dictionary.datatype.d_content.analyzer=org.alfresco.repo.search.impl.lucene.analysis.FinnishSnowballAnalyser
--- a/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_fr.properties
+++ b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_fr.properties
@@ -1,4 +0,0 @@
-# Data Type Index Analyzers
-
-d_dictionary.datatype.d_text.analyzer=org.apache.lucene.analysis.fr.FrenchAnalyzer
-d_dictionary.datatype.d_content.analyzer=org.apache.lucene.analysis.fr.FrenchAnalyzer
--- a/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_it.properties
+++ b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_it.properties
@@ -1,4 +0,0 @@
-# Data Type Index Analyzers
-
-d_dictionary.datatype.d_text.analyzer=org.alfresco.repo.search.impl.lucene.analysis.ItalianSnowballAnalyser
-d_dictionary.datatype.d_content.analyzer=org.alfresco.repo.search.impl.lucene.analysis.ItalianSnowballAnalyser
--- a/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_ja.properties
+++ b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_ja.properties
@@ -1,4 +0,0 @@
-# Data Type Index Analyzers
-
-d_dictionary.datatype.d_text.analyzer=org.apache.lucene.analysis.cjk.CJKAnalyzer
-d_dictionary.datatype.d_content.analyzer=org.apache.lucene.analysis.cjk.CJKAnalyzer
--- a/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_ko.properties
+++ b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_ko.properties
@@ -1,4 +0,0 @@
-# Data Type Index Analyzers
-
-d_dictionary.datatype.d_text.analyzer=org.apache.lucene.analysis.cjk.CJKAnalyzer
-d_dictionary.datatype.d_content.analyzer=org.apache.lucene.analysis.cjk.CJKAnalyzer
--- a/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_nl.properties
+++ b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_nl.properties
@@ -1,4 +0,0 @@
-# Data Type Index Analyzers
-
-d_dictionary.datatype.d_text.analyzer=org.apache.lucene.analysis.nl.DutchAnalyzer
-d_dictionary.datatype.d_content.analyzer=org.apache.lucene.analysis.nl.DutchAnalyzer
--- a/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_no.properties
+++ b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_no.properties
@@ -1,4 +0,0 @@
-# Data Type Index Analyzers
-
-d_dictionary.datatype.d_text.analyzer=org.alfresco.repo.search.impl.lucene.analysis.NorwegianSnowballAnalyser
-d_dictionary.datatype.d_content.analyzer=org.alfresco.repo.search.impl.lucene.analysis.NorwegianSnowballAnalyser
--- a/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_pt.properties
+++ b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_pt.properties
@@ -1,4 +0,0 @@
-# Data Type Index Analyzers
-
-d_dictionary.datatype.d_text.analyzer=org.alfresco.repo.search.impl.lucene.analysis.PortugueseSnowballAnalyser
-d_dictionary.datatype.d_content.analyzer=org.alfresco.repo.search.impl.lucene.analysis.PortugueseSnowballAnalyser
--- a/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_pt_BR.properties
+++ b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_pt_BR.properties
@@ -1,4 +0,0 @@
-# Data Type Index Analyzers
-
-d_dictionary.datatype.d_text.analyzer=org.apache.lucene.analysis.br.BrazilianAnalyzer
-d_dictionary.datatype.d_content.analyzer=org.apache.lucene.analysis.br.BrazilianAnalyzer
--- a/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_ru.properties
+++ b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_ru.properties
@@ -1,4 +0,0 @@
-# Data Type Index Analyzers
-
-d_dictionary.datatype.d_text.analyzer=org.apache.lucene.analysis.ru.RussianAnalyzer
-d_dictionary.datatype.d_content.analyzer=org.apache.lucene.analysis.ru.RussianAnalyzer
--- a/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_sv.properties
+++ b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_sv.properties
@@ -1,4 +0,0 @@
-# Data Type Index Analyzers
-
-d_dictionary.datatype.d_text.analyzer=org.alfresco.repo.search.impl.lucene.analysis.SwedishSnowballAnalyser
-d_dictionary.datatype.d_content.analyzer=org.alfresco.repo.search.impl.lucene.analysis.SwedishSnowballAnalyser
--- a/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_th.properties
+++ b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_th.properties
@@ -1,4 +0,0 @@
-# Data Type Index Analyzers
-
-d_dictionary.datatype.d_text.analyzer=org.apache.lucene.analysis.th.ThaiAnalyzer
-d_dictionary.datatype.d_content.analyzer=org.apache.lucene.analysis.th.ThaiAnalyzer
--- a/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_zh.properties
+++ b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_zh.properties
@@ -1,4 +0,0 @@
-# Data Type Index Analyzers
-
-d_dictionary.datatype.d_text.analyzer=org.apache.lucene.analysis.cn.ChineseAnalyzer
-d_dictionary.datatype.d_content.analyzer=org.apache.lucene.analysis.cn.ChineseAnalyzer
--- a/data-model/src/main/resources/alfresco/model/dictionaryModel.xml
+++ b/data-model/src/main/resources/alfresco/model/dictionaryModel.xml
@@ -4,8 +4,9 @@
   <author>Alfresco</author>
   <published>2005-09-29</published>
   <version>1.0</version>
+   <!-- Analysers are EOLed, left here for backwards compatibility -->
   <analyserResourceBundleName>alfresco/model/dataTypeAnalyzers</analyserResourceBundleName>
-   
+
   <namespaces>
      <!-- Default Namespace -->
      <namespace uri="" prefix=""/>
@@ -20,11 +21,13 @@
   <data-types>

      <data-type name="d:any">
+         <!-- Analysers are EOLed, left here for backwards compatibility -->
         <default-analyser-class>org.alfresco.repo.search.impl.lucene.analysis.AlfrescoStandardAnalyser</default-analyser-class>
         <java-class>java.lang.Object</java-class>
      </data-type>

      <data-type name="d:encrypted">
+         <!-- Analysers are EOLed, left here for backwards compatibility -->
         <default-analyser-class>org.alfresco.repo.search.impl.lucene.analysis.EmptyAnalyser</default-analyser-class>
         <java-class>javax.crypto.SealedObject</java-class>
      </data-type>
@@ -35,91 +38,109 @@
      </data-type>

      <data-type name="d:mltext">
+         <!-- Analysers are EOLed, left here for backwards compatibility -->
         <default-analyser-class>org.alfresco.repo.search.impl.lucene.analysis.AlfrescoStandardAnalyser</default-analyser-class>
         <java-class>org.alfresco.service.cmr.repository.MLText</java-class>
      </data-type>

      <data-type name="d:content">
+         <!-- Analysers are EOLed, left here for backwards compatibility -->
         <default-analyser-class>org.alfresco.repo.search.impl.lucene.analysis.AlfrescoStandardAnalyser</default-analyser-class>
         <java-class>org.alfresco.service.cmr.repository.ContentData</java-class>
      </data-type>

      <data-type name="d:int">
+         <!-- Analysers are EOLed, left here for backwards compatibility -->
         <default-analyser-class>org.alfresco.repo.search.impl.lucene.analysis.IntegerAnalyser</default-analyser-class>
         <java-class>java.lang.Integer</java-class>
      </data-type>

      <data-type name="d:long">
+         <!-- Analysers are EOLed, left here for backwards compatibility -->
         <default-analyser-class>org.alfresco.repo.search.impl.lucene.analysis.LongAnalyser</default-analyser-class>
         <java-class>java.lang.Long</java-class>
      </data-type>

      <data-type name="d:float">
+         <!-- Analysers are EOLed, left here for backwards compatibility -->
         <default-analyser-class>org.alfresco.repo.search.impl.lucene.analysis.FloatAnalyser</default-analyser-class>
         <java-class>java.lang.Float</java-class>
      </data-type>

      <data-type name="d:double">
+         <!-- Analysers are EOLed, left here for backwards compatibility -->
         <default-analyser-class>org.alfresco.repo.search.impl.lucene.analysis.DoubleAnalyser</default-analyser-class>
         <java-class>java.lang.Double</java-class>
      </data-type>

      <data-type name="d:date">
+         <!-- Analysers are EOLed, left here for backwards compatibility -->
         <default-analyser-class>org.alfresco.repo.search.impl.lucene.analysis.DateAnalyser</default-analyser-class>
         <java-class>java.util.Date</java-class>
      </data-type>

      <data-type name="d:datetime">
+         <!-- Analysers are EOLed, left here for backwards compatibility -->
         <default-analyser-class>org.alfresco.repo.search.impl.lucene.analysis.DateTimeAnalyser</default-analyser-class>
         <java-class>java.util.Date</java-class>
      </data-type>

      <data-type name="d:boolean">
+         <!-- Analysers are EOLed, left here for backwards compatibility -->
         <default-analyser-class>org.alfresco.repo.search.impl.lucene.analysis.AlfrescoStandardAnalyser</default-analyser-class>
         <java-class>java.lang.Boolean</java-class>
      </data-type>
-      
+
      <data-type name="d:qname">
+         <!-- Analysers are EOLed, left here for backwards compatibility -->
         <default-analyser-class>org.alfresco.repo.search.impl.lucene.analysis.AlfrescoStandardAnalyser</default-analyser-class>
         <java-class>org.alfresco.service.namespace.QName</java-class>
      </data-type>

      <data-type name="d:noderef">
+         <!-- Analysers are EOLed, left here for backwards compatibility -->
         <default-analyser-class>org.alfresco.repo.search.impl.lucene.analysis.AlfrescoStandardAnalyser</default-analyser-class>
         <java-class>org.alfresco.service.cmr.repository.NodeRef</java-class>
      </data-type>

      <data-type name="d:childassocref">
+         <!-- Analysers are EOLed, left here for backwards compatibility -->
         <default-analyser-class>org.alfresco.repo.search.impl.lucene.analysis.AlfrescoStandardAnalyser</default-analyser-class>
         <java-class>org.alfresco.service.cmr.repository.ChildAssociationRef</java-class>
      </data-type>

      <data-type name="d:assocref">
+         <!-- Analysers are EOLed, left here for backwards compatibility -->
         <default-analyser-class>org.alfresco.repo.search.impl.lucene.analysis.AlfrescoStandardAnalyser</default-analyser-class>
         <java-class>org.alfresco.service.cmr.repository.AssociationRef</java-class>
      </data-type>

      <data-type name="d:path">
+         <!-- Analysers are EOLed, left here for backwards compatibility -->
         <default-analyser-class>org.alfresco.repo.search.impl.lucene.analysis.AlfrescoStandardAnalyser</default-analyser-class>
         <java-class>org.alfresco.service.cmr.repository.Path</java-class>
      </data-type>

      <data-type name="d:category">
+         <!-- Analysers are EOLed, left here for backwards compatibility -->
         <default-analyser-class>org.alfresco.repo.search.impl.lucene.analysis.AlfrescoStandardAnalyser</default-analyser-class>
         <java-class>org.alfresco.service.cmr.repository.NodeRef</java-class>
      </data-type>

      <data-type name="d:locale">
+         <!-- Analysers are EOLed, left here for backwards compatibility -->
         <default-analyser-class>org.alfresco.repo.search.impl.lucene.analysis.VerbatimAnalyser</default-analyser-class>
         <java-class>java.util.Locale</java-class>
      </data-type>

      <data-type name="d:version">
+         <!-- Analysers are EOLed, left here for backwards compatibility -->
         <default-analyser-class>org.alfresco.repo.search.impl.lucene.analysis.VerbatimAnalyser</default-analyser-class>
         <java-class>org.alfresco.util.VersionNumber</java-class>
      </data-type>
-	   
-	  <data-type name="d:period">
+
+      <data-type name="d:period">
+         <!-- Analysers are EOLed, left here for backwards compatibility -->
         <default-analyser-class>org.alfresco.repo.search.impl.lucene.analysis.VerbatimAnalyser</default-analyser-class>
         <java-class>org.alfresco.service.cmr.repository.Period</java-class>
      </data-type>
@@ -128,5 +149,5 @@


   <!-- TODO: Define dictionary meta model -->
-   
+
 </model>