Merge pull request #640 from line-o/fix/618

[doc] remove legacy fulltext index from listings

Author: joewiz

src/main/xar-resources/collection.xconf

@@ -1,6 +1,5 @@
 <collection xmlns="http://exist-db.org/collection-config/1.0">
   <index xmlns:db5="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <fulltext default="none" attributes="false"/>
     <lucene>
       <analyzer class="org.apache.lucene.analysis.standard.StandardAnalyzer"/>
 

src/main/xar-resources/data/beginners-guide-to-xrx-v4/listings/listing-6.xml

@@ -1,7 +1,5 @@
 <collection xmlns="http://exist-db.org/collection-config/1.0">
   <index xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <!-- Disable the standard full text index -->
-    <fulltext default="none" attributes="false"/>
     <!-- Lucene index configuration -->
     <lucene>
       <!-- Use the standard analyzer will ignore stopwords like 'the', 'and' -->

src/main/xar-resources/data/configuration/listings/listing-5.xml

@@ -1,6 +1,4 @@
 <modules>
   <module id="ngram-index" class="org.exist.indexing.ngram.NGramIndex" file="ngram.dbx" n="3"/>
   <!-- <module id="spatial-index" class="org.exist.indexing.spatial.GMLHSQLIndex" connectionTimeout="10000" flushAfter="300" /> -->
-  <!-- The full text index is always required and should not be disabled. We still have some dependencies on this index in the database core. These will be removed once the redesign has been completed. -->
-  <module id="ft-legacy-index" class="org.exist.fulltext.FTIndex"/>
 </modules>

src/main/xar-resources/data/indexing/indexing.xml

@@ -3,7 +3,7 @@
         schematypens="http://purl.oclc.org/dsdl/schematron"?><article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
     <info>
         <title>Configuring Database Indexes</title>
-        <date>2Q19</date>
+        <date>2Q21</date>
         <keywordset>
             <keyword>application-development</keyword>
         </keywordset>
@@ -53,7 +53,7 @@
                 <para> <emphasis> <link xlink:href="lucene">Full Text Indexes</link>
                     </emphasis>: This full text indexing module features faster and customizable
                     full text indexing by transparently integrating Lucene into the XQuery engine.
-                    Prefer this index over the Legacy Full Text Index. </para>
+                </para>
             </listitem>
             <listitem>
                 <para> <emphasis> <link xlink:href="ngram">NGram Indexes</link> </emphasis>:
@@ -174,16 +174,14 @@
                 types of indexes: full text, range and ngram.</para>
 
             <para>If the document to be indexed uses namespaces, you should add a
-                <literal>xmlns</literal> declaration for each of the required namespaces to the
-                <tag>index</tag> element:</para>
+                <literal>xmlns</literal> declaration for each of the required namespaces:</para>
 
             <programlisting language="xml" xlink:href="listings/listing-4.xml"/>
             <para>The example configuration above creates two indexes on a collection of atom
                 documents. The two elements which should be indexed are both in the
                 <literal>atom</literal> namespace and we therefore need to declare a mapping for
-                this namespace. Please note that the <literal>xmlns</literal> namespace declarations
-                have to be specified on the <tag>index</tag> element, not the <tag>create</tag> or
-                <tag>fulltext</tag> elements.</para>
+                this namespace. Here, the namespace mapping is placed on the <tag>index</tag> 
+                element, but it can appear anywhere in the configuration document.</para>
         </sect2>
     </sect1>
 

src/main/xar-resources/data/indexing/listings/listing-4.xml

@@ -1,8 +1,8 @@
 <collection xmlns="http://exist-db.org/collection-config/1.0">
   <index xmlns:atom="http://www.w3.org/2005/Atom">
-    <fulltext default="none" attributes="no">
-      <create qname="atom:title"/>
-    </fulltext>
+    <lucene>
+      <text qname="atom:title"/>
+    </lucene>
     <range>
       <create qname="atom:id" type="xs:string"/>
     </range>

src/main/xar-resources/data/indexing/listings/listing-8.xml

@@ -1,5 +1,3 @@
 <modules>
   <module id="ngram-index" class="org.exist.indexing.ngram.NGramIndex" file="ngram.dbx" n="3"/>
-  <!-- The full text index is always required and should not be disabled. We still have some dependencies on this index in the database core. These will be removed once the redesign has been completed. -->
-  <module id="ft-legacy-index" class="org.exist.fulltext.FTIndex"/>
 </modules>

src/main/xar-resources/data/lucene/listings/listing-3.xml

@@ -4,7 +4,7 @@
     xmlns:xlink="http://www.w3.org/1999/xlink">
     <info>
         <title>Full Text Index</title>
-        <date>1Q20</date>
+        <date>2Q21</date>
         <keywordset>
             <keyword>indexing</keyword>
         </keywordset>
@@ -49,11 +49,7 @@
             xlink:href="indexing#idxconf">documentation</link>. For example:</para>
 
         <example>
-            <title>collection.xconf for version 2.2</title>
-            <programlisting language="xml" xlink:href="listings/listing-3.xml"/>
-        </example>
-        <example>
-            <title>collection.xconf for version 3.0 and above.</title>
+            <title>collection.xconf (for version 3.0 and above).</title>
             <programlisting language="xml" xlink:href="listings/listing-4.xml"/>
         </example>
 

src/main/xar-resources/data/lucene/lucene.xml

@@ -1,8 +1,5 @@
 <collection xmlns="http://exist-db.org/collection-config/1.0">
-  <index>
-    <fulltext default="none" attributes="no">
-    </fulltext>
-  </index>
+  <index/>
   <triggers>
     <trigger event="create,delete,update,copy,move" class="org.exist.versioning.VersioningTrigger">
       <parameter name="overwrite" value="yes"/>

src/main/xar-resources/data/versioning/listings/listing-1.xml

@@ -134,7 +134,6 @@
                 <literal>conf.xml</literal>. Add a <tag>custom-filter</tag> child tag to the
                 <tag>serializer</tag> element and set its <literal>class</literal> attribute to
                 <literal>org.exist.versioning.VersioningFilter</literal>:</para>
-            <programlisting language="xml" xlink:href="listings/listing-2.xml"/>
             <para>eXist must be restarted for the versioning filter to become active.</para>
         </sect2>
     </sect1>