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 [4/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...
Modified: lucene/dev/branches/branch_5x/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema.xml?rev=1645373&r1=1645372&r2=1645373&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema.xml (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema.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.
-->
<fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
@@ -45,47 +45,47 @@
<fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" omitNorms="true" 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>
- <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" precisionStep="0"/>
- <fieldtype name="tdate" class="solr.TrieDateField" precisionStep="6"/>
+ <fieldType name="date" class="solr.TrieDateField" precisionStep="0"/>
+ <fieldType name="tdate" class="solr.TrieDateField" precisionStep="6"/>
<!-- 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"/>
@@ -93,74 +93,74 @@
<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"/>
</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="lowerpunctfilt" class="solr.TextField">
+ </fieldType>
+ <fieldType name="lowerpunctfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="1" splitOnCaseChange="1"/>
<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,53 +170,53 @@
<analyzer type="query">
<tokenizer class="solr.MockTokenizerFactory" pattern="keyword"/>
</analyzer>
- </fieldtype>
- <fieldtype name="patterntok" class="solr.TextField">
+ </fieldType>
+ <fieldType name="patterntok" class="solr.TextField">
<analyzer>
<tokenizer class="solr.PatternTokenizerFactory" pattern=","/>
</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.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"/>
</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="charfilthtmlmap" class="solr.TextField">
<analyzer>
<charFilter class="solr.HTMLStripCharFilterFactory"/>
@@ -224,7 +224,7 @@
</analyzer>
</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"/>
@@ -239,9 +239,9 @@
<filter class="solr.StopFilterFactory"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="numericsubword" class="solr.TextField" multiValued="true" positionIncrementGap="100">
+ <fieldType name="numericsubword" class="solr.TextField" multiValued="true" positionIncrementGap="100">
<analyzer type="index">
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
@@ -256,9 +256,9 @@
<filter class="solr.StopFilterFactory"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
- <fieldtype name="protectedsubword" class="solr.TextField" multiValued="true" positionIncrementGap="100">
+ <fieldType name="protectedsubword" class="solr.TextField" multiValued="true" positionIncrementGap="100">
<analyzer type="index">
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
@@ -268,11 +268,11 @@
<tokenizer class="solr.MockTokenizerFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
</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"/>
@@ -283,10 +283,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"/>
@@ -297,25 +297,25 @@
<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"/>
</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>
<fieldType name="uuid" class="solr.UUIDField" />
@@ -325,7 +325,7 @@
<fieldType name="tenD" class="solr.PointType" dimension="10" subFieldType="double"/>
<!-- Use the sub field suffix -->
<fieldType name="xyd" class="solr.PointType" dimension="2" subFieldSuffix="_d1"/>
- <fieldtype name="geohash" class="solr.GeoHashField"/>
+ <fieldType name="geohash" class="solr.GeoHashField"/>
<fieldType name="latLon" class="solr.LatLonType" subFieldType="double"/>
Modified: lucene/dev/branches/branch_5x/solr/solrj/src/test-files/solrj/solr/crazy-path-to-schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/test-files/solrj/solr/crazy-path-to-schema.xml?rev=1645373&r1=1645372&r2=1645373&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/test-files/solrj/solr/crazy-path-to-schema.xml (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/test-files/solrj/solr/crazy-path-to-schema.xml Sun Dec 14 00:27:44 2014
@@ -23,8 +23,8 @@
<schema name="test" version="1.0">
<types>
- <fieldtype name="int" class="solr.TrieIntField" precisionStep="0"/>
- <fieldtype name="text" class="solr.TextField">
+ <fieldType name="int" class="solr.TrieIntField" precisionStep="0"/>
+ <fieldType name="text" class="solr.TextField">
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
<filter class="solr.StandardFilterFactory"/>
@@ -32,7 +32,7 @@
<filter class="solr.StopFilterFactory"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
- </fieldtype>
+ </fieldType>
</types>
Modified: lucene/dev/branches/branch_5x/solr/solrj/src/test-files/solrj/solr/shared/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/test-files/solrj/solr/shared/conf/schema.xml?rev=1645373&r1=1645372&r2=1645373&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/test-files/solrj/solr/shared/conf/schema.xml (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/test-files/solrj/solr/shared/conf/schema.xml Sun Dec 14 00:27:44 2014
@@ -18,7 +18,7 @@
<schema name="example core ${l10n:}" version="1.1">
<types>
- <fieldtype name="string" class="solr.StrField" sortMissingLast="true" omitNorms="true"/>
+ <fieldType name="string" class="solr.StrField" sortMissingLast="true" omitNorms="true"/>
<fieldType name="text-FR" class="solr.TextField" positionIncrementGap="100">
<analyzer type="index">
<tokenizer class="solr.StandardTokenizerFactory"/>