You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2018/06/11 19:13:50 UTC

svn commit: r1833350 - in /jackrabbit/branches/2.8: ./ jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/indexing-test/ jackrabbit-core/src/test/repository/workspaces/indexing-test-2/ jackrabbit-core/src/test/repository/workspaces/index...

Author: reschke
Date: Mon Jun 11 19:13:50 2018
New Revision: 1833350

URL: http://svn.apache.org/viewvc?rev=1833350&view=rev
Log:
JCR-4236: remove obsolete textFilterClasses config parameters (ported to 2.8)

Modified:
    jackrabbit/branches/2.8/   (props changed)
    jackrabbit/branches/2.8/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/indexing-test/workspace.xml
    jackrabbit/branches/2.8/jackrabbit-core/src/test/repository/workspaces/indexing-test-2/workspace.xml
    jackrabbit/branches/2.8/jackrabbit-core/src/test/repository/workspaces/indexing-test/workspace.xml
    jackrabbit/branches/2.8/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/cluster/repository.xml
    jackrabbit/branches/2.8/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/repository-oracle-compat.xml
    jackrabbit/branches/2.8/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/repository-oracle.xml

Propchange: jackrabbit/branches/2.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 11 19:13:50 2018
@@ -2,4 +2,4 @@
 /jackrabbit/branches/2.14:1813154
 /jackrabbit/branches/JCR-2272:1173165-1176545
 /jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1592881,1597717,1597799,1597806,1598035,1598058,1603769,1603934,1609712,1615997,1625561,1627529,1634584,1653275,1667787,1674859,1680757,1709811,1717599,1729382,1730696,1732436,1740814-1740815,1751279,1752165,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558,1766398,1771078,1771741,1771939,1771999,1772049,1772343,1772444,1772457,1772530,1772544,1773579,1773591,1773745,1774443,1775657,1779166,1779460,1780208,1786325,1787043,1787381,1792193,1793315,1793323,1793327,1793332,1796980,1797209,1797917,1798586,1799429,1802977,1807234,1807244,1808752,1808754,1809149,1809329,1810108,1811667,1812994,1814831,1817097-1817098,1817100,1821597,1822947,1822950,1826230,1826647,1826940,1826964
+/jackrabbit/trunk:1592881,1597717,1597799,1597806,1598035,1598058,1603769,1603934,1609712,1615997,1625561,1627529,1634584,1653275,1667787,1674859,1680757,1709811,1717599,1729382,1730696,1732436,1740814-1740815,1751279,1752165,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558,1766398,1771078,1771741,1771939,1771999,1772049,1772343,1772444,1772457,1772530,1772544,1773579,1773591,1773745,1774443,1775657,1779166,1779460,1780208,1786325,1787043,1787381,1792193,1793315,1793323,1793327,1793332,1796980,1797209,1797917,1798586,1799429,1802977,1807234,1807244,1808752,1808754,1809149,1809329,1810108,1811667,1812994,1814831,1817097-1817098,1817100,1818586,1821597,1822947,1822950,1826230,1826647,1826940,1826964

Modified: jackrabbit/branches/2.8/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/indexing-test/workspace.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/indexing-test/workspace.xml?rev=1833350&r1=1833349&r2=1833350&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/indexing-test/workspace.xml (original)
+++ jackrabbit/branches/2.8/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/indexing-test/workspace.xml Mon Jun 11 19:13:50 2018
@@ -32,7 +32,6 @@
     <param name="indexingConfiguration" value="${wsp.home}/indexing-configuration.xml"/>
     <param name="supportHighlighting" value="true"/>
     <param name="excerptProviderClass" value="org.apache.jackrabbit.core.query.lucene.WeightedHTMLExcerpt"/>
-    <param name="textFilterClasses" value="org.apache.jackrabbit.extractor.PlainTextExtractor,org.apache.jackrabbit.core.query.lucene.IndexingQueueTest$Extractor"/>
     <param name="extractorPoolSize" value="2"/>
     <param name="extractorTimeout" value="10"/>
   </SearchIndex>

