You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ct...@apache.org on 2017/05/10 12:35:21 UTC

[34/50] [abbrv] lucene-solr:jira/solr-10290: SOLR-10535: remove six unused test files (Jason Gerlowski via Christine Poerschke)

SOLR-10535: remove six unused test files
(Jason Gerlowski via Christine Poerschke)


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/370adaa6
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/370adaa6
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/370adaa6

Branch: refs/heads/jira/solr-10290
Commit: 370adaa6f1d033e94e051b50a9633a5e8737ea69
Parents: 017da20
Author: Christine Poerschke <cp...@apache.org>
Authored: Tue May 9 15:18:22 2017 +0100
Committer: Cassandra Targett <ca...@lucidworks.com>
Committed: Wed May 10 07:30:33 2017 -0500

----------------------------------------------------------------------
 .../test-files/lib-dirs/d/d1/empty-file-d1.txt  |   1 -
 .../collection1/conf/bad-schema-init-error.xml  |  25 -
 .../conf/schema-single-dynamic-copy-field.xml   | 663 -------------------
 .../collection1/conf/solrconfig-lazywriter.xml  |  29 -
 .../solrconfig-tlog-with-delayingcomponent.xml  | 124 ----
 .../core/src/test-files/solr/solr-multicore.xml |   0
 6 files changed, 842 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/370adaa6/solr/core/src/test-files/lib-dirs/d/d1/empty-file-d1.txt
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/lib-dirs/d/d1/empty-file-d1.txt b/solr/core/src/test-files/lib-dirs/d/d1/empty-file-d1.txt
deleted file mode 100644
index 8b13789..0000000
--- a/solr/core/src/test-files/lib-dirs/d/d1/empty-file-d1.txt
+++ /dev/null
@@ -1 +0,0 @@
-

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/370adaa6/solr/core/src/test-files/solr/collection1/conf/bad-schema-init-error.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-init-error.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-init-error.xml
deleted file mode 100644
index d1f610e..0000000
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-init-error.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<schema name="bad-schema-throws-java-error" version="1.6">
-  <fieldType name="error_ft" class="solr.ThrowErrorOnInitFieldType"/>
-
-
-  <field name="id" type="error_ft"/>
-
-</schema>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/370adaa6/solr/core/src/test-files/solr/collection1/conf/schema-single-dynamic-copy-field.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-single-dynamic-copy-field.xml b/solr/core/src/test-files/solr/collection1/conf/schema-single-dynamic-copy-field.xml
deleted file mode 100644
index 1652d88..0000000
--- a/solr/core/src/test-files/solr/collection1/conf/schema-single-dynamic-copy-field.xml
+++ /dev/null
@@ -1,663 +0,0 @@
-<?xml version="1.0" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- The Solr schema file, version 1.6  -->
-
-<schema name="test-rest" version="1.6">
-  <!-- attribute "name" is the name of this schema and is only used for display purposes.
-         Applications should change this to reflect the nature of the search collection.
-         version="x.y" is Solr's version number for the schema syntax and semantics.  It should
-         not normally be changed by applications.
-         1.0: multiValued attribute did not exist, all fields are multiValued by nature
-         1.1: multiValued attribute introduced, false by default 
-         1.2: omitTermFreqAndPositions attribute introduced, true by default except for text fields.
-         1.3: removed optional field compress feature
-         1.4: default auto-phrase (QueryParser feature) to off
-         1.5: omitNorms defaults to true for primitive field types (int, float, boolean, string...)
-         1.6: useDocValuesAsStored defaults to true.
-       -->
-  <fieldType name="int" class="solr.TrieIntField" precisionStep="0" positionIncrementGap="0"/>
-  <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" positionIncrementGap="0"/>
-  <fieldType name="long" class="solr.TrieLongField" precisionStep="0" positionIncrementGap="0"/>
-  <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" positionIncrementGap="0"/>
-
-  <fieldType name="tint" class="solr.TrieIntField" precisionStep="8" positionIncrementGap="0"/>
-  <fieldType name="tfloat" class="solr.TrieFloatField" precisionStep="8" positionIncrementGap="0"/>
-  <fieldType name="tlong" class="solr.TrieLongField" precisionStep="8" positionIncrementGap="0"/>
-  <fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" positionIncrementGap="0"/>
-
-  <!-- Field type demonstrating an Analyzer failure -->
-  <fieldType name="failtype1" class="solr.TextField">
-    <analyzer type="index">
-      <tokenizer class="solr.MockTokenizerFactory"/>
-      <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="0" catenateWords="0"
-              catenateNumbers="0" catenateAll="0"/>
-      <filter class="solr.LowerCaseFilterFactory"/>
-      <filter class="solr.FlattenGraphFilterFactory"/>
-    </analyzer>
-  </fieldType>
-
-  <!-- Demonstrating ignoreCaseChange -->
-  <fieldType name="wdf_nocase" class="solr.TextField">
-    <analyzer type="index">
-      <tokenizer class="solr.MockTokenizerFactory"/>
-      <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="0" catenateWords="0"
-              catenateNumbers="0" catenateAll="0" splitOnCaseChange="0" preserveOriginal="0"/>
-      <filter class="solr.LowerCaseFilterFactory"/>
-      <filter class="solr.FlattenGraphFilterFactory"/>
-    </analyzer>
-    <analyzer type="query">
-      <tokenizer class="solr.MockTokenizerFactory"/>
-      <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="0" catenateWords="0"
-              catenateNumbers="0" catenateAll="0" splitOnCaseChange="0" preserveOriginal="0"/>
-      <filter class="solr.LowerCaseFilterFactory"/>
-    </analyzer>
-  </fieldType>
-
-  <fieldType name="wdf_preserve" class="solr.TextField">
-    <analyzer type="index">
-      <tokenizer class="solr.MockTokenizerFactory"/>
-      <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="0" generateNumberParts="1" catenateWords="0"
-              catenateNumbers="0" catenateAll="0" splitOnCaseChange="0" preserveOriginal="1"/>
-      <filter class="solr.LowerCaseFilterFactory"/>
-      <filter class="solr.FlattenGraphFilterFactory"/>
-    </analyzer>
-    <analyzer type="query">
-      <tokenizer class="solr.MockTokenizerFactory"/>
-      <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="0" generateNumberParts="1" catenateWords="0"
-              catenateNumbers="0" catenateAll="0" splitOnCaseChange="0" preserveOriginal="1"/>
-      <filter class="solr.LowerCaseFilterFactory"/>
-    </analyzer>
-  </fieldType>
-
-
-  <!-- HighlitText optimizes storage for (long) columns which will be highlit -->
-  <fieldType name="highlittext" class="solr.TextField"/>
-
-  <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="tdate" class="solr.TrieDateField" sortMissingLast="true" precisionStep="6"/>
-
-  <fieldType name="text" class="solr.TextField" positionIncrementGap="100" autoGeneratePhraseQueries="true">
-    <analyzer type="index">
-      <tokenizer class="solr.MockTokenizerFactory"/>
-      <filter class="solr.StopFilterFactory"
-              ignoreCase="true"
-              words="stopwords.txt"
-      />
-      <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1"
-              catenateNumbers="1" catenateAll="0" splitOnCaseChange="1"/>
-      <filter class="solr.LowerCaseFilterFactory"/>
-      <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
-      <filter class="solr.PorterStemFilterFactory"/>
-      <filter class="solr.FlattenGraphFilterFactory"/>
-    </analyzer>
-    <analyzer type="query">
-      <tokenizer class="solr.MockTokenizerFactory"/>
-      <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
-      <filter class="solr.StopFilterFactory"
-              ignoreCase="true"
-              words="stopwords.txt"
-      />
-      <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0"
-              catenateNumbers="0" catenateAll="0" splitOnCaseChange="1"/>
-      <filter class="solr.LowerCaseFilterFactory"/>
-      <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
-      <filter class="solr.PorterStemFilterFactory"/>
-    </analyzer>
-  </fieldType>
-
-
-  <!-- A text field with defaults appropriate for English: it
-       tokenizes with StandardTokenizer, removes English stop words
-       (lang/stopwords_en.txt), down cases, protects words from protwords.txt, and
-       finally applies Porter's stemming.  The query time analyzer
-       also applies synonyms from synonyms.txt. -->
-  <fieldType name="text_en" class="solr.TextField" positionIncrementGap="100">
-    <analyzer type="index">
-      <tokenizer class="solr.StandardTokenizerFactory"/>
-      <!-- in this example, we will only use synonyms at query time
-              <filter class="solr.SynonymGraphFilterFactory" synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/>
-              <filter class="solr.FlattenGraphFilterFactory"/>
-              -->
-      <filter class="solr.LowerCaseFilterFactory"/>
-      <filter class="solr.EnglishPossessiveFilterFactory"/>
-      <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
-      <!-- Optionally you may want to use this less aggressive stemmer instead of PorterStemFilterFactory:
-                    <filter class="solr.EnglishMinimalStemFilterFactory"/>
-              -->
-      <filter class="solr.PorterStemFilterFactory"/>
-    </analyzer>
-    <analyzer type="query">
-      <tokenizer class="solr.StandardTokenizerFactory"/>
-      <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
-      <filter class="solr.LowerCaseFilterFactory"/>
-      <filter class="solr.EnglishPossessiveFilterFactory"/>
-      <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
-      <!-- Optionally you may want to use this less aggressive stemmer instead of PorterStemFilterFactory:
-                    <filter class="solr.EnglishMinimalStemFilterFactory"/>
-              -->
-      <filter class="solr.PorterStemFilterFactory"/>
-    </analyzer>
-  </fieldType>
-
-
-  <!-- field type that doesn't generate phrases from unquoted multiple tokens per analysis unit -->
-  <fieldType name="text_np" class="solr.TextField" positionIncrementGap="100">
-    <analyzer type="index">
-      <tokenizer class="solr.MockTokenizerFactory"/>
-      <filter class="solr.StopFilterFactory"
-              ignoreCase="true"
-              words="stopwords.txt"
-      />
-      <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1"
-              catenateNumbers="1" catenateAll="0" splitOnCaseChange="1"/>
-      <filter class="solr.LowerCaseFilterFactory"/>
-      <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
-      <filter class="solr.PorterStemFilterFactory"/>
-      <filter class="solr.FlattenGraphFilterFactory"/>
-    </analyzer>
-    <analyzer type="query">
-      <tokenizer class="solr.MockTokenizerFactory"/>
-      <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
-      <filter class="solr.StopFilterFactory"
-              ignoreCase="true"
-              words="stopwords.txt"
-      />
-      <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0"
-              catenateNumbers="0" catenateAll="0" splitOnCaseChange="1"/>
-      <filter class="solr.LowerCaseFilterFactory"/>
-      <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
-      <filter class="solr.PorterStemFilterFactory"/>
-    </analyzer>
-  </fieldType>
-
-  <fieldType name="nametext" class="solr.TextField">
-    <analyzer class="org.apache.lucene.analysis.core.WhitespaceAnalyzer"/>
-  </fieldType>
-
-  <fieldType name="teststop" class="solr.TextField">
-    <analyzer>
-      <tokenizer class="solr.LowerCaseTokenizerFactory"/>
-      <filter class="solr.StandardFilterFactory"/>
-      <filter class="solr.StopFilterFactory" words="stopwords.txt"/>
-    </analyzer>
-  </fieldType>
-
-  <!-- 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">
-    <analyzer>
-      <tokenizer class="solr.MockTokenizerFactory" pattern="keyword"/>
-    </analyzer>
-  </fieldType>
-  <fieldType name="standardtok" class="solr.TextField">
-    <analyzer>
-      <tokenizer class="solr.StandardTokenizerFactory"/>
-    </analyzer>
-  </fieldType>
-  <fieldType name="lettertok" class="solr.TextField">
-    <analyzer>
-      <tokenizer class="solr.LetterTokenizerFactory"/>
-    </analyzer>
-  </fieldType>
-  <fieldType name="whitetok" class="solr.TextField">
-    <analyzer>
-      <tokenizer class="solr.MockTokenizerFactory"/>
-    </analyzer>
-  </fieldType>
-  <fieldType name="HTMLstandardtok" class="solr.TextField">
-    <analyzer>
-      <charFilter class="solr.HTMLStripCharFilterFactory"/>
-      <tokenizer class="solr.StandardTokenizerFactory"/>
-    </analyzer>
-  </fieldType>
-  <fieldType name="HTMLwhitetok" class="solr.TextField">
-    <analyzer>
-      <charFilter class="solr.HTMLStripCharFilterFactory"/>
-      <tokenizer class="solr.MockTokenizerFactory"/>
-    </analyzer>
-  </fieldType>
-  <fieldType name="standardtokfilt" class="solr.TextField">
-    <analyzer>
-      <tokenizer class="solr.StandardTokenizerFactory"/>
-      <filter class="solr.StandardFilterFactory"/>
-    </analyzer>
-  </fieldType>
-  <fieldType name="standardfilt" class="solr.TextField">
-    <analyzer>
-      <tokenizer class="solr.MockTokenizerFactory"/>
-      <filter class="solr.StandardFilterFactory"/>
-    </analyzer>
-  </fieldType>
-  <fieldType name="lowerfilt" class="solr.TextField">
-    <analyzer>
-      <tokenizer class="solr.MockTokenizerFactory"/>
-      <filter class="solr.LowerCaseFilterFactory"/>
-    </analyzer>
-  </fieldType>
-  <fieldType name="patternreplacefilt" class="solr.TextField">
-    <analyzer type="index">
-      <tokenizer class="solr.MockTokenizerFactory" pattern="keyword"/>
-      <filter class="solr.PatternReplaceFilterFactory"
-              pattern="([^a-zA-Z])" replacement="_" replace="all"
-      />
-    </analyzer>
-    <analyzer type="query">
-      <tokenizer class="solr.MockTokenizerFactory" pattern="keyword"/>
-    </analyzer>
-  </fieldType>
-  <fieldType name="porterfilt" class="solr.TextField">
-    <analyzer>
-      <tokenizer class="solr.MockTokenizerFactory"/>
-      <filter class="solr.PorterStemFilterFactory"/>
-    </analyzer>
-  </fieldType>
-  <fieldType name="engporterfilt" class="solr.TextField">
-    <analyzer>
-      <tokenizer class="solr.MockTokenizerFactory"/>
-      <filter class="solr.PorterStemFilterFactory"/>
-    </analyzer>
-  </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">
-    <analyzer>
-      <tokenizer class="solr.MockTokenizerFactory"/>
-      <filter class="solr.StopFilterFactory" ignoreCase="true"/>
-    </analyzer>
-  </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">
-    <analyzer>
-      <tokenizer class="solr.MockTokenizerFactory"/>
-      <filter class="solr.LengthFilterFactory" min="2" max="5"/>
-    </analyzer>
-  </fieldType>
-  <fieldType name="limitfilt" class="solr.TextField">
-    <analyzer>
-      <tokenizer class="solr.MockTokenizerFactory"/>
-      <filter class="solr.LimitTokenCountFilterFactory" maxTokenCount="100"/>
-    </analyzer>
-  </fieldType>
-
-  <fieldType name="subword" class="solr.TextField" multiValued="true" positionIncrementGap="100">
-    <analyzer type="index">
-      <tokenizer class="solr.MockTokenizerFactory"/>
-      <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1"
-              catenateNumbers="1" catenateAll="0"/>
-      <filter class="solr.LowerCaseFilterFactory"/>
-      <filter class="solr.StopFilterFactory"/>
-      <filter class="solr.PorterStemFilterFactory"/>
-      <filter class="solr.FlattenGraphFilterFactory"/>
-    </analyzer>
-    <analyzer type="query">
-      <tokenizer class="solr.MockTokenizerFactory"/>
-      <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0"
-              catenateNumbers="0" catenateAll="0"/>
-      <filter class="solr.LowerCaseFilterFactory"/>
-      <filter class="solr.StopFilterFactory"/>
-      <filter class="solr.PorterStemFilterFactory"/>
-    </analyzer>
-  </fieldType>
-
-  <fieldType name="numericsubword" class="solr.TextField" multiValued="true" positionIncrementGap="100">
-    <analyzer type="index">
-      <tokenizer class="solr.MockTokenizerFactory"/>
-      <filter class="solr.LowerCaseFilterFactory"/>
-      <filter class="solr.WordDelimiterGraphFilterFactory" protected="protwords.txt" splitOnNumerics="0"
-              splitOnCaseChange="0" generateWordParts="1" generateNumberParts="0" catenateWords="0" catenateNumbers="0"
-              catenateAll="0"/>
-      <filter class="solr.StopFilterFactory"/>
-      <filter class="solr.PorterStemFilterFactory"/>
-      <filter class="solr.FlattenGraphFilterFactory"/>
-    </analyzer>
-    <analyzer type="query">
-      <tokenizer class="solr.MockTokenizerFactory"/>
-      <filter class="solr.LowerCaseFilterFactory"/>
-      <filter class="solr.WordDelimiterGraphFilterFactory" protected="protwords.txt" splitOnNumerics="0"
-              splitOnCaseChange="0" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1"
-              catenateAll="0"/>
-      <filter class="solr.StopFilterFactory"/>
-      <filter class="solr.PorterStemFilterFactory"/>
-    </analyzer>
-  </fieldType>
-
-  <fieldType name="protectedsubword" class="solr.TextField" multiValued="true" positionIncrementGap="100">
-    <analyzer type="index">
-      <tokenizer class="solr.MockTokenizerFactory"/>
-      <filter class="solr.LowerCaseFilterFactory"/>
-      <filter class="solr.WordDelimiterGraphFilterFactory" protected="protwords.txt" splitOnNumerics="0"
-              splitOnCaseChange="0" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0"
-              catenateAll="0"/>
-      <filter class="solr.FlattenGraphFilterFactory"/>
-    </analyzer>
-    <analyzer type="query">
-      <tokenizer class="solr.MockTokenizerFactory"/>
-      <filter class="solr.LowerCaseFilterFactory"/>
-    </analyzer>
-  </fieldType>
-
-
-  <!-- more flexible in matching skus, but more chance of a false match -->
-  <fieldType name="skutype1" class="solr.TextField">
-    <analyzer type="index">
-      <tokenizer class="solr.MockTokenizerFactory"/>
-      <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1"
-              catenateNumbers="1" catenateAll="0"/>
-      <filter class="solr.LowerCaseFilterFactory"/>
-      <filter class="solr.FlattenGraphFilterFactory"/>
-    </analyzer>
-    <analyzer type="query">
-      <tokenizer class="solr.MockTokenizerFactory"/>
-      <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1"
-              catenateNumbers="1" catenateAll="0"/>
-      <filter class="solr.LowerCaseFilterFactory"/>
-    </analyzer>
-  </fieldType>
-
-  <!-- less flexible in matching skus, but less chance of a false match -->
-  <fieldType name="skutype2" class="solr.TextField">
-    <analyzer type="index">
-      <tokenizer class="solr.MockTokenizerFactory"/>
-      <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1"
-              catenateNumbers="1" catenateAll="0"/>
-      <filter class="solr.LowerCaseFilterFactory"/>
-      <filter class="solr.FlattenGraphFilterFactory"/>
-    </analyzer>
-    <analyzer type="query">
-      <tokenizer class="solr.MockTokenizerFactory"/>
-      <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1"
-              catenateNumbers="1" catenateAll="0"/>
-      <filter class="solr.LowerCaseFilterFactory"/>
-    </analyzer>
-  </fieldType>
-
-  <!-- less flexible in matching skus, but less chance of a false match -->
-  <fieldType name="syn" class="solr.TextField">
-    <analyzer type="index">
-      <tokenizer class="solr.MockTokenizerFactory"/>
-      <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt"/>
-      <filter class="solr.FlattenGraphFilterFactory"/>
-    </analyzer>
-    <analyzer type="query">
-      <tokenizer class="solr.MockTokenizerFactory"/>
-      <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt"/>
-    </analyzer>
-  </fieldType>
-
-  <!-- a text field with the stop filter only on the query analyzer 
-       -->
-  <fieldType name="text_sw" class="solr.TextField" positionIncrementGap="100">
-    <analyzer type="index">
-      <tokenizer class="solr.MockTokenizerFactory"/>
-      <!-- in this example, we will only use synonyms at query time
-              <filter class="solr.SynonymGraphFilterFactory" synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/>
-              -->
-      <!--<filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>-->
-      <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1"
-              catenateNumbers="1" catenateAll="0" splitOnCaseChange="0"/>
-      <filter class="solr.LowerCaseFilterFactory"/>
-      <filter class="solr.PorterStemFilterFactory"/>
-      <filter class="solr.FlattenGraphFilterFactory"/>
-    </analyzer>
-    <analyzer type="query">
-      <tokenizer class="solr.MockTokenizerFactory"/>
-      <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
-      <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
-      <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0"
-              catenateNumbers="0" catenateAll="0" splitOnCaseChange="0"/>
-      <filter class="solr.LowerCaseFilterFactory"/>
-      <filter class="solr.PorterStemFilterFactory"/>
-    </analyzer>
-  </fieldType>
-
-
-  <!-- Demonstrates How RemoveDuplicatesTokenFilter makes stemmed
-           synonyms "better"
-        -->
-  <fieldType name="dedup" class="solr.TextField">
-    <analyzer type="index">
-      <tokenizer class="solr.MockTokenizerFactory"/>
-      <filter class="solr.SynonymGraphFilterFactory"
-              synonyms="synonyms.txt" expand="true"/>
-      <filter class="solr.PorterStemFilterFactory"/>
-      <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
-      <filter class="solr.FlattenGraphFilterFactory"/>
-    </analyzer>
-    <analyzer type="query">
-      <tokenizer class="solr.MockTokenizerFactory"/>
-      <filter class="solr.SynonymGraphFilterFactory"
-              synonyms="synonyms.txt" expand="true"/>
-      <filter class="solr.PorterStemFilterFactory"/>
-      <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
-    </analyzer>
-  </fieldType>
-
-  <fieldType name="unstored" class="solr.StrField" indexed="true" stored="false"/>
-
-
-  <fieldType name="textgap" class="solr.TextField" multiValued="true" positionIncrementGap="100">
-    <analyzer>
-      <tokenizer class="solr.MockTokenizerFactory"/>
-      <filter class="solr.LowerCaseFilterFactory"/>
-    </analyzer>
-  </fieldType>
-
-  <fieldType name="uuid" class="solr.UUIDField"/>
-  <fieldType name="ignored" class="solr.StrField" indexed="false" stored="false"/>
-
-
-  <fieldType name="random" class="solr.RandomSortField" indexed="true"/>
-
-  <!-- Poly field -->
-  <fieldType name="xy" class="solr.PointType" dimension="2" subFieldType="double"/>
-  <fieldType name="xyd" class="solr.PointType" dimension="2" subFieldSuffix="*_d"/>
-  <fieldType name="geohash" class="solr.GeoHashField"/>
-
-  <fieldType name="point" class="solr.PointType" dimension="2" subFieldSuffix="_d"/>
-  <!-- A specialized field for geospatial search. If indexed, this fieldType must not be multivalued. -->
-  <fieldType name="location" class="solr.LatLonType" subFieldSuffix="_coordinate"/>
-
-  <!-- Field type where english stopwords are managed by the REST API -->
-  <fieldType name="managed_en" class="solr.TextField">
-    <analyzer>
-      <tokenizer class="solr.StandardTokenizerFactory"/>
-      <filter class="solr.ManagedStopFilterFactory" managed="english"/>
-      <filter class="solr.ManagedSynonymFilterFactory" managed="english"/>
-    </analyzer>
-  </fieldType>
-
-  <!-- Field type where german stopwords are managed by the REST API -->
-  <fieldType name="managed_de" class="solr.TextField">
-    <analyzer>
-      <tokenizer class="solr.StandardTokenizerFactory"/>
-      <filter class="solr.ManagedStopFilterFactory" managed="german"/>
-      <filter class="solr.ManagedSynonymFilterFactory" managed="german"/>
-    </analyzer>
-  </fieldType>
-
-  <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="true"/>
-  <field name="signatureField" type="string" indexed="true" stored="false"/>
-  <field name="uuid" type="uuid" stored="true"/>
-  <field name="name" type="nametext" indexed="true" stored="true"/>
-  <field name="text" type="text" indexed="true" stored="false" multiValued="true"/>
-  <field name="subject" type="text" indexed="true" stored="true"/>
-  <field name="title" type="nametext" indexed="true" stored="true"/>
-  <field name="weight" type="float" indexed="true" stored="true"/>
-  <field name="bday" type="date" indexed="true" stored="true"/>
-
-  <field name="text_np" type="text_np" indexed="true" stored="false"/>
-
-  <field name="title_stemmed" type="text" indexed="true" stored="false"/>
-  <field name="title_lettertok" type="lettertok" indexed="true" stored="false"/>
-
-  <field name="syn" type="syn" indexed="true" stored="true"/>
-
-  <!-- to test property inheritance and overriding -->
-  <field name="shouldbeunstored" type="unstored"/>
-  <field name="shouldbestored" type="unstored" stored="true"/>
-  <field name="shouldbeunindexed" type="unstored" indexed="false" stored="true"/>
-
-
-  <!-- test different combinations of indexed and stored -->
-  <field name="bind" type="boolean" indexed="true" stored="false"/>
-  <field name="bsto" type="boolean" indexed="false" stored="true"/>
-  <field name="bindsto" type="boolean" indexed="true" stored="true"/>
-  <field name="isto" type="int" indexed="false" stored="true"/>
-  <field name="iind" type="int" indexed="true" stored="false"/>
-  <field name="ssto" type="string" indexed="false" stored="true"/>
-  <field name="sind" type="string" indexed="true" stored="false"/>
-  <field name="sindsto" type="string" indexed="true" stored="true"/>
-
-  <!-- test combinations of term vector settings -->
-  <field name="test_basictv" type="text" termVectors="true"/>
-  <field name="test_notv" type="text" termVectors="false"/>
-  <field name="test_postv" type="text" termVectors="true" termPositions="true"/>
-  <field name="test_offtv" type="text" termVectors="true" termOffsets="true"/>
-  <field name="test_posofftv" type="text" termVectors="true"
-         termPositions="true" termOffsets="true"/>
-
-  <!-- test highlit field settings -->
-  <field name="test_hlt" type="highlittext" indexed="true"/>
-  <field name="test_hlt_off" type="highlittext" indexed="true"/>
-
-  <!-- fields to test individual tokenizers and tokenfilters -->
-  <field name="teststop" type="teststop" indexed="true" stored="true"/>
-  <field name="lowertok" type="lowertok" indexed="true" stored="true"/>
-  <field name="keywordtok" type="keywordtok" indexed="true" stored="true"/>
-  <field name="standardtok" type="standardtok" indexed="true" stored="true"/>
-  <field name="HTMLstandardtok" type="HTMLstandardtok" indexed="true" stored="true"/>
-  <field name="lettertok" type="lettertok" indexed="true" stored="true"/>
-  <field name="whitetok" type="whitetok" indexed="true" stored="true"/>
-  <field name="HTMLwhitetok" type="HTMLwhitetok" indexed="true" stored="true"/>
-  <field name="standardtokfilt" type="standardtokfilt" indexed="true" stored="true"/>
-  <field name="standardfilt" type="standardfilt" indexed="true" stored="true"/>
-  <field name="lowerfilt" type="lowerfilt" indexed="true" stored="true"/>
-  <field name="patternreplacefilt" type="patternreplacefilt" indexed="true" stored="true"/>
-  <field name="porterfilt" type="porterfilt" indexed="true" stored="true"/>
-  <field name="engporterfilt" type="engporterfilt" indexed="true" stored="true"/>
-  <field name="custengporterfilt" type="custengporterfilt" indexed="true" stored="true"/>
-  <field name="stopfilt" type="stopfilt" indexed="true" stored="true"/>
-  <field name="custstopfilt" type="custstopfilt" indexed="true" stored="true"/>
-  <field name="lengthfilt" type="lengthfilt" indexed="true" stored="true"/>
-  <field name="dedup" type="dedup" indexed="true" stored="true"/>
-  <field name="wdf_nocase" type="wdf_nocase" indexed="true" stored="true"/>
-  <field name="wdf_preserve" type="wdf_preserve" indexed="true" stored="true"/>
-
-  <field name="numberpartfail" type="failtype1" indexed="true" stored="true"/>
-
-  <field name="nullfirst" type="string" indexed="true" stored="true" sortMissingFirst="true"/>
-
-  <field name="subword" type="subword" indexed="true" stored="true"/>
-  <field name="numericsubword" type="numericsubword" indexed="true" stored="true"/>
-  <field name="protectedsubword" type="protectedsubword" indexed="true" stored="true"/>
-
-  <field name="sku1" type="skutype1" indexed="true" stored="true"/>
-  <field name="sku2" type="skutype2" indexed="true" stored="true"/>
-
-  <field name="textgap" type="textgap" indexed="true" stored="true"/>
-
-  <!--
-      <field name="timestamp" type="date" indexed="true" stored="true" default="NOW"/>
-      -->
-  <field name="timestamp" type="date" indexed="true" stored="true"/>
-
-  <!-- Test a point field for distances -->
-  <field name="point" type="xy" indexed="true" stored="true" multiValued="false"/>
-  <field name="pointD" type="xyd" indexed="true" stored="true" multiValued="false"/>
-  <field name="point_hash" type="geohash" indexed="true" stored="true" multiValued="false"/>
-  <field name="store" type="location" indexed="true" stored="true"/>
-
-  <!-- to test uniq fields -->
-  <field name="uniq" type="string" indexed="true" stored="true" multiValued="true"/>
-  <field name="uniq2" type="string" indexed="true" stored="true" multiValued="true"/>
-  <field name="uniq3" type="string" indexed="true" stored="true"/>
-  <field name="nouniq" type="string" indexed="true" stored="true" multiValued="true"/>
-
-  <!-- for versioning -->
-  <field name="_version_" type="long" indexed="true" stored="true"/>
-
-
-  <field name="copyfield_source" type="string" indexed="true" stored="true" multiValued="true"/>
-
-
-  <dynamicField name="*_coordinate" type="tdouble" indexed="true" stored="false"/>
-
-  <dynamicField name="*_sI" type="string" indexed="true" stored="false"/>
-  <dynamicField name="*_sS" type="string" indexed="false" stored="true"/>
-  <dynamicField name="t_*" type="text" indexed="true" stored="true"/>
-  <dynamicField name="tv_*" type="text" indexed="true" stored="true"
-                termVectors="true" termPositions="true" termOffsets="true"/>
-  <dynamicField name="tv_mv_*" type="text" indexed="true" stored="true" multiValued="true"
-                termVectors="true" termPositions="true" termOffsets="true"/>
-
-  <dynamicField name="*_mfacet" type="string" indexed="true" stored="false" multiValued="true"/>
-
-  <dynamicField name="*_sw" type="text_sw" indexed="true" stored="true" multiValued="true"/>
-
-  <dynamicField name="*_i" type="int" indexed="true" stored="true"/>
-  <dynamicField name="*_is" type="int" indexed="true" stored="true" multiValued="true"/>
-  <dynamicField name="*_s1" type="string" indexed="true" stored="true" multiValued="false"/>
-  <!-- :TODO: why are these identical?!?!?! -->
-  <dynamicField name="*_s" type="string" indexed="true" stored="true" multiValued="true"/>
-  <dynamicField name="*_ss" type="string" indexed="true" stored="true" multiValued="true"/>
-  <dynamicField name="*_l" type="long" indexed="true" stored="true"/>
-  <dynamicField name="*_t" type="text" indexed="true" stored="true"/>
-  <dynamicField name="*_tt" type="text" indexed="true" stored="true"/>
-  <dynamicField name="*_b" type="boolean" indexed="true" stored="true"/>
-  <dynamicField name="*_f" type="float" indexed="true" stored="true"/>
-  <dynamicField name="*_d" type="double" indexed="true" stored="true"/>
-  <dynamicField name="*_dt" type="date" indexed="true" stored="true"/>
-
-  <!-- some trie-coded dynamic fields for faster range queries -->
-  <dynamicField name="*_ti" type="tint" indexed="true" stored="true"/>
-  <dynamicField name="*_tl" type="tlong" indexed="true" stored="true"/>
-  <dynamicField name="*_tf" type="tfloat" indexed="true" stored="true"/>
-  <dynamicField name="*_td" type="tdouble" indexed="true" stored="true"/>
-  <dynamicField name="*_tdt" type="tdate" indexed="true" stored="true"/>
-
-  <dynamicField name="ignored_*" type="ignored" multiValued="true"/>
-  <dynamicField name="attr_*" type="text" indexed="true" stored="true" multiValued="true"/>
-
-  <dynamicField name="random_*" type="random"/>
-
-
-  <uniqueKey>id</uniqueKey>
-
-  <copyField source="*" dest="text"/>
-</schema>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/370adaa6/solr/core/src/test-files/solr/collection1/conf/solrconfig-lazywriter.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-lazywriter.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-lazywriter.xml
deleted file mode 100644
index 0cba7df..0000000
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-lazywriter.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" ?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- a basic solrconfig that tests can use when they want simple minimal solrconfig/schema
-     DO NOT ADD THINGS TO THIS CONFIG! -->
-<config>
-  <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
-  <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
-  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
-  <schemaFactory class="ClassicIndexSchemaFactory"/>
-  <queryResponseWriter name="velocity" class="solr.VelocityResponseWriter" startup="lazy"/>
-</config>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/370adaa6/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog-with-delayingcomponent.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog-with-delayingcomponent.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog-with-delayingcomponent.xml
deleted file mode 100644
index 4083975..0000000
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog-with-delayingcomponent.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" ?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<config>
-  <jmx />
-
-  <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
-
-  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}">
-    <!-- used to keep RAM reqs down for HdfsDirectoryFactory -->
-    <bool name="solr.hdfs.blockcache.enabled">${solr.hdfs.blockcache.enabled:true}</bool>
-    <int name="solr.hdfs.blockcache.blocksperbank">${solr.hdfs.blockcache.blocksperbank:1024}</int>
-    <str name="solr.hdfs.home">${solr.hdfs.home:}</str>
-    <str name="solr.hdfs.confdir">${solr.hdfs.confdir:}</str>
-    <str name="solr.hdfs.blockcache.global">${solr.hdfs.blockcache.global:true}</str>
-  </directoryFactory>
-  <schemaFactory class="ClassicIndexSchemaFactory"/>
-
-  <dataDir>${solr.data.dir:}</dataDir>
-
-  <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-
-  <!-- an update processor the explicitly excludes distrib to test
-       clean errors when people attempt atomic updates w/o it
-  -->
-  <updateRequestProcessorChain name="nodistrib" >
-    <processor class="solr.NoOpDistributingUpdateProcessorFactory" />
-    <processor class="solr.RunUpdateProcessorFactory" />
-  </updateRequestProcessorChain>
-
-  <requestHandler name="standard" class="solr.StandardRequestHandler">
-  </requestHandler>
-
-  <updateHandler class="solr.DirectUpdateHandler2">
-    <updateLog>
-      <str name="dir">${solr.ulog.dir:}</str>
-    </updateLog>
-  </updateHandler>
-
-  <updateRequestProcessorChain name="dedupe">
-    <processor class="org.apache.solr.update.processor.SignatureUpdateProcessorFactory">
-      <bool name="enabled">true</bool>
-      <bool name="overwriteDupes">true</bool>
-      <str name="fields">v_t,t_field</str>
-      <str name="signatureClass">org.apache.solr.update.processor.TextProfileSignature</str>
-    </processor>
-    <processor class="solr.RunUpdateProcessorFactory" />
-  </updateRequestProcessorChain>
-  <updateRequestProcessorChain name="stored_sig">
-    <!-- this chain is valid even though the signature field is not
-         indexed, because we are not asking for dups to be overwritten
-      -->
-    <processor class="org.apache.solr.update.processor.SignatureUpdateProcessorFactory">
-      <bool name="enabled">true</bool>
-      <str name="signatureField">non_indexed_signature_sS</str>
-      <bool name="overwriteDupes">false</bool>
-      <str name="fields">v_t,t_field</str>
-      <str name="signatureClass">org.apache.solr.update.processor.TextProfileSignature</str>
-    </processor>
-    <processor class="solr.RunUpdateProcessorFactory" />
-  </updateRequestProcessorChain>
-
-  <updateRequestProcessorChain name="distrib-dup-test-chain-explicit">
-    <!-- explicit test using processors before and after distrib -->
-    <processor class="solr.RegexReplaceProcessorFactory">
-      <str name="fieldName">regex_dup_A_s</str>
-      <str name="pattern">x</str>
-      <str name="replacement">x_x</str>
-    </processor>
-    <processor class="solr.DistributedUpdateProcessorFactory" />
-    <processor class="solr.RegexReplaceProcessorFactory">
-      <str name="fieldName">regex_dup_B_s</str>
-      <str name="pattern">x</str>
-      <str name="replacement">x_x</str>
-    </processor>
-    <processor class="solr.RunUpdateProcessorFactory" />
-  </updateRequestProcessorChain>
-
-  <updateRequestProcessorChain name="distrib-dup-test-chain-implicit">
-    <!-- implicit test w/o distrib declared-->
-    <processor class="solr.RegexReplaceProcessorFactory">
-      <str name="fieldName">regex_dup_A_s</str>
-      <str name="pattern">x</str>
-      <str name="replacement">x_x</str>
-    </processor>
-    <processor class="solr.RegexReplaceProcessorFactory">
-      <str name="fieldName">regex_dup_B_s</str>
-      <str name="pattern">x</str>
-      <str name="replacement">x_x</str>
-    </processor>
-    <processor class="solr.RunUpdateProcessorFactory" />
-  </updateRequestProcessorChain>
-
-  <searchComponent name="delayingSearchComponent"
-                   class="org.apache.solr.search.DelayingSearchComponent"/>
-
-  <requestHandler name="/select" class="solr.SearchHandler">
-    <arr name="first-components">
-      <str>delayingSearchComponent</str>
-    </arr>
-  </requestHandler>
-  <initParams path="standard,/select">
-    <lst name="defaults">
-      <str name="df">text</str>
-    </lst>
-  </initParams>
-
-</config>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/370adaa6/solr/core/src/test-files/solr/solr-multicore.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/solr-multicore.xml b/solr/core/src/test-files/solr/solr-multicore.xml
deleted file mode 100644
index e69de29..0000000