You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2014/06/19 00:11:59 UTC
svn commit: r1603654 - in /lucene/dev/branches/lucene_solr_4_9: ./ dev-tools/ lucene/ lucene/analysis/ lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/ ...

Author: hossman
Date: Wed Jun 18 22:11:55 2014
New Revision: 1603654

URL: http://svn.apache.org/r1603654
Log:
SOLR-6128: Removed deprecated analysis factories and fieldTypes from the example schema.xml (merge r1603644 via r1603649)

Modified:
    lucene/dev/branches/lucene_solr_4_9/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/dev-tools/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/BUILD.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/CHANGES.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/JRE_VERSION_MIGRATION.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/LICENSE.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/MIGRATE.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/NOTICE.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/README.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/SYSTEM_REQUIREMENTS.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/analysis/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/Lucene47WordDelimiterFilter.java   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/ASCIITLD.jflex-macro   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/SUPPLEMENTARY.jflex-macro   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/StandardTokenizerImpl40.java   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/StandardTokenizerImpl40.jflex   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/UAX29URLEmailTokenizerImpl40.java   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/UAX29URLEmailTokenizerImpl40.jflex   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/package.html   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLucene47WordDelimiterFilter.java   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyFilterFactory.java   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/backwards/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/benchmark/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/build.xml   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/classification/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/classification/build.xml   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/classification/ivy.xml   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/classification/src/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/codecs/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/common-build.xml   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/core/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions2.java   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/core/src/test/org/apache/lucene/index/index.40.cfs.zip   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/core/src/test/org/apache/lucene/index/index.40.nocfs.zip   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.cfs.zip   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.nocfs.zip   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/core/src/test/org/apache/lucene/search/TestSort.java   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/core/src/test/org/apache/lucene/search/TestSortDocValues.java   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/demo/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/expressions/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/facet/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/grouping/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/highlighter/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/ivy-ignore-conflicts.properties   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/ivy-settings.xml   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/ivy-versions.properties   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/join/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/licenses/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/memory/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/misc/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/module-build.xml   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/queries/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/queryparser/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/replicator/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/sandbox/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/site/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/spatial/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/spatial/src/test-files/data/simple-bbox.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/spatial/src/test-files/simple-Queries-BBox.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/suggest/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/test-framework/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/lucene/tools/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/solr/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/solr/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/lucene_solr_4_9/solr/LICENSE.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_9/solr/NOTICE.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_9/solr/README.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_9/solr/SYSTEM_REQUIREMENTS.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_9/solr/build.xml   (props changed)
    lucene/dev/branches/lucene_solr_4_9/solr/cloud-dev/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/solr/common-build.xml   (props changed)
    lucene/dev/branches/lucene_solr_4_9/solr/contrib/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/solr/core/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/solr/core/src/test/org/apache/solr/core/TestConfig.java   (props changed)
    lucene/dev/branches/lucene_solr_4_9/solr/example/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/solr/example/solr/collection1/conf/schema.xml
    lucene/dev/branches/lucene_solr_4_9/solr/licenses/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/solr/licenses/httpclient-LICENSE-ASL.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_9/solr/licenses/httpclient-NOTICE.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_9/solr/licenses/httpcore-LICENSE-ASL.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_9/solr/licenses/httpcore-NOTICE.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_9/solr/licenses/httpmime-LICENSE-ASL.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_9/solr/licenses/httpmime-NOTICE.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_9/solr/scripts/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/solr/site/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/solr/solrj/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/solr/test-framework/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/solr/webapp/   (props changed)

Modified: lucene/dev/branches/lucene_solr_4_9/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_9/solr/CHANGES.txt?rev=1603654&r1=1603653&r2=1603654&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_9/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_9/solr/CHANGES.txt Wed Jun 18 22:11:55 2014
@@ -188,6 +188,9 @@ Other Changes
 * SOLR-6169: Remove broken handleAlias action in CoreAdminHandler (Alan
   Woodward)
 
+* SOLR-6128: Removed deprecated analysis factories and fieldTypes from the example
+  schema.xml (hossman)
+
 Optimizations
 ----------------------
 

Modified: lucene/dev/branches/lucene_solr_4_9/solr/example/solr/collection1/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_9/solr/example/solr/collection1/conf/schema.xml?rev=1603654&r1=1603653&r2=1603654&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_9/solr/example/solr/collection1/conf/schema.xml (original)
+++ lucene/dev/branches/lucene_solr_4_9/solr/example/solr/collection1/conf/schema.xml Wed Jun 18 22:11:55 2014
@@ -401,13 +401,15 @@
       value verbatim (and hence don't correctly support range queries, since the
       lexicographic ordering isn't equal to the numeric ordering)
 
-      NOTE: These field types are deprecated will be removed in Solr 5.0!
+      NOTE: These field types are deprecated will be completely removed in Solr 5.0!
     -->
+    <!--
     <fieldType name="pint" class="solr.IntField"/>
     <fieldType name="plong" class="solr.LongField"/>
     <fieldType name="pfloat" class="solr.FloatField"/>
     <fieldType name="pdouble" class="solr.DoubleField"/>
     <fieldType name="pdate" class="solr.DateField" sortMissingLast="true"/>
+    -->
 
     <!-- The "RandomSortField" is not used to store or search any
          data.  You can declare fields of this type it in your schema
@@ -1123,9 +1125,8 @@
     <!-- Thai -->
     <fieldType name="text_th" class="solr.TextField" positionIncrementGap="100">
       <analyzer> 
-        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <tokenizer class="solr.ThaiTokenizerFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.ThaiWordFilterFactory"/>
         <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_th.txt" />
       </analyzer>
     </fieldType>