Modified: jackrabbit/branches/2.8/jackrabbit-core/src/test/repository/workspaces/indexing-test-2/workspace.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-core/src/test/repository/workspaces/indexing-test-2/workspace.xml?rev=1833350&r1=1833349&r2=1833350&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-core/src/test/repository/workspaces/indexing-test-2/workspace.xml (original)
+++ jackrabbit/branches/2.8/jackrabbit-core/src/test/repository/workspaces/indexing-test-2/workspace.xml Mon Jun 11 19:13:50 2018
@@ -39,7 +39,6 @@
     <param name="indexingConfiguration" value="${wsp.home}/indexing-configuration.xml"/>
     <param name="supportHighlighting" value="true"/>
     <param name="excerptProviderClass" value="org.apache.jackrabbit.core.query.lucene.WeightedHTMLExcerpt"/>
-    <param name="textFilterClasses" value="org.apache.jackrabbit.extractor.PlainTextExtractor,org.apache.jackrabbit.core.query.lucene.IndexingQueueTest$Extractor"/>
     <param name="extractorPoolSize" value="2"/>
     <param name="extractorTimeout" value="10"/>
   </SearchIndex>

Modified: jackrabbit/branches/2.8/jackrabbit-core/src/test/repository/workspaces/indexing-test/workspace.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-core/src/test/repository/workspaces/indexing-test/workspace.xml?rev=1833350&r1=1833349&r2=1833350&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-core/src/test/repository/workspaces/indexing-test/workspace.xml (original)
+++ jackrabbit/branches/2.8/jackrabbit-core/src/test/repository/workspaces/indexing-test/workspace.xml Mon Jun 11 19:13:50 2018
@@ -39,7 +39,6 @@
     <param name="indexingConfiguration" value="${wsp.home}/indexing-configuration.xml"/>
     <param name="supportHighlighting" value="true"/>
     <param name="excerptProviderClass" value="org.apache.jackrabbit.core.query.lucene.WeightedHTMLExcerpt"/>
-    <param name="textFilterClasses" value="org.apache.jackrabbit.extractor.PlainTextExtractor,org.apache.jackrabbit.core.query.lucene.IndexingQueueTest$Extractor"/>
     <param name="extractorPoolSize" value="2"/>
     <param name="extractorTimeout" value="10"/>
   </SearchIndex>

Modified: jackrabbit/branches/2.8/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/cluster/repository.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/cluster/repository.xml?rev=1833350&r1=1833349&r2=1833350&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/cluster/repository.xml (original)
+++ jackrabbit/branches/2.8/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/cluster/repository.xml Mon Jun 11 19:13:50 2018
@@ -98,7 +98,6 @@
         -->
         <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
             <param name="path" value="${wsp.home}/index"/>
-            <param name="textFilterClasses" value="org.apache.jackrabbit.extractor.PlainTextExtractor,org.apache.jackrabbit.extractor.MsWordTextExtractor,org.apache.jackrabbit.extractor.MsExcelTextExtractor,org.apache.jackrabbit.extractor.MsPowerPointTextExtractor,org.apache.jackrabbit.extractor.PdfTextExtractor,org.apache.jackrabbit.extractor.OpenOfficeTextExtractor,org.apache.jackrabbit.extractor.RTFTextExtractor,org.apache.jackrabbit.extractor.HTMLTextExtractor,org.apache.jackrabbit.extractor.XMLTextExtractor"/>
             <param name="extractorPoolSize" value="2"/>
             <param name="supportHighlighting" value="true"/>
         </SearchIndex>
@@ -134,7 +133,6 @@
     -->
     <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
         <param name="path" value="${rep.home}/repository/index"/>
-        <param name="textFilterClasses" value="org.apache.jackrabbit.extractor.PlainTextExtractor,org.apache.jackrabbit.extractor.MsWordTextExtractor,org.apache.jackrabbit.extractor.MsExcelTextExtractor,org.apache.jackrabbit.extractor.MsPowerPointTextExtractor,org.apache.jackrabbit.extractor.PdfTextExtractor,org.apache.jackrabbit.extractor.OpenOfficeTextExtractor,org.apache.jackrabbit.extractor.RTFTextExtractor,org.apache.jackrabbit.extractor.HTMLTextExtractor,org.apache.jackrabbit.extractor.XMLTextExtractor"/>
         <param name="extractorPoolSize" value="2"/>
         <param name="supportHighlighting" value="true"/>
     </SearchIndex>

