You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2014/12/14 01:27:46 UTC
svn commit: r1645373 [1/4] - in /lucene/dev/branches/branch_5x: ./ solr/
solr/contrib/
solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/
solr/contrib/analytics/src/test-files/solr/collection1/conf/
solr/contrib/clusteri...
Author: erick
Date: Sun Dec 14 00:27:44 2014
New Revision: 1645373
URL: http://svn.apache.org/r1645373
Log:
SOLR-6826: fieldType capitalization is not consistent with the rest of case-sensitive field names
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/solr/contrib/ (props changed)
lucene/dev/branches/branch_5x/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-folding-extra.xml
lucene/dev/branches/branch_5x/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate-dv.xml
lucene/dev/branches/branch_5x/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate.xml
lucene/dev/branches/branch_5x/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollateoptions.xml
lucene/dev/branches/branch_5x/solr/contrib/analytics/src/test-files/solr/collection1/conf/schema-analytics.xml
lucene/dev/branches/branch_5x/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml
lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-schema-no-unique-key.xml
lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-schema.xml
lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solr_id-schema.xml
lucene/dev/branches/branch_5x/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/schema.xml
lucene/dev/branches/branch_5x/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/schema.xml
lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema.xml
lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/schema.xml
lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/mrunit/conf/schema.xml
lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/schema.xml
lucene/dev/branches/branch_5x/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/schema.xml
lucene/dev/branches/branch_5x/solr/contrib/uima/src/test-files/uima/uima-tokenizers-schema.xml
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/analysisconfs/analysis-err-schema.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-field.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-fieldType.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/bad-schema-misplaced-asterisk-copyfield-dest-should-fail-test.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/bad-schema-misplaced-asterisk-copyfield-source-should-fail-test.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/bad-schema-multiple-asterisk-copyfield-dest-should-fail-test.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/bad-schema-multiple-asterisk-copyfield-source-should-fail-test.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/bad-schema-non-glob-copyfield-source-matching-nothing-should-fail-test.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-add-schema-fields-update-processor.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-binaryfield.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-class-name-shortening-on-serialization.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-collate-dv.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-collate.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-complex-phrase.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-custom-field.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-customfield.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-distrib-interval-faceting.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-docValues.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-docValuesFaceting.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-docValuesMissing.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-docValuesMulti.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-enums.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-field-sort-values.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-folding.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-id-and-version-fields-only.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-luceneMatchVersion.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-not-required-unique-key.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-numeric.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-phrasesuggest.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-postingshighlight.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-preanalyzed.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-replication1.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-replication2.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-required-fields.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-rest-lucene-match-version.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-rest.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-reversed.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-simpleqpplugin.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-sortingresponse.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-sorts.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-spellchecker.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-stop-keep.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-tiny.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema11.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema12.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema15.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schemasurround.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/crazy-path-to-schema.xml
lucene/dev/branches/branch_5x/solr/example/ (props changed)
lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/db/conf/schema.xml
lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/mail/conf/schema.xml
lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/rss/conf/schema.xml
lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/solr/conf/schema.xml
lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/tika/conf/schema.xml
lucene/dev/branches/branch_5x/solr/server/ (props changed)
lucene/dev/branches/branch_5x/solr/server/solr/configsets/basic_configs/conf/schema.xml
lucene/dev/branches/branch_5x/solr/server/solr/configsets/data_driven_schema_configs/conf/schema.xml
lucene/dev/branches/branch_5x/solr/server/solr/configsets/sample_techproducts_configs/conf/schema.xml
lucene/dev/branches/branch_5x/solr/solrj/ (props changed)
lucene/dev/branches/branch_5x/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema-replication1.xml
lucene/dev/branches/branch_5x/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema.xml
lucene/dev/branches/branch_5x/solr/solrj/src/test-files/solrj/solr/crazy-path-to-schema.xml
lucene/dev/branches/branch_5x/solr/solrj/src/test-files/solrj/solr/shared/conf/schema.xml
Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1645373&r1=1645372&r2=1645373&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Sun Dec 14 00:27:44 2014
@@ -446,6 +446,9 @@ Other Changes
the example directory instead of server/solr. (Alexandre Rafalovitch, Anshum Gupta, hossman,
Timothy Potter)
+* SOLR-6826: fieldType capitalization is not consistent with the rest of case-sensitive field names.
+ (Alexandre Rafalovitch via Erick Erickson)
+
================== 4.10.3 ==================
Bug Fixes
Modified: lucene/dev/branches/branch_5x/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-folding-extra.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-folding-extra.xml?rev=1645373&r1=1645372&r2=1645373&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-folding-extra.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-folding-extra.xml Sun Dec 14 00:27:44 2014
@@ -17,7 +17,7 @@
<schema name="test" version="1.0">
<types>
- <fieldtype name="string" class="solr.StrField" sortMissingLast="true" multiValued="false"/>
+ <fieldType name="string" class="solr.StrField" sortMissingLast="true" multiValued="false"/>
<fieldType name="text_icufolding" class="solr.TextField">
Modified: lucene/dev/branches/branch_5x/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate-dv.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate-dv.xml?rev=1645373&r1=1645372&r2=1645373&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate-dv.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate-dv.xml Sun Dec 14 00:27:44 2014
@@ -23,18 +23,18 @@
<fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<!-- basic text field -->
- <fieldtype name="text" class="solr.TextField">
+ <fieldType name="text" class="solr.TextField">
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="sort_ar_t" class="solr.ICUCollationField" locale="ar"/>
- <fieldtype name="sort_de_t" class="solr.ICUCollationField" locale="de" strength="primary"/>
- <fieldtype name="sort_tr_canon_t" class="solr.ICUCollationField" locale="tr" strength="primary" decomposition="canonical"/>
- <fieldtype name="sort_da_t" class="solr.ICUCollationField" locale="da" strength="primary"/>
- <fieldtype name="sort_custom_t" class="solr.ICUCollationField" custom="customrules.dat" strength="primary"/>
+ <fieldType name="sort_ar_t" class="solr.ICUCollationField" locale="ar"/>
+ <fieldType name="sort_de_t" class="solr.ICUCollationField" locale="de" strength="primary"/>
+ <fieldType name="sort_tr_canon_t" class="solr.ICUCollationField" locale="tr" strength="primary" decomposition="canonical"/>
+ <fieldType name="sort_da_t" class="solr.ICUCollationField" locale="da" strength="primary"/>
+ <fieldType name="sort_custom_t" class="solr.ICUCollationField" custom="customrules.dat" strength="primary"/>
</types>
<fields>
Modified: lucene/dev/branches/branch_5x/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate.xml?rev=1645373&r1=1645372&r2=1645373&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate.xml Sun Dec 14 00:27:44 2014
@@ -23,18 +23,18 @@
<fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<!-- basic text field -->
- <fieldtype name="text" class="solr.TextField">
+ <fieldType name="text" class="solr.TextField">
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="sort_ar_t" class="solr.ICUCollationField" locale="ar"/>
- <fieldtype name="sort_de_t" class="solr.ICUCollationField" locale="de" strength="primary"/>
- <fieldtype name="sort_tr_canon_t" class="solr.ICUCollationField" locale="tr" strength="primary" decomposition="canonical"/>
- <fieldtype name="sort_da_t" class="solr.ICUCollationField" locale="da" strength="primary"/>
- <fieldtype name="sort_custom_t" class="solr.ICUCollationField" custom="customrules.dat" strength="primary"/>
+ <fieldType name="sort_ar_t" class="solr.ICUCollationField" locale="ar"/>
+ <fieldType name="sort_de_t" class="solr.ICUCollationField" locale="de" strength="primary"/>
+ <fieldType name="sort_tr_canon_t" class="solr.ICUCollationField" locale="tr" strength="primary" decomposition="canonical"/>
+ <fieldType name="sort_da_t" class="solr.ICUCollationField" locale="da" strength="primary"/>
+ <fieldType name="sort_custom_t" class="solr.ICUCollationField" custom="customrules.dat" strength="primary"/>
</types>
<fields>
Modified: lucene/dev/branches/branch_5x/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollateoptions.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollateoptions.xml?rev=1645373&r1=1645372&r2=1645373&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollateoptions.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollateoptions.xml Sun Dec 14 00:27:44 2014
@@ -23,27 +23,27 @@
<fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<!-- basic text field -->
- <fieldtype name="text" class="solr.TextField">
+ <fieldType name="text" class="solr.TextField">
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- ignores punctuation and whitespace -->
- <fieldtype name="sort_ignore_punctuation_t" class="solr.ICUCollationField"
+ <fieldType name="sort_ignore_punctuation_t" class="solr.ICUCollationField"
locale="en" strength="primary" alternate="shifted"/>
<!-- ignores only whitespace -->
- <fieldtype name="sort_ignore_space_t" class="solr.ICUCollationField"
+ <fieldType name="sort_ignore_space_t" class="solr.ICUCollationField"
locale="en" strength="primary" alternate="shifted" variableTop=" "/>
<!-- ignores only accents, but not case -->
- <fieldtype name="sort_ignore_accents_t" class="solr.ICUCollationField"
+ <fieldType name="sort_ignore_accents_t" class="solr.ICUCollationField"
locale="en" strength="primary" caseLevel="true"/>
<!-- sorts numerics in numeric order -->
- <fieldtype name="sort_numerics_t" class="solr.ICUCollationField"
+ <fieldType name="sort_numerics_t" class="solr.ICUCollationField"
locale="en" numeric="true"/>
<!-- sorts uppercase before lowercase -->
- <fieldtype name="sort_uppercase_first_t" class="solr.ICUCollationField"
+ <fieldType name="sort_uppercase_first_t" class="solr.ICUCollationField"
locale="en" strength="tertiary" caseFirst="upper"/>
</types>
Modified: lucene/dev/branches/branch_5x/solr/contrib/analytics/src/test-files/solr/collection1/conf/schema-analytics.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/analytics/src/test-files/solr/collection1/conf/schema-analytics.xml?rev=1645373&r1=1645372&r2=1645373&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/analytics/src/test-files/solr/collection1/conf/schema-analytics.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/analytics/src/test-files/solr/collection1/conf/schema-analytics.xml Sun Dec 14 00:27:44 2014
@@ -31,7 +31,7 @@
<!-- field type definitions... note that the "name" attribute is
just a label to be used by field definitions. The "class"
attribute and any other attributes determine the real type and
- behavior of the fieldtype.
+ behavior of the fieldType.
-->
<!-- numeric field types that store and index the text
@@ -46,10 +46,10 @@
<!-- format for date is 1995-12-31T23:59:59.999Z and only the fractional
seconds part (.999) is optional.
-->
- <fieldtype name="date" class="solr.TrieDateField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="date" class="solr.TrieDateField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldtype name="boolean" class="solr.BoolField" />
- <fieldtype name="string" class="solr.StrField" />
+ <fieldType name="boolean" class="solr.BoolField" />
+ <fieldType name="string" class="solr.StrField" />
<fieldType name="uuid" class="solr.UUIDField" />
Modified: lucene/dev/branches/branch_5x/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml?rev=1645373&r1=1645372&r2=1645373&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml Sun Dec 14 00:27:44 2014
@@ -255,7 +255,7 @@
<!-- since fields of this type are by default not stored or indexed, any data added to
them will be ignored outright
-->
- <fieldtype name="ignored" stored="false" indexed="false" class="solr.StrField" />
+ <fieldType name="ignored" stored="false" indexed="false" class="solr.StrField" />
</types>
Modified: lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-schema-no-unique-key.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-schema-no-unique-key.xml?rev=1645373&r1=1645372&r2=1645373&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-schema-no-unique-key.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-schema-no-unique-key.xml Sun Dec 14 00:27:44 2014
@@ -190,7 +190,7 @@
<!-- since fields of this type are by default not stored or indexed, any data added to
them will be ignored outright
-->
- <fieldtype name="ignored" stored="false" indexed="false" class="solr.StrField" />
+ <fieldType name="ignored" stored="false" indexed="false" class="solr.StrField" />
</types>
Modified: lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-schema.xml?rev=1645373&r1=1645372&r2=1645373&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-schema.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-schema.xml Sun Dec 14 00:27:44 2014
@@ -29,7 +29,7 @@
<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
</analyzer>
</fieldType>
- <fieldtype name="ignored" stored="false" indexed="false" class="solr.StrField" />
+ <fieldType name="ignored" stored="false" indexed="false" class="solr.StrField" />
</types>
<fields>
<field name="id" type="string" indexed="true" stored="true" required="true" />
@@ -57,4 +57,4 @@
<uniqueKey>id</uniqueKey>
<defaultSearchField>desc</defaultSearchField>
<solrQueryParser defaultOperator="OR"/>
-</schema>
\ No newline at end of file
+</schema>
Modified: lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solr_id-schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solr_id-schema.xml?rev=1645373&r1=1645372&r2=1645373&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solr_id-schema.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solr_id-schema.xml Sun Dec 14 00:27:44 2014
@@ -240,7 +240,7 @@
<!-- since fields of this type are by default not stored or indexed, any data added to
them will be ignored outright
-->
- <fieldtype name="ignored" stored="false" indexed="false" class="solr.StrField" />
+ <fieldType name="ignored" stored="false" indexed="false" class="solr.StrField" />
</types>
Modified: lucene/dev/branches/branch_5x/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/schema.xml?rev=1645373&r1=1645372&r2=1645373&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/schema.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/schema.xml Sun Dec 14 00:27:44 2014
@@ -52,48 +52,48 @@
<fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" positionIncrementGap="0"/>
<!-- Field type demonstrating an Analyzer failure -->
- <fieldtype name="failtype1" class="solr.TextField">
+ <fieldType name="failtype1" class="solr.TextField">
<analyzer type="index">
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="0" catenateWords="0" catenateNumbers="0" catenateAll="0"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- Demonstrating ignoreCaseChange -->
- <fieldtype name="wdf_nocase" class="solr.TextField">
+ <fieldType name="wdf_nocase" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="0" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="0" preserveOriginal="0"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="wdf_preserve" class="solr.TextField">
+ <fieldType name="wdf_preserve" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="0" preserveOriginal="1"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- HighlitText optimizes storage for (long) columns which will be highlit -->
- <fieldtype name="highlittext" class="solr.TextField" compressThreshold="345" />
+ <fieldType name="highlittext" class="solr.TextField" compressThreshold="345" />
- <fieldtype name="boolean" class="solr.BoolField" sortMissingLast="true"/>
- <fieldtype name="string" class="solr.StrField" sortMissingLast="true"/>
+ <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
+ <fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
<!-- format for date is 1995-12-31T23:59:59.999Z and only the fractional
seconds part (.999) is optional.
-->
- <fieldtype name="date" class="solr.TrieDateField" sortMissingLast="true" omitNorms="true"/>
+ <fieldType name="date" class="solr.TrieDateField" sortMissingLast="true" omitNorms="true"/>
<!-- solr.TextField allows the specification of custom
text analyzers specified as a tokenizer and a list
of token filters.
-->
- <fieldtype name="text" class="solr.TextField">
+ <fieldType name="text" class="solr.TextField">
<analyzer>
<tokenizer class="solr.ClassicTokenizerFactory"/>
<filter class="solr.ClassicFilterFactory"/>
@@ -101,68 +101,68 @@
<filter class="solr.StopFilterFactory"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="nametext" class="solr.TextField">
+ <fieldType name="nametext" class="solr.TextField">
<analyzer class="org.apache.lucene.analysis.core.WhitespaceAnalyzer"/>
- </fieldtype>
+ </fieldType>
- <fieldtype name="teststop" class="solr.TextField">
+ <fieldType name="teststop" class="solr.TextField">
<analyzer>
<tokenizer class="solr.LowerCaseTokenizerFactory"/>
<filter class="solr.ClassicFilterFactory"/>
<filter class="solr.StopFilterFactory" words="stopwords.txt"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <!-- fieldtypes in this section isolate tokenizers and tokenfilters for testing -->
- <fieldtype name="lowertok" class="solr.TextField">
+ <!-- fieldTypes in this section isolate tokenizers and tokenfilters for testing -->
+ <fieldType name="lowertok" class="solr.TextField">
<analyzer><tokenizer class="solr.LowerCaseTokenizerFactory"/></analyzer>
- </fieldtype>
- <fieldtype name="keywordtok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="keywordtok" class="solr.TextField">
<analyzer><tokenizer class="solr.MockTokenizerFactory" pattern="keyword"/></analyzer>
- </fieldtype>
- <fieldtype name="standardtok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="standardtok" class="solr.TextField">
<analyzer><tokenizer class="solr.StandardTokenizerFactory"/></analyzer>
- </fieldtype>
- <fieldtype name="lettertok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="lettertok" class="solr.TextField">
<analyzer><tokenizer class="solr.LetterTokenizerFactory"/></analyzer>
- </fieldtype>
- <fieldtype name="whitetok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="whitetok" class="solr.TextField">
<analyzer><tokenizer class="solr.MockTokenizerFactory"/></analyzer>
- </fieldtype>
- <fieldtype name="HTMLstandardtok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="HTMLstandardtok" class="solr.TextField">
<analyzer>
<charFilter class="solr.HTMLStripCharFilterFactory"/>
<tokenizer class="solr.StandardTokenizerFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="HTMLwhitetok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="HTMLwhitetok" class="solr.TextField">
<analyzer>
<charFilter class="solr.HTMLStripCharFilterFactory"/>
<tokenizer class="solr.MockTokenizerFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="standardtokfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="standardtokfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.ClassicTokenizerFactory"/>
<filter class="solr.ClassicFilterFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="standardfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="standardfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.ClassicFilterFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="lowerfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="lowerfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="patternreplacefilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="patternreplacefilt" class="solr.TextField">
<analyzer type="index">
<tokenizer class="solr.MockTokenizerFactory" pattern="keyword"/>
<filter class="solr.PatternReplaceFilterFactory"
@@ -172,52 +172,52 @@
<analyzer type="query">
<tokenizer class="solr.MockTokenizerFactory" pattern="keyword"/>
</analyzer>
- </fieldtype>
- <fieldtype name="porterfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="porterfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
- </fieldtype>
- <!-- fieldtype name="snowballfilt" class="solr.TextField">
+ </fieldType>
+ <!-- fieldType name="snowballfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.SnowballPorterFilterFactory"/>
</analyzer>
- </fieldtype -->
- <fieldtype name="engporterfilt" class="solr.TextField">
+ </fieldType -->
+ <fieldType name="engporterfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="custengporterfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="custengporterfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="stopfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="stopfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.StopFilterFactory" ignoreCase="true"/>
</analyzer>
- </fieldtype>
- <fieldtype name="custstopfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="custstopfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.StopFilterFactory" words="stopwords.txt"/>
</analyzer>
- </fieldtype>
- <fieldtype name="lengthfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="lengthfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.LengthFilterFactory" min="2" max="5"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="subword" class="solr.TextField" multiValued="true" positionIncrementGap="100">
+ <fieldType name="subword" class="solr.TextField" multiValued="true" positionIncrementGap="100">
<analyzer type="index">
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
@@ -232,10 +232,10 @@
<filter class="solr.StopFilterFactory"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- more flexible in matching skus, but more chance of a false match -->
- <fieldtype name="skutype1" class="solr.TextField">
+ <fieldType name="skutype1" class="solr.TextField">
<analyzer type="index">
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
@@ -246,10 +246,10 @@
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- less flexible in matching skus, but less chance of a false match -->
- <fieldtype name="skutype2" class="solr.TextField">
+ <fieldType name="skutype2" class="solr.TextField">
<analyzer type="index">
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
@@ -260,20 +260,20 @@
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- less flexible in matching skus, but less chance of a false match -->
- <fieldtype name="syn" class="solr.TextField">
+ <fieldType name="syn" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- Demonstrates How RemoveDuplicatesTokenFilter makes stemmed
synonyms "better"
-->
- <fieldtype name="dedup" class="solr.TextField">
+ <fieldType name="dedup" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.SynonymFilterFactory"
@@ -281,17 +281,17 @@
<filter class="solr.PorterStemFilterFactory"/>
<filter class="solr.RemoveDuplicatesTokenFilterFactory" />
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="unstored" class="solr.StrField" indexed="true" stored="false"/>
+ <fieldType name="unstored" class="solr.StrField" indexed="true" stored="false"/>
- <fieldtype name="textgap" class="solr.TextField" multiValued="true" positionIncrementGap="100">
+ <fieldType name="textgap" class="solr.TextField" multiValued="true" positionIncrementGap="100">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
</types>
Modified: lucene/dev/branches/branch_5x/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/schema.xml?rev=1645373&r1=1645372&r2=1645373&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/schema.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/schema.xml Sun Dec 14 00:27:44 2014
@@ -27,12 +27,12 @@
<schema name="test" version="1.5">
<types>
- <fieldtype name="string" class="solr.StrField" sortMissingLast="true"/>
+ <fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
<!-- solr.TextField allows the specification of custom
text analyzers specified as a tokenizer and a list
of token filters.
-->
- <fieldtype name="text" class="solr.TextField">
+ <fieldType name="text" class="solr.TextField">
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
<filter class="solr.StandardFilterFactory"/>
@@ -40,11 +40,11 @@
<filter class="solr.StopFilterFactory"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="nametext" class="solr.TextField">
+ <fieldType name="nametext" class="solr.TextField">
<analyzer class="org.apache.lucene.analysis.core.WhitespaceAnalyzer"/>
- </fieldtype>
+ </fieldType>
</types>
Modified: lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema.xml?rev=1645373&r1=1645372&r2=1645373&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema.xml Sun Dec 14 00:27:44 2014
@@ -249,7 +249,7 @@
<!--Binary data type. The data should be sent/retrieved in as Base64 encoded Strings -->
- <fieldtype name="binary" class="solr.BinaryField"/>
+ <fieldType name="binary" class="solr.BinaryField"/>
<!-- The "RandomSortField" is not used to store or search any
data. You can declare fields of this type it in your schema
@@ -482,15 +482,15 @@
</fieldType>
<!--
- <fieldtype name="phonetic" stored="false" indexed="true" class="solr.TextField" >
+ <fieldType name="phonetic" stored="false" indexed="true" class="solr.TextField" >
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
<filter class="solr.DoubleMetaphoneFilterFactory" inject="false"/>
</analyzer>
- </fieldtype>
+ </fieldType>
-->
- <fieldtype name="payloads" stored="false" indexed="true" class="solr.TextField" >
+ <fieldType name="payloads" stored="false" indexed="true" class="solr.TextField" >
<analyzer>
<tokenizer class="solr.WhitespaceTokenizerFactory"/>
<!--
@@ -506,7 +506,7 @@
-->
<filter class="solr.DelimitedPayloadTokenFilterFactory" encoder="float"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- lowercases the entire field value, keeping it as a single token. -->
<fieldType name="lowercase" class="solr.TextField" positionIncrementGap="100">
@@ -543,7 +543,7 @@
<!-- since fields of this type are by default not stored or indexed,
any data added to them will be ignored outright. -->
- <fieldtype name="ignored" stored="false" indexed="false" multiValued="true" class="solr.StrField" />
+ <fieldType name="ignored" stored="false" indexed="false" multiValued="true" class="solr.StrField" />
<!-- This point type indexes the coordinates as separate fields (subFields)
If subFieldType is defined, it references a type, and a dynamic field
@@ -565,7 +565,7 @@
A Geohash is a compact representation of a latitude longitude pair in a single field.
See http://wiki.apache.org/solr/SpatialSearch
-->
- <fieldtype name="geohash" class="solr.GeoHashField"/>
+ <fieldType name="geohash" class="solr.GeoHashField"/>
<!-- Money/currency field type. See http://wiki.apache.org/solr/MoneyFieldType
Parameters:
Modified: lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/schema.xml?rev=1645373&r1=1645372&r2=1645373&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/schema.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/schema.xml Sun Dec 14 00:27:44 2014
@@ -264,7 +264,7 @@
<!--Binary data type. The data should be sent/retrieved in as Base64 encoded Strings -->
- <fieldtype name="binary" class="solr.BinaryField"/>
+ <fieldType name="binary" class="solr.BinaryField"/>
<!-- The "RandomSortField" is not used to store or search any
data. You can declare fields of this type it in your schema
@@ -496,14 +496,14 @@
</analyzer>
</fieldType>
- <fieldtype name="phonetic" stored="false" indexed="true" class="solr.TextField" >
+ <fieldType name="phonetic" stored="false" indexed="true" class="solr.TextField" >
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
<filter class="solr.DoubleMetaphoneFilterFactory" inject="false"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="payloads" stored="false" indexed="true" class="solr.TextField" >
+ <fieldType name="payloads" stored="false" indexed="true" class="solr.TextField" >
<analyzer>
<tokenizer class="solr.WhitespaceTokenizerFactory"/>
<!--
@@ -519,7 +519,7 @@
-->
<filter class="solr.DelimitedPayloadTokenFilterFactory" encoder="float"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- lowercases the entire field value, keeping it as a single token. -->
<fieldType name="lowercase" class="solr.TextField" positionIncrementGap="100">
@@ -556,7 +556,7 @@
<!-- since fields of this type are by default not stored or indexed,
any data added to them will be ignored outright. -->
- <fieldtype name="ignored" stored="false" indexed="false" multiValued="true" class="solr.StrField" />
+ <fieldType name="ignored" stored="false" indexed="false" multiValued="true" class="solr.StrField" />
<!-- This point type indexes the coordinates as separate fields (subFields)
If subFieldType is defined, it references a type, and a dynamic field
Modified: lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/mrunit/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/mrunit/conf/schema.xml?rev=1645373&r1=1645372&r2=1645373&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/mrunit/conf/schema.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/mrunit/conf/schema.xml Sun Dec 14 00:27:44 2014
@@ -264,7 +264,7 @@
<!--Binary data type. The data should be sent/retrieved in as Base64 encoded Strings -->
- <fieldtype name="binary" class="solr.BinaryField"/>
+ <fieldType name="binary" class="solr.BinaryField"/>
<!-- The "RandomSortField" is not used to store or search any
data. You can declare fields of this type it in your schema
@@ -496,14 +496,14 @@
</analyzer>
</fieldType>
- <fieldtype name="phonetic" stored="false" indexed="true" class="solr.TextField" >
+ <fieldType name="phonetic" stored="false" indexed="true" class="solr.TextField" >
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
<filter class="solr.DoubleMetaphoneFilterFactory" inject="false"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="payloads" stored="false" indexed="true" class="solr.TextField" >
+ <fieldType name="payloads" stored="false" indexed="true" class="solr.TextField" >
<analyzer>
<tokenizer class="solr.WhitespaceTokenizerFactory"/>
<!--
@@ -519,7 +519,7 @@
-->
<filter class="solr.DelimitedPayloadTokenFilterFactory" encoder="float"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- lowercases the entire field value, keeping it as a single token. -->
<fieldType name="lowercase" class="solr.TextField" positionIncrementGap="100">
@@ -556,7 +556,7 @@
<!-- since fields of this type are by default not stored or indexed,
any data added to them will be ignored outright. -->
- <fieldtype name="ignored" stored="false" indexed="false" multiValued="true" class="solr.StrField" />
+ <fieldType name="ignored" stored="false" indexed="false" multiValued="true" class="solr.StrField" />
<!-- This point type indexes the coordinates as separate fields (subFields)
If subFieldType is defined, it references a type, and a dynamic field
Modified: lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/schema.xml?rev=1645373&r1=1645372&r2=1645373&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/schema.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/schema.xml Sun Dec 14 00:27:44 2014
@@ -216,7 +216,7 @@
<!--Binary data type. The data should be sent/retrieved in as Base64 encoded Strings -->
- <fieldtype name="binary" class="solr.BinaryField"/>
+ <fieldType name="binary" class="solr.BinaryField"/>
<!-- The "RandomSortField" is not used to store or search any
data. You can declare fields of this type it in your schema
@@ -449,15 +449,15 @@
</fieldType>
<!--
- <fieldtype name="phonetic" stored="false" indexed="true" class="solr.TextField" >
+ <fieldType name="phonetic" stored="false" indexed="true" class="solr.TextField" >
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
<filter class="solr.DoubleMetaphoneFilterFactory" inject="false"/>
</analyzer>
- </fieldtype>
+ </fieldType>
-->
- <fieldtype name="payloads" stored="false" indexed="true" class="solr.TextField" >
+ <fieldType name="payloads" stored="false" indexed="true" class="solr.TextField" >
<analyzer>
<tokenizer class="solr.WhitespaceTokenizerFactory"/>
<!--
@@ -473,7 +473,7 @@
-->
<filter class="solr.DelimitedPayloadTokenFilterFactory" encoder="float"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- lowercases the entire field value, keeping it as a single token. -->
<fieldType name="lowercase" class="solr.TextField" positionIncrementGap="100">
@@ -510,7 +510,7 @@
<!-- since fields of this type are by default not stored or indexed,
any data added to them will be ignored outright. -->
- <fieldtype name="ignored" stored="false" indexed="false" multiValued="true" class="solr.StrField" />
+ <fieldType name="ignored" stored="false" indexed="false" multiValued="true" class="solr.StrField" />
<!-- This point type indexes the coordinates as separate fields (subFields)
If subFieldType is defined, it references a type, and a dynamic field
@@ -532,7 +532,7 @@
A Geohash is a compact representation of a latitude longitude pair in a single field.
See http://wiki.apache.org/solr/SpatialSearch
-->
- <fieldtype name="geohash" class="solr.GeoHashField"/>
+ <fieldType name="geohash" class="solr.GeoHashField"/>
<!-- Money/currency field type. See http://wiki.apache.org/solr/MoneyFieldType
Parameters:
Modified: lucene/dev/branches/branch_5x/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/schema.xml?rev=1645373&r1=1645372&r2=1645373&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/schema.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/schema.xml Sun Dec 14 00:27:44 2014
@@ -76,7 +76,7 @@
Binary data type. The data should be sent/retrieved in as Base64
encoded Strings
-->
- <fieldtype name="binary" class="solr.BinaryField" />
+ <fieldType name="binary" class="solr.BinaryField" />
<!--
If sortMissingLast="true", then a sort on this field will cause
@@ -368,15 +368,15 @@
</analyzer>
</fieldType>
- <fieldtype name="phonetic" stored="false" indexed="true"
+ <fieldType name="phonetic" stored="false" indexed="true"
class="solr.TextField">
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory" />
<filter class="solr.DoubleMetaphoneFilterFactory" inject="false" />
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="payloads" stored="false" indexed="true"
+ <fieldType name="payloads" stored="false" indexed="true"
class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory" />
@@ -395,7 +395,7 @@
<filter class="solr.DelimitedPayloadTokenFilterFactory"
encoder="float" />
</analyzer>
- </fieldtype>
+ </fieldType>
<!--
lowercases the entire field value, keeping it as a single token.
@@ -413,7 +413,7 @@
since fields of this type are by default not stored or indexed,
any data added to them will be ignored outright.
-->
- <fieldtype name="ignored" stored="false" indexed="false"
+ <fieldType name="ignored" stored="false" indexed="false"
multiValued="true" class="solr.StrField" />
</types>
Modified: lucene/dev/branches/branch_5x/solr/contrib/uima/src/test-files/uima/uima-tokenizers-schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/uima/src/test-files/uima/uima-tokenizers-schema.xml?rev=1645373&r1=1645372&r2=1645373&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/uima/src/test-files/uima/uima-tokenizers-schema.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/uima/src/test-files/uima/uima-tokenizers-schema.xml Sun Dec 14 00:27:44 2014
@@ -76,7 +76,7 @@
Binary data type. The data should be sent/retrieved in as Base64
encoded Strings
-->
- <fieldtype name="binary" class="solr.BinaryField" />
+ <fieldType name="binary" class="solr.BinaryField" />
<!--
If sortMissingLast="true", then a sort on this field will cause
@@ -364,15 +364,15 @@
</analyzer>
</fieldType>
- <fieldtype name="phonetic" stored="false" indexed="true"
+ <fieldType name="phonetic" stored="false" indexed="true"
class="solr.TextField">
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory" />
<filter class="solr.DoubleMetaphoneFilterFactory" inject="false" />
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="payloads" stored="false" indexed="true"
+ <fieldType name="payloads" stored="false" indexed="true"
class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory" />
@@ -391,7 +391,7 @@
<filter class="solr.DelimitedPayloadTokenFilterFactory"
encoder="float" />
</analyzer>
- </fieldtype>
+ </fieldType>
<!--
lowercases the entire field value, keeping it as a single token.
@@ -409,7 +409,7 @@
since fields of this type are by default not stored or indexed,
any data added to them will be ignored outright.
-->
- <fieldtype name="ignored" stored="false" indexed="false"
+ <fieldType name="ignored" stored="false" indexed="false"
multiValued="true" class="solr.StrField" />
</types>
Modified: lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/analysisconfs/analysis-err-schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/analysisconfs/analysis-err-schema.xml?rev=1645373&r1=1645372&r2=1645373&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/analysisconfs/analysis-err-schema.xml (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/analysisconfs/analysis-err-schema.xml Sun Dec 14 00:27:44 2014
@@ -22,14 +22,14 @@
<schema name="test" version="1.5">
<types>
- <fieldtype name="long" class="solr.TrieLongField" stored="true" indexed="true" />
- <fieldtype name="int" class="solr.TrieIntField" precisionStep="0"/>
- <fieldtype name="text" class="solr.TextField">
+ <fieldType name="long" class="solr.TrieLongField" stored="true" indexed="true" />
+ <fieldType name="int" class="solr.TrieIntField" precisionStep="0"/>
+ <fieldType name="text" class="solr.TextField">
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
<filter class="org.apache.solr.analysis.ThrowingMockTokenFilterFactory" exceptionClassName="java.lang.RuntimeException"/>
</analyzer>
- </fieldtype>
+ </fieldType>
</types>
Modified: lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-field.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-field.xml?rev=1645373&r1=1645372&r2=1645373&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-field.xml (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-field.xml Sun Dec 14 00:27:44 2014
@@ -19,7 +19,7 @@
<schema name="bad-schema-dup-field" version="1.0">
<types>
<fieldType name="string" class="solr.StrField"/>
- <fieldtype name="text" class="solr.TextField" />
+ <fieldType name="text" class="solr.TextField" />
</types>
Modified: lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-fieldType.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-fieldType.xml?rev=1645373&r1=1645372&r2=1645373&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-fieldType.xml (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-fieldType.xml Sun Dec 14 00:27:44 2014
@@ -19,7 +19,7 @@
<schema name="bad-schema-dup-fieldType" version="1.0">
<types>
- <fieldtype name="text" class="solr.TextField" />
+ <fieldType name="text" class="solr.TextField" />
<fieldType name="string" class="solr.StrField"/>
<!-- BEGIN BAD STUFF -->
Modified: lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/bad-schema-misplaced-asterisk-copyfield-dest-should-fail-test.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/bad-schema-misplaced-asterisk-copyfield-dest-should-fail-test.xml?rev=1645373&r1=1645372&r2=1645373&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/bad-schema-misplaced-asterisk-copyfield-dest-should-fail-test.xml (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/bad-schema-misplaced-asterisk-copyfield-dest-should-fail-test.xml Sun Dec 14 00:27:44 2014
@@ -18,7 +18,7 @@
<schema name="test" version="1.5">
<types>
- <fieldtype name="string" class="solr.StrField" sortMissingLast="true"/>
+ <fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
</types>
<fields>
<field name="text" type="string" indexed="true" stored="true"/>
Modified: lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/bad-schema-misplaced-asterisk-copyfield-source-should-fail-test.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/bad-schema-misplaced-asterisk-copyfield-source-should-fail-test.xml?rev=1645373&r1=1645372&r2=1645373&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/bad-schema-misplaced-asterisk-copyfield-source-should-fail-test.xml (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/bad-schema-misplaced-asterisk-copyfield-source-should-fail-test.xml Sun Dec 14 00:27:44 2014
@@ -18,7 +18,7 @@
<schema name="test" version="1.5">
<types>
- <fieldtype name="string" class="solr.StrField" sortMissingLast="true"/>
+ <fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
</types>
<fields>
<field name="text" type="string" indexed="true" stored="true"/>
Modified: lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/bad-schema-multiple-asterisk-copyfield-dest-should-fail-test.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/bad-schema-multiple-asterisk-copyfield-dest-should-fail-test.xml?rev=1645373&r1=1645372&r2=1645373&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/bad-schema-multiple-asterisk-copyfield-dest-should-fail-test.xml (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/bad-schema-multiple-asterisk-copyfield-dest-should-fail-test.xml Sun Dec 14 00:27:44 2014
@@ -18,7 +18,7 @@
<schema name="test" version="1.5">
<types>
- <fieldtype name="string" class="solr.StrField" sortMissingLast="true"/>
+ <fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
</types>
<fields>
<field name="text" type="string" indexed="true" stored="true"/>
Modified: lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/bad-schema-multiple-asterisk-copyfield-source-should-fail-test.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/bad-schema-multiple-asterisk-copyfield-source-should-fail-test.xml?rev=1645373&r1=1645372&r2=1645373&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/bad-schema-multiple-asterisk-copyfield-source-should-fail-test.xml (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/bad-schema-multiple-asterisk-copyfield-source-should-fail-test.xml Sun Dec 14 00:27:44 2014
@@ -18,7 +18,7 @@
<schema name="test" version="1.5">
<types>
- <fieldtype name="string" class="solr.StrField" sortMissingLast="true"/>
+ <fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
</types>
<fields>
<field name="text" type="string" indexed="true" stored="true"/>
Modified: lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/bad-schema-non-glob-copyfield-source-matching-nothing-should-fail-test.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/bad-schema-non-glob-copyfield-source-matching-nothing-should-fail-test.xml?rev=1645373&r1=1645372&r2=1645373&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/bad-schema-non-glob-copyfield-source-matching-nothing-should-fail-test.xml (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/bad-schema-non-glob-copyfield-source-matching-nothing-should-fail-test.xml Sun Dec 14 00:27:44 2014
@@ -18,7 +18,7 @@
<schema name="test" version="1.5">
<types>
- <fieldtype name="string" class="solr.StrField" sortMissingLast="true"/>
+ <fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
</types>
Modified: lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-add-schema-fields-update-processor.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-add-schema-fields-update-processor.xml?rev=1645373&r1=1645372&r2=1645373&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-add-schema-fields-update-processor.xml (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-add-schema-fields-update-processor.xml Sun Dec 14 00:27:44 2014
@@ -23,8 +23,8 @@
<fieldType name="tlong" class="solr.TrieLongField" precisionStep="8" multiValued="true" positionIncrementGap="0"/>
<fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" multiValued="true" positionIncrementGap="0"/>
<fieldType name="tdate" class="solr.TrieDateField" precisionStep="6" multiValued="true" positionIncrementGap="0"/>
- <fieldtype name="boolean" class="solr.BoolField" sortMissingLast="true" multiValued="true"/>
- <fieldtype name="string" class="solr.StrField" sortMissingLast="true"/>
+ <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true" multiValued="true"/>
+ <fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
<fieldType name="long" class="solr.TrieLongField" precisionStep="0" positionIncrementGap="0"/>
<fieldType name="text" class="solr.TextField" multiValued="true" positionIncrementGap="100">
<analyzer>
Modified: lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-binaryfield.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-binaryfield.xml?rev=1645373&r1=1645372&r2=1645373&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-binaryfield.xml (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-binaryfield.xml Sun Dec 14 00:27:44 2014
@@ -31,7 +31,7 @@
<!-- field type definitions... note that the "name" attribute is
just a label to be used by field definitions. The "class"
attribute and any other attributes determine the real type and
- behavior of the fieldtype.
+ behavior of the fieldType.
-->
<!--
@@ -58,14 +58,14 @@
<fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" positionIncrementGap="0"/>
- <fieldtype name="binary" class="solr.BinaryField"/>
- <fieldtype name="boolean" class="solr.BoolField" sortMissingLast="true"/>
- <fieldtype name="string" class="solr.StrField" sortMissingLast="true"/>
+ <fieldType name="binary" class="solr.BinaryField"/>
+ <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
+ <fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
<!-- format for date is 1995-12-31T23:59:59.999Z and only the fractional
seconds part (.999) is optional.
-->
- <fieldtype name="date" class="solr.TrieDateField" sortMissingLast="true"/>
+ <fieldType name="date" class="solr.TrieDateField" sortMissingLast="true"/>
Modified: lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-class-name-shortening-on-serialization.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-class-name-shortening-on-serialization.xml?rev=1645373&r1=1645372&r2=1645373&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-class-name-shortening-on-serialization.xml (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-class-name-shortening-on-serialization.xml Sun Dec 14 00:27:44 2014
@@ -17,23 +17,23 @@
-->
<schema name="test-class-name-shortening-on-serialization" version="1.5">
<types>
- <fieldtype name="fullClassNames" class="org.apache.solr.schema.TextField">
+ <fieldType name="fullClassNames" class="org.apache.solr.schema.TextField">
<analyzer>
<charFilter class="org.apache.solr.analysis.MockCharFilterFactory" remainder="0"/>
<tokenizer class="org.apache.solr.analysis.MockTokenizerFactory"/>
<filter class="org.apache.solr.analysis.MockTokenFilterFactory" stopset="empty"/>
</analyzer>
<similarity class="org.apache.lucene.misc.SweetSpotSimilarity"/>
- </fieldtype>
- <fieldtype name="shortenedClassNames" class="solr.TextField">
+ </fieldType>
+ <fieldType name="shortenedClassNames" class="solr.TextField">
<analyzer>
<charFilter class="solr.MockCharFilterFactory" remainder="0"/>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.MockTokenFilterFactory" stopset="empty"/>
</analyzer>
<similarity class="solr.SweetSpotSimilarityFactory"/>
- </fieldtype>
- <fieldtype name="string" class="solr.StrField" sortMissingLast="true"/>
+ </fieldType>
+ <fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
</types>
<fields>
<field name="id" type="string" indexed="true" stored="true" multiValued="false" required="true"/>
Modified: lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-collate-dv.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-collate-dv.xml?rev=1645373&r1=1645372&r2=1645373&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-collate-dv.xml (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-collate-dv.xml Sun Dec 14 00:27:44 2014
@@ -23,19 +23,19 @@
<fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<!-- basic text field -->
- <fieldtype name="text" class="solr.TextField">
+ <fieldType name="text" class="solr.TextField">
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="sort_ar_t" class="solr.CollationField" language="ar"/>
- <fieldtype name="sort_de_t" class="solr.CollationField" language="de" strength="primary"/>
- <fieldtype name="sort_tr_canon_t" class="solr.CollationField" language="tr" strength="primary" decomposition="canonical"/>
- <fieldtype name="sort_zh_full_t" class="solr.CollationField" language="zh" strength="identical" decomposition="full"/>
- <fieldtype name="sort_da_t" class="solr.CollationField" language="da" strength="primary"/>
- <fieldtype name="sort_custom_t" class="solr.CollationField" custom="customrules.dat" strength="primary"/>
+ <fieldType name="sort_ar_t" class="solr.CollationField" language="ar"/>
+ <fieldType name="sort_de_t" class="solr.CollationField" language="de" strength="primary"/>
+ <fieldType name="sort_tr_canon_t" class="solr.CollationField" language="tr" strength="primary" decomposition="canonical"/>
+ <fieldType name="sort_zh_full_t" class="solr.CollationField" language="zh" strength="identical" decomposition="full"/>
+ <fieldType name="sort_da_t" class="solr.CollationField" language="da" strength="primary"/>
+ <fieldType name="sort_custom_t" class="solr.CollationField" custom="customrules.dat" strength="primary"/>
</types>
<fields>
Modified: lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-collate.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-collate.xml?rev=1645373&r1=1645372&r2=1645373&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-collate.xml (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-collate.xml Sun Dec 14 00:27:44 2014
@@ -23,19 +23,19 @@
<fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<!-- basic text field -->
- <fieldtype name="text" class="solr.TextField">
+ <fieldType name="text" class="solr.TextField">
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="sort_ar_t" class="solr.CollationField" language="ar"/>
- <fieldtype name="sort_de_t" class="solr.CollationField" language="de" strength="primary"/>
- <fieldtype name="sort_tr_canon_t" class="solr.CollationField" language="tr" strength="primary" decomposition="canonical"/>
- <fieldtype name="sort_zh_full_t" class="solr.CollationField" language="zh" strength="identical" decomposition="full"/>
- <fieldtype name="sort_da_t" class="solr.CollationField" language="da" strength="primary"/>
- <fieldtype name="sort_custom_t" class="solr.CollationField" custom="customrules.dat" strength="primary"/>
+ <fieldType name="sort_ar_t" class="solr.CollationField" language="ar"/>
+ <fieldType name="sort_de_t" class="solr.CollationField" language="de" strength="primary"/>
+ <fieldType name="sort_tr_canon_t" class="solr.CollationField" language="tr" strength="primary" decomposition="canonical"/>
+ <fieldType name="sort_zh_full_t" class="solr.CollationField" language="zh" strength="identical" decomposition="full"/>
+ <fieldType name="sort_da_t" class="solr.CollationField" language="da" strength="primary"/>
+ <fieldType name="sort_custom_t" class="solr.CollationField" custom="customrules.dat" strength="primary"/>
</types>
<fields>
Modified: lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-complex-phrase.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-complex-phrase.xml?rev=1645373&r1=1645372&r2=1645373&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-complex-phrase.xml (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-complex-phrase.xml Sun Dec 14 00:27:44 2014
@@ -20,9 +20,9 @@
<fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldtype name="nametext" class="solr.TextField">
+ <fieldType name="nametext" class="solr.TextField">
<analyzer class="org.apache.lucene.analysis.standard.StandardAnalyzer"/>
- </fieldtype>
+ </fieldType>
</types>
<fields>
Modified: lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml?rev=1645373&r1=1645372&r2=1645373&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml Sun Dec 14 00:27:44 2014
@@ -31,7 +31,7 @@
<!-- field type definitions... note that the "name" attribute is
just a label to be used by field definitions. The "class"
attribute and any other attributes determine the real type and
- behavior of the fieldtype.
+ behavior of the fieldType.
-->
<!--
@@ -58,40 +58,40 @@
<fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" positionIncrementGap="0"/>
<!-- Field type demonstrating an Analyzer failure -->
- <fieldtype name="failtype1" class="solr.TextField">
+ <fieldType name="failtype1" class="solr.TextField">
<analyzer type="index">
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="0" catenateWords="0" catenateNumbers="0" catenateAll="0"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- Demonstrating ignoreCaseChange -->
- <fieldtype name="wdf_nocase" class="solr.TextField">
+ <fieldType name="wdf_nocase" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="0" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="0"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- HighlitText optimizes storage for (long) columns which will be highlit -->
- <fieldtype name="highlittext" class="solr.TextField" compressThreshold="345" />
+ <fieldType name="highlittext" class="solr.TextField" compressThreshold="345" />
- <fieldtype name="boolean" class="solr.BoolField" sortMissingLast="true"/>
- <fieldtype name="string" class="solr.StrField" sortMissingLast="true"/>
+ <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
+ <fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
<!-- format for date is 1995-12-31T23:59:59.999Z and only the fractional
seconds part (.999) is optional.
-->
- <fieldtype name="date" class="solr.TrieDateField" sortMissingLast="true"/>
+ <fieldType name="date" class="solr.TrieDateField" sortMissingLast="true"/>
<!-- solr.TextField allows the specification of custom
text analyzers specified as a tokenizer and a list
of token filters.
-->
- <fieldtype name="text" class="solr.TextField">
+ <fieldType name="text" class="solr.TextField">
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
<filter class="solr.StandardFilterFactory"/>
@@ -99,68 +99,68 @@
<filter class="solr.StopFilterFactory"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="nametext" class="solr.TextField">
+ <fieldType name="nametext" class="solr.TextField">
<analyzer class="org.apache.lucene.analysis.core.WhitespaceAnalyzer"/>
- </fieldtype>
+ </fieldType>
- <fieldtype name="teststop" class="solr.TextField">
+ <fieldType name="teststop" class="solr.TextField">
<analyzer>
<tokenizer class="solr.LowerCaseTokenizerFactory"/>
<filter class="solr.StandardFilterFactory"/>
<filter class="solr.StopFilterFactory" words="stopwords.txt"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <!-- fieldtypes in this section isolate tokenizers and tokenfilters for testing -->
- <fieldtype name="lowertok" class="solr.TextField">
+ <!-- fieldTypes in this section isolate tokenizers and tokenfilters for testing -->
+ <fieldType name="lowertok" class="solr.TextField">
<analyzer><tokenizer class="solr.LowerCaseTokenizerFactory"/></analyzer>
- </fieldtype>
- <fieldtype name="keywordtok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="keywordtok" class="solr.TextField">
<analyzer><tokenizer class="solr.MockTokenizerFactory" pattern="keyword"/></analyzer>
- </fieldtype>
- <fieldtype name="standardtok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="standardtok" class="solr.TextField">
<analyzer><tokenizer class="solr.StandardTokenizerFactory"/></analyzer>
- </fieldtype>
- <fieldtype name="lettertok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="lettertok" class="solr.TextField">
<analyzer><tokenizer class="solr.LetterTokenizerFactory"/></analyzer>
- </fieldtype>
- <fieldtype name="whitetok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="whitetok" class="solr.TextField">
<analyzer><tokenizer class="solr.MockTokenizerFactory"/></analyzer>
- </fieldtype>
- <fieldtype name="HTMLstandardtok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="HTMLstandardtok" class="solr.TextField">
<analyzer>
<charFilter class="solr.HTMLStripCharFilterFactory"/>
<tokenizer class="solr.StandardTokenizerFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="HTMLwhitetok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="HTMLwhitetok" class="solr.TextField">
<analyzer>
<charFilter class="solr.HTMLStripCharFilterFactory"/>
<tokenizer class="solr.MockTokenizerFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="standardtokfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="standardtokfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
<filter class="solr.StandardFilterFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="standardfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="standardfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.StandardFilterFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="lowerfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="lowerfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="patternreplacefilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="patternreplacefilt" class="solr.TextField">
<analyzer type="index">
<tokenizer class="solr.MockTokenizerFactory" pattern="keyword"/>
<filter class="solr.PatternReplaceFilterFactory"
@@ -170,52 +170,52 @@
<analyzer type="query">
<tokenizer class="solr.MockTokenizerFactory" pattern="keyword"/>
</analyzer>
- </fieldtype>
- <fieldtype name="porterfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="porterfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
- </fieldtype>
- <!-- fieldtype name="snowballfilt" class="solr.TextField">
+ </fieldType>
+ <!-- fieldType name="snowballfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.SnowballPorterFilterFactory"/>
</analyzer>
- </fieldtype -->
- <fieldtype name="engporterfilt" class="solr.TextField">
+ </fieldType -->
+ <fieldType name="engporterfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="custengporterfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="custengporterfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
- </fieldtype>
- <fieldtype name="stopfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="stopfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.StopFilterFactory" ignoreCase="true"/>
</analyzer>
- </fieldtype>
- <fieldtype name="custstopfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="custstopfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.StopFilterFactory" words="stopwords.txt"/>
</analyzer>
- </fieldtype>
- <fieldtype name="lengthfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="lengthfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.LengthFilterFactory" min="2" max="5"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="subword" class="solr.TextField" multiValued="true" positionIncrementGap="100">
+ <fieldType name="subword" class="solr.TextField" multiValued="true" positionIncrementGap="100">
<analyzer type="index">
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
@@ -230,10 +230,10 @@
<filter class="solr.StopFilterFactory"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- more flexible in matching skus, but more chance of a false match -->
- <fieldtype name="skutype1" class="solr.TextField">
+ <fieldType name="skutype1" class="solr.TextField">
<analyzer type="index">
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
@@ -244,10 +244,10 @@
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- less flexible in matching skus, but less chance of a false match -->
- <fieldtype name="skutype2" class="solr.TextField">
+ <fieldType name="skutype2" class="solr.TextField">
<analyzer type="index">
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
@@ -258,20 +258,20 @@
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- less flexible in matching skus, but less chance of a false match -->
- <fieldtype name="syn" class="solr.TextField">
+ <fieldType name="syn" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt"/>
</analyzer>
- </fieldtype>
+ </fieldType>
<!-- Demonstrates How RemoveDuplicatesTokenFilter makes stemmed
synonyms "better"
-->
- <fieldtype name="dedup" class="solr.TextField">
+ <fieldType name="dedup" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.SynonymFilterFactory"
@@ -279,17 +279,17 @@
<filter class="solr.PorterStemFilterFactory"/>
<filter class="solr.RemoveDuplicatesTokenFilterFactory" />
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="unstored" class="solr.StrField" indexed="true" stored="false"/>
+ <fieldType name="unstored" class="solr.StrField" indexed="true" stored="false"/>
- <fieldtype name="textgap" class="solr.TextField" multiValued="true" positionIncrementGap="100">
+ <fieldType name="textgap" class="solr.TextField" multiValued="true" positionIncrementGap="100">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
</types>