Modified: jackrabbit/branches/2.8/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/repository-oracle-compat.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/repository-oracle-compat.xml?rev=1833350&r1=1833349&r2=1833350&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/repository-oracle-compat.xml (original)
+++ jackrabbit/branches/2.8/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/repository-oracle-compat.xml Mon Jun 11 19:13:50 2018
@@ -56,7 +56,6 @@
 
         <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
             <param name="path" value="${wsp.home}/index"/>
-            <param name="textFilterClasses" value="org.apache.jackrabbit.extractor.PlainTextExtractor,org.apache.jackrabbit.extractor.MsWordTextExtractor,org.apache.jackrabbit.extractor.MsExcelTextExtractor,org.apache.jackrabbit.extractor.MsPowerPointTextExtractor,org.apache.jackrabbit.extractor.PdfTextExtractor,org.apache.jackrabbit.extractor.OpenOfficeTextExtractor,org.apache.jackrabbit.extractor.RTFTextExtractor,org.apache.jackrabbit.extractor.HTMLTextExtractor,org.apache.jackrabbit.extractor.XMLTextExtractor"/>
             <param name="extractorPoolSize" value="2"/>
             <param name="supportHighlighting" value="true"/>
         </SearchIndex>
@@ -82,7 +81,6 @@
 
     <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
         <param name="path" value="${rep.home}/repository/index"/>
-        <param name="textFilterClasses" value="org.apache.jackrabbit.extractor.PlainTextExtractor,org.apache.jackrabbit.extractor.MsWordTextExtractor,org.apache.jackrabbit.extractor.MsExcelTextExtractor,org.apache.jackrabbit.extractor.MsPowerPointTextExtractor,org.apache.jackrabbit.extractor.PdfTextExtractor,org.apache.jackrabbit.extractor.OpenOfficeTextExtractor,org.apache.jackrabbit.extractor.RTFTextExtractor,org.apache.jackrabbit.extractor.HTMLTextExtractor,org.apache.jackrabbit.extractor.XMLTextExtractor"/>
         <param name="extractorPoolSize" value="2"/>
         <param name="supportHighlighting" value="true"/>
     </SearchIndex>

Modified: jackrabbit/branches/2.8/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/repository-oracle.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/repository-oracle.xml?rev=1833350&r1=1833349&r2=1833350&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/repository-oracle.xml (original)
+++ jackrabbit/branches/2.8/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/repository-oracle.xml Mon Jun 11 19:13:50 2018
@@ -59,7 +59,6 @@
 
         <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
             <param name="path" value="${wsp.home}/index"/>
-            <param name="textFilterClasses" value="org.apache.jackrabbit.extractor.PlainTextExtractor,org.apache.jackrabbit.extractor.MsWordTextExtractor,org.apache.jackrabbit.extractor.MsExcelTextExtractor,org.apache.jackrabbit.extractor.MsPowerPointTextExtractor,org.apache.jackrabbit.extractor.PdfTextExtractor,org.apache.jackrabbit.extractor.OpenOfficeTextExtractor,org.apache.jackrabbit.extractor.RTFTextExtractor,org.apache.jackrabbit.extractor.HTMLTextExtractor,org.apache.jackrabbit.extractor.XMLTextExtractor"/>
             <param name="extractorPoolSize" value="2"/>
             <param name="supportHighlighting" value="true"/>
         </SearchIndex>
@@ -87,7 +86,6 @@
 
     <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
         <param name="path" value="${rep.home}/repository/index"/>
-        <param name="textFilterClasses" value="org.apache.jackrabbit.extractor.PlainTextExtractor,org.apache.jackrabbit.extractor.MsWordTextExtractor,org.apache.jackrabbit.extractor.MsExcelTextExtractor,org.apache.jackrabbit.extractor.MsPowerPointTextExtractor,org.apache.jackrabbit.extractor.PdfTextExtractor,org.apache.jackrabbit.extractor.OpenOfficeTextExtractor,org.apache.jackrabbit.extractor.RTFTextExtractor,org.apache.jackrabbit.extractor.HTMLTextExtractor,org.apache.jackrabbit.extractor.XMLTextExtractor"/>
         <param name="extractorPoolSize" value="2"/>
         <param name="supportHighlighting" value="true"/>
     </SearchIndex>