You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by va...@apache.org on 2015/12/07 08:32:44 UTC

svn commit: r1718258 [1/2] - in /lucene/dev/trunk/solr: ./ contrib/analytics/src/test-files/solr/collection1/conf/ core/src/java/org/apache/solr/schema/ core/src/test-files/solr/ core/src/test-files/solr/collection1/conf/ core/src/test-files/solr/confi...

Author: varun
Date: Mon Dec  7 07:32:41 2015
New Revision: 1718258

URL: http://svn.apache.org/viewvc?rev=1718258&view=rev
Log:
SOLR-8131: Make ManagedIndexSchemaFactory the default schemaFactory when luceneMatchVersion >= 6

Added:
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema-test.xml   (with props)
Modified:
    lucene/dev/trunk/solr/CHANGES.txt
    lucene/dev/trunk/solr/contrib/analytics/src/test-files/solr/collection1/conf/solrconfig-basic.xml
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/IndexSchemaFactory.java
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-error-solrconfig.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-mp-solrconfig.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-bogus-scriptengine-name.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-invalid-scriptfile.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-missing-scriptfile.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-cfs.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-dirfactory.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-indexconfigs.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-nrtmode.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad_solrconfig.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-SOLR-749.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-altdirectory.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-caching.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-cdcr.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-cdcrupdatelog.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-deeppaging.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-delaying-component.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-doc-expire-update-processor.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-doctransformers.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-functionquery.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-hash.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-headers.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-highlight.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-indexconfig.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-infostream-logging.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-lazywriter.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-logmergepolicy.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master-throttled.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-defaults.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-legacy.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-nocfs.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-noopregen.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-paramset.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-postingshighlight.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-query-parser-init.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-script-updateprocessor.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-searcher-listeners1.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-solcoreproperties.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingresponse.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-spatial.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellchecker.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-sql.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent-context-filter-query.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicy.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog-with-delayingcomponent.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-tolerant-search.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-transformers.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-warmer.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-withgethandler.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-xinclude.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/configsets/bad-mergepolicy/conf/solrconfig.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/configsets/configset-1/conf/solrconfig-minimal.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/configsets/configset-2/conf/solrconfig.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/configsets/minimal/conf/solrconfig.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/crazy-path-to-config.xml
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/ShowFileRequestHandlerTest.java
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java
    lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/solrconfig.xml
    lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
    lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
    lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
    lucene/dev/trunk/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
    lucene/dev/trunk/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml
    lucene/dev/trunk/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
    lucene/dev/trunk/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
    lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-slave1.xml
    lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-sql.xml
    lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-streaming.xml
    lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig.xml
    lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/configsets/configset-1/conf/solrconfig-minimal.xml
    lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/configsets/configset-2/conf/solrconfig.xml
    lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/solrconfig.xml

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Mon Dec  7 07:32:41 2015
@@ -68,6 +68,10 @@ Upgrading from Solr 5.x
     'defaultSimFromFieldType' configuration option may be used to specify any default of your choosing.
     See SOLR-8261 + SOLR-8329 for more details.
 
+* If your solrconfig.xml file doesn't explicitly mention the schemaFactory to use then Solr will choose
+  the ManagedIndexSchemaFactory by default. This means that the Schema APIs ( /<collection>/schema )
+  are enabled by default and the schema is mutable. The schema file will be called managed-schema.
+
 Detailed Change List
 ----------------------
 
@@ -162,6 +166,9 @@ Other Changes
 
 * SOLR-7339: Upgrade Jetty to v9.3.6.v20151106. (Gregg Donovan, shalin)
 
+* SOLR-8131: Make ManagedIndexSchemaFactory the default schemaFactory when luceneMatchVersion >= 6
+  (Uwe Schindler, shalin, Varun Thacker)
+
 ======================= 5.5.0 =======================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release

Modified: lucene/dev/trunk/solr/contrib/analytics/src/test-files/solr/collection1/conf/solrconfig-basic.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analytics/src/test-files/solr/collection1/conf/solrconfig-basic.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/analytics/src/test-files/solr/collection1/conf/solrconfig-basic.xml (original)
+++ lucene/dev/trunk/solr/contrib/analytics/src/test-files/solr/collection1/conf/solrconfig-basic.xml Mon Dec  7 07:32:41 2015
@@ -22,6 +22,7 @@
   <dataDir>${solr.data.dir:}</dataDir>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <requestHandler name="standard" class="solr.StandardRequestHandler">
     <arr name="components">

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/IndexSchemaFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/IndexSchemaFactory.java?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/IndexSchemaFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/IndexSchemaFactory.java Mon Dec  7 07:32:41 2015
@@ -16,6 +16,7 @@ package org.apache.solr.schema;
  * limitations under the License.
  */
 
+import org.apache.lucene.util.Version;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.SolrException.ErrorCode;
 import org.apache.solr.core.PluginInfo;
@@ -65,7 +66,11 @@ public abstract class IndexSchemaFactory
       factory = config.getResourceLoader().newInstance(info.className, IndexSchemaFactory.class);
       factory.init(info.initArgs);
     } else {
-      factory = new ClassicIndexSchemaFactory();
+      if (config.luceneMatchVersion.onOrAfter(Version.LUCENE_6_0_0)) {
+        factory = new ManagedIndexSchemaFactory();
+      } else {
+        factory = new ClassicIndexSchemaFactory();
+      }
     }
     IndexSchema schema = factory.create(resourceName, config);
     return schema;

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java Mon Dec  7 07:32:41 2015
@@ -51,8 +51,8 @@ public class ManagedIndexSchemaFactory e
   public static final String DEFAULT_MANAGED_SCHEMA_RESOURCE_NAME = "managed-schema";
   public static final String MANAGED_SCHEMA_RESOURCE_NAME = "managedSchemaResourceName";
 
-  private boolean isMutable;
-  private String managedSchemaResourceName;
+  private boolean isMutable = true;
+  private String managedSchemaResourceName = DEFAULT_MANAGED_SCHEMA_RESOURCE_NAME;
   public String getManagedSchemaResourceName() { return managedSchemaResourceName; }
   private SolrConfig config;
   private SolrResourceLoader loader;
@@ -69,7 +69,7 @@ public class ManagedIndexSchemaFactory e
   @Override
   public void init(NamedList args) {
     SolrParams params = SolrParams.toSolrParams(args);
-    isMutable = params.getBool("mutable", false);
+    isMutable = params.getBool("mutable", true);
     args.remove("mutable");
     managedSchemaResourceName = params.get(MANAGED_SCHEMA_RESOURCE_NAME, DEFAULT_MANAGED_SCHEMA_RESOURCE_NAME);
     args.remove(MANAGED_SCHEMA_RESOURCE_NAME);

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-error-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-error-solrconfig.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-error-solrconfig.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-error-solrconfig.xml Mon Dec  7 07:32:41 2015
@@ -25,4 +25,6 @@
 
   <requestHandler name="my_error_handler" class="solr.ThrowErrorOnInitRequestHandler"></requestHandler>
 
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
+
 </config>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-mp-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-mp-solrconfig.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-mp-solrconfig.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-mp-solrconfig.xml Mon Dec  7 07:32:41 2015
@@ -31,4 +31,6 @@
   <updateHandler class="solr.DirectUpdateHandler2"/>
   <requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
 
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
+
 </config>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-bogus-scriptengine-name.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-bogus-scriptengine-name.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-bogus-scriptengine-name.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-bogus-scriptengine-name.xml Mon Dec  7 07:32:41 2015
@@ -29,4 +29,6 @@
     <processor class="solr.RunUpdateProcessorFactory" />
   </updateRequestProcessorChain>
 
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
+
 </config>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-invalid-scriptfile.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-invalid-scriptfile.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-invalid-scriptfile.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-invalid-scriptfile.xml Mon Dec  7 07:32:41 2015
@@ -30,4 +30,6 @@
     <processor class="solr.RunUpdateProcessorFactory" />
   </updateRequestProcessorChain>
 
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
+
 </config>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-missing-scriptfile.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-missing-scriptfile.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-missing-scriptfile.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-missing-scriptfile.xml Mon Dec  7 07:32:41 2015
@@ -28,4 +28,6 @@
     <processor class="solr.RunUpdateProcessorFactory" />
   </updateRequestProcessorChain>
 
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
+
 </config>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-cfs.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-cfs.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-cfs.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-cfs.xml Mon Dec  7 07:32:41 2015
@@ -27,4 +27,6 @@
     <useCompoundFile>false</useCompoundFile>
   </indexConfig>
 
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
+
 </config>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-dirfactory.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-dirfactory.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-dirfactory.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-dirfactory.xml Mon Dec  7 07:32:41 2015
@@ -29,6 +29,6 @@
   <directoryFactory name="DirectoryFactory" class="NRTCachingDirectoryFactory"/>
   <!-- END: BAD -->
 
-
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
 
 </config>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-indexconfigs.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-indexconfigs.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-indexconfigs.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-indexconfigs.xml Mon Dec  7 07:32:41 2015
@@ -30,4 +30,6 @@
   </indexConfig>
   <!-- END BAD -->
 
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
+
 </config>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-nrtmode.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-nrtmode.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-nrtmode.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-nrtmode.xml Mon Dec  7 07:32:41 2015
@@ -31,5 +31,7 @@
   </indexConfig>
   <!-- END: BAD -->
 
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
+
 
 </config>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad_solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad_solrconfig.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad_solrconfig.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad_solrconfig.xml Mon Dec  7 07:32:41 2015
@@ -21,6 +21,7 @@
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
   <indexConfig>
     <useCompoundFile>${unset.sys.property}</useCompoundFile>
   </indexConfig>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-SOLR-749.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-SOLR-749.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-SOLR-749.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-SOLR-749.xml Mon Dec  7 07:32:41 2015
@@ -21,6 +21,7 @@
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
   <queryParser name="foo" class="FooQParserPlugin"/>
   <!-- override the default "lucene" qparser -->
   <queryParser name="lucene" class="org.apache.solr.search.FooQParserPlugin"/>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-altdirectory.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-altdirectory.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-altdirectory.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-altdirectory.xml Mon Dec  7 07:32:41 2015
@@ -23,4 +23,5 @@
   <requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
   <directoryFactory name="DirectoryFactory" class="org.apache.solr.core.AlternateDirectoryTest$TestFSDirectoryFactory"></directoryFactory>
   <indexReaderFactory name="IndexReaderFactory" class="org.apache.solr.core.AlternateDirectoryTest$TestIndexReaderFactory"></indexReaderFactory >
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
 </config>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml Mon Dec  7 07:32:41 2015
@@ -47,6 +47,8 @@
     <double name="maxWriteMBPerSecRead">4000000</double>
   </directoryFactory>
 
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
+
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
 
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml Mon Dec  7 07:32:41 2015
@@ -24,5 +24,6 @@
   <dataDir>${solr.data.dir:}</dataDir>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
   <requestHandler name="standard" class="solr.StandardRequestHandler" />
 </config>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-caching.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-caching.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-caching.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-caching.xml Mon Dec  7 07:32:41 2015
@@ -18,6 +18,7 @@
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
   <query>
     <cache name="lfuCacheDecayFalse"
            class="solr.search.LFUCache"

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-cdcr.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-cdcr.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-cdcr.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-cdcr.xml Mon Dec  7 07:32:41 2015
@@ -31,6 +31,8 @@
     <str name="solr.hdfs.blockcache.global">${solr.hdfs.blockcache.global:false}</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"/>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-cdcrupdatelog.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-cdcrupdatelog.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-cdcrupdatelog.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-cdcrupdatelog.xml Mon Dec  7 07:32:41 2015
@@ -31,6 +31,8 @@
     <str name="solr.hdfs.blockcache.global">${solr.hdfs.blockcache.global:false}</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"/>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml Mon Dec  7 07:32:41 2015
@@ -47,6 +47,8 @@
     <double name="maxWriteMBPerSecRead">4000000</double>
   </directoryFactory>
 
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
+
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
 
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml Mon Dec  7 07:32:41 2015
@@ -33,6 +33,8 @@
         solr.RAMDirectoryFactory is memory based and not persistent. -->
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
 
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
+
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
 
   <updateHandler class="solr.DirectUpdateHandler2"></updateHandler>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-deeppaging.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-deeppaging.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-deeppaging.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-deeppaging.xml Mon Dec  7 07:32:41 2015
@@ -24,6 +24,8 @@
   <directoryFactory name="DirectoryFactory"
                     class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>
 
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
+
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
 
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-delaying-component.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-delaying-component.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-delaying-component.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-delaying-component.xml Mon Dec  7 07:32:41 2015
@@ -22,6 +22,8 @@
   <dataDir>${solr.data.dir:}</dataDir>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
   
   <searchComponent name="delayingSearchComponent" 
                    class="org.apache.solr.search.DelayingSearchComponent"/>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml Mon Dec  7 07:32:41 2015
@@ -20,6 +20,7 @@
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <updateHandler class="solr.DirectUpdateHandler2"/>
   <requestHandler name="standard" class="solr.StandardRequestHandler"/>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml Mon Dec  7 07:32:41 2015
@@ -20,6 +20,7 @@
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
   <indexConfig>
 
     <!-- we can't include solrconfig.snippet.randomindexconfig.xml because we need

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-doc-expire-update-processor.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-doc-expire-update-processor.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-doc-expire-update-processor.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-doc-expire-update-processor.xml Mon Dec  7 07:32:41 2015
@@ -27,6 +27,7 @@
 
   <directoryFactory name="DirectoryFactory"
                     class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
 

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-doctransformers.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-doctransformers.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-doctransformers.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-doctransformers.xml Mon Dec  7 07:32:41 2015
@@ -27,6 +27,7 @@
   </indexConfig>
   <dataDir>${solr.data.dir:}</dataDir>
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <updateHandler class="solr.DirectUpdateHandler2">
     <updateLog>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml Mon Dec  7 07:32:41 2015
@@ -30,6 +30,7 @@
         solr.StandardDirectoryFactory, the default, is filesystem based.
         solr.RAMDirectoryFactory is memory based and not persistent. -->
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-functionquery.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-functionquery.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-functionquery.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-functionquery.xml Mon Dec  7 07:32:41 2015
@@ -26,6 +26,7 @@
         solr.StandardDirectoryFactory, the default, is filesystem based.
         solr.RAMDirectoryFactory is memory based and not persistent. -->
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <requestHandler name="standard" class="solr.StandardRequestHandler"/>
 

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-hash.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-hash.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-hash.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-hash.xml Mon Dec  7 07:32:41 2015
@@ -27,6 +27,7 @@
   </indexConfig>
   <dataDir>${solr.data.dir:}</dataDir>
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <updateHandler class="solr.DirectUpdateHandler2">
     <updateLog>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-headers.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-headers.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-headers.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-headers.xml Mon Dec  7 07:32:41 2015
@@ -22,6 +22,7 @@
   <dataDir>${solr.data.dir:}</dataDir>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
   <searchComponent name="componentThatAddsHeader" class="org.apache.solr.servlet.ResponseHeaderTest$ComponentThatAddsHeader"/>
   <requestHandler name="/withHeaders" class="solr.StandardRequestHandler">
     <arr name="first-components">

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-highlight.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-highlight.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-highlight.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-highlight.xml Mon Dec  7 07:32:41 2015
@@ -26,6 +26,7 @@
         solr.StandardDirectoryFactory, the default, is filesystem based.
         solr.RAMDirectoryFactory is memory based and not persistent. -->
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <updateHandler class="solr.DirectUpdateHandler2">
   </updateHandler>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml Mon Dec  7 07:32:41 2015
@@ -27,6 +27,7 @@
 
   <directoryFactory name="DirectoryFactory"
                     class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <xi:include href="./solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-indexconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-indexconfig.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-indexconfig.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-indexconfig.xml Mon Dec  7 07:32:41 2015
@@ -26,4 +26,6 @@
     <infoStream>true</infoStream>
     <mergePolicy class="org.apache.solr.util.RandomMergePolicy" />
   </indexConfig>
+
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
 </config>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-infostream-logging.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-infostream-logging.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-infostream-logging.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-infostream-logging.xml Mon Dec  7 07:32:41 2015
@@ -24,4 +24,6 @@
   <indexConfig>
     <infoStream>true</infoStream>
   </indexConfig>
+
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
 </config>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-lazywriter.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-lazywriter.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-lazywriter.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-lazywriter.xml Mon Dec  7 07:32:41 2015
@@ -24,5 +24,6 @@
   <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>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-logmergepolicy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-logmergepolicy.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-logmergepolicy.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-logmergepolicy.xml Mon Dec  7 07:32:41 2015
@@ -20,7 +20,7 @@
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
-
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
   <indexConfig>
     <!-- set some values to -1 to force the use of internal lucene defaults -->
     <maxBufferedDocs>-1</maxBufferedDocs>

Added: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema-test.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema-test.xml?rev=1718258&view=auto
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema-test.xml (added)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema-test.xml Mon Dec  7 07:32:41 2015
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ 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 when no schema factory is defined then ManagedSchemaFactory will be the default.
+     DO NOT ADD THINGS TO THIS CONFIG! -->
+<config>
+  <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
+  <dataDir>${solr.data.dir:}</dataDir>
+  <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <requestHandler name="standard" class="solr.StandardRequestHandler" />
+</config>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master-throttled.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master-throttled.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master-throttled.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master-throttled.xml Mon Dec  7 07:32:41 2015
@@ -21,6 +21,7 @@
   <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
   <dataDir>${solr.data.dir:}</dataDir>
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml Mon Dec  7 07:32:41 2015
@@ -20,6 +20,7 @@
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>  
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
   <dataDir>${solr.data.dir:}</dataDir>
 
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml Mon Dec  7 07:32:41 2015
@@ -20,6 +20,7 @@
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <dataDir>${solr.data.dir:}</dataDir>
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml Mon Dec  7 07:32:41 2015
@@ -21,6 +21,7 @@
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <dataDir>${solr.data.dir:}</dataDir>
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml Mon Dec  7 07:32:41 2015
@@ -21,7 +21,7 @@
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <dataDir>${solr.data.dir:}</dataDir>
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
-
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
   <updateHandler class="solr.DirectUpdateHandler2">

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml Mon Dec  7 07:32:41 2015
@@ -21,7 +21,7 @@
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <dataDir>${solr.data.dir:}</dataDir>
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
-
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
   <updateHandler class="solr.DirectUpdateHandler2">

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-defaults.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-defaults.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-defaults.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-defaults.xml Mon Dec  7 07:32:41 2015
@@ -20,6 +20,7 @@
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <indexConfig>
     <!-- do not put any merge policy, merge factor 

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-legacy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-legacy.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-legacy.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-legacy.xml Mon Dec  7 07:32:41 2015
@@ -20,6 +20,7 @@
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <indexConfig>
     <mergeFactor>7</mergeFactor>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-nocfs.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-nocfs.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-nocfs.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-nocfs.xml Mon Dec  7 07:32:41 2015
@@ -20,6 +20,7 @@
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <indexConfig>
     <useCompoundFile>${testSetNoCFSMergePolicyConfig.useCompoundFile:false}</useCompoundFile>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml Mon Dec  7 07:32:41 2015
@@ -34,6 +34,7 @@
 
   <directoryFactory name="DirectoryFactory"
                     class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
 

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml Mon Dec  7 07:32:41 2015
@@ -25,6 +25,7 @@
         solr.StandardDirectoryFactory, the default, is filesystem based.
         solr.RAMDirectoryFactory is memory based and not persistent. -->
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <dataDir>${solr.data.dir:}</dataDir>
 

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-noopregen.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-noopregen.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-noopregen.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-noopregen.xml Mon Dec  7 07:32:41 2015
@@ -23,6 +23,7 @@
   <dataDir>${solr.data.dir:}</dataDir>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
   <requestHandler name="standard" class="solr.StandardRequestHandler" />
   <query>
     <cache name="myPerSegmentCache" 

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-paramset.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-paramset.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-paramset.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-paramset.xml Mon Dec  7 07:32:41 2015
@@ -24,6 +24,7 @@
   <dataDir>${solr.data.dir:}</dataDir>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
   <requestHandler name="standard" class="solr.StandardRequestHandler"/>
   <initParams name="a" path="/dump3,/dump6,/root/*,/root1/**">
     <lst name="defaults">

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml Mon Dec  7 07:32:41 2015
@@ -25,6 +25,7 @@
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <updateRequestProcessorChain name="parse-date">
     <processor class="solr.ParseDateFieldUpdateProcessorFactory">

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml Mon Dec  7 07:32:41 2015
@@ -23,6 +23,7 @@
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <dataDir>${solr.data.dir:}</dataDir>
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
   <requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
   
   <!-- WFSTLookup suggest component -->

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml Mon Dec  7 07:32:41 2015
@@ -46,6 +46,7 @@
     <double name="maxWriteMBPerSecMerge">3000000</double>
     <double name="maxWriteMBPerSecRead">4000000</double>
   </directoryFactory>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
 

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-postingshighlight.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-postingshighlight.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-postingshighlight.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-postingshighlight.xml Mon Dec  7 07:32:41 2015
@@ -23,6 +23,7 @@
   <dataDir>${solr.data.dir:}</dataDir>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
   <requestHandler name="standard" class="solr.StandardRequestHandler">
     <lst name="defaults">
       <bool name="hl.defaultSummary">false</bool>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-query-parser-init.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-query-parser-init.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-query-parser-init.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-query-parser-init.xml Mon Dec  7 07:32:41 2015
@@ -25,6 +25,7 @@
   <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"/>
   <!-- query parser without final NAME field lead to NPE during query parser initialization-->
   <queryParser name="fail" class="solr.search.LuceneQParserPlugin"/>
 

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml Mon Dec  7 07:32:41 2015
@@ -24,6 +24,7 @@
         solr.StandardDirectoryFactory, the default, is filesystem based.
         solr.RAMDirectoryFactory is memory based and not persistent. -->
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
   
   <updateHandler class="solr.DirectUpdateHandler2">
     <listener event="postCommit" 

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml Mon Dec  7 07:32:41 2015
@@ -24,6 +24,7 @@
         solr.StandardDirectoryFactory, the default, is filesystem based.
         solr.RAMDirectoryFactory is memory based and not persistent. -->
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
   
   <updateHandler class="solr.DirectUpdateHandler2">
     <listener event="postCommit" 

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml Mon Dec  7 07:32:41 2015
@@ -20,6 +20,7 @@
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
   <dataDir>${solr.data.dir:}</dataDir>
 
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml Mon Dec  7 07:32:41 2015
@@ -32,6 +32,7 @@
         solr.StandardDirectoryFactory, the default, is filesystem based.
         solr.RAMDirectoryFactory is memory based and not persistent. -->
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <searchComponent name="responselog" class="org.apache.solr.handler.component.ResponseLogComponent" />
 

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-script-updateprocessor.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-script-updateprocessor.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-script-updateprocessor.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-script-updateprocessor.xml Mon Dec  7 07:32:41 2015
@@ -26,6 +26,7 @@
   <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"/>
 
   <updateRequestProcessorChain name="force-script-engine" default="true">
     <processor class="solr.StatelessScriptUpdateProcessorFactory">

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-searcher-listeners1.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-searcher-listeners1.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-searcher-listeners1.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-searcher-listeners1.xml Mon Dec  7 07:32:41 2015
@@ -32,6 +32,8 @@
 
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
 
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
+
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
 
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml Mon Dec  7 07:32:41 2015
@@ -20,6 +20,7 @@
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
   <dataDir>${solr.data.dir:}</dataDir>
 
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
@@ -41,11 +42,11 @@
   </requestHandler>
 
   <requestHandler name="/replication" class="solr.ReplicationHandler">
-  <lst name="slave">
-    <str name="masterUrl">http://127.0.0.1:TEST_PORT/solr/collection1</str>
-    <str name="pollInterval">00:00:01</str>
-        <str name="compression">COMPRESSION</str>
-     </lst>
+    <lst name="slave">
+      <str name="masterUrl">http://127.0.0.1:TEST_PORT/solr/collection1</str>
+      <str name="pollInterval">00:00:01</str>
+      <str name="compression">COMPRESSION</str>
+    </lst>
   </requestHandler>
 
   <!-- enable streaming for testing... -->

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml Mon Dec  7 07:32:41 2015
@@ -21,6 +21,7 @@
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <dataDir>${solr.data.dir:}</dataDir>
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-solcoreproperties.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-solcoreproperties.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-solcoreproperties.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-solcoreproperties.xml Mon Dec  7 07:32:41 2015
@@ -22,6 +22,7 @@
   <dataDir>${solr.data.dir:}</dataDir>
 
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingresponse.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingresponse.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingresponse.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingresponse.xml Mon Dec  7 07:32:41 2015
@@ -24,6 +24,7 @@
   <dataDir>${solr.data.dir:}</dataDir>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
   <requestHandler name="standard" class="solr.StandardRequestHandler" />
 
   <requestHandler name="/export" class="solr.SearchHandler">

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-spatial.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-spatial.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-spatial.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-spatial.xml Mon Dec  7 07:32:41 2015
@@ -23,6 +23,7 @@
   <dataDir>${solr.data.dir:}</dataDir>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
   <requestHandler name="standard" class="solr.StandardRequestHandler" />
   <query>
     <cache name="perSegSpatialFieldCache_srptgeom"

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml Mon Dec  7 07:32:41 2015
@@ -32,6 +32,7 @@
         solr.StandardDirectoryFactory, the default, is filesystem based.
         solr.RAMDirectoryFactory is memory based and not persistent. -->
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <searchComponent name="spellcheck" class="org.apache.solr.handler.component.SpellCheckComponent">
     <!-- This is slightly different from the field value so we can test dealing with token offset changes -->

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellchecker.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellchecker.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellchecker.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellchecker.xml Mon Dec  7 07:32:41 2015
@@ -22,6 +22,7 @@
         solr.StandardDirectoryFactory, the default, is filesystem based.
         solr.RAMDirectoryFactory is memory based and not persistent. -->
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
 

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-sql.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-sql.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-sql.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-sql.xml Mon Dec  7 07:32:41 2015
@@ -27,6 +27,7 @@
   </indexConfig>
   <dataDir>${solr.data.dir:}</dataDir>
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <updateHandler class="solr.DirectUpdateHandler2">
     <updateLog>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent-context-filter-query.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent-context-filter-query.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent-context-filter-query.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent-context-filter-query.xml Mon Dec  7 07:32:41 2015
@@ -23,6 +23,7 @@
         solr.RAMDirectoryFactory is memory based and not persistent. -->
   <dataDir>${solr.data.dir:}</dataDir>
   <directoryFactory name="DirectoryFactory" class="solr.NRTCachingDirectoryFactory"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <updateHandler class="solr.DirectUpdateHandler2"/>
 

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent.xml Mon Dec  7 07:32:41 2015
@@ -24,6 +24,7 @@
         solr.RAMDirectoryFactory is memory based and not persistent. -->
   <dataDir>${solr.data.dir:}</dataDir>
   <directoryFactory name="DirectoryFactory" class="solr.NRTCachingDirectoryFactory"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <updateHandler class="solr.DirectUpdateHandler2"/>
 

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml Mon Dec  7 07:32:41 2015
@@ -26,6 +26,7 @@
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <!-- see TestConfig.testAutomaticDeprecationSupport -->
   <admin>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicy.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicy.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicy.xml Mon Dec  7 07:32:41 2015
@@ -20,6 +20,7 @@
 <config>
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <indexConfig>
     <mergeFactor>7</mergeFactor>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog-with-delayingcomponent.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog-with-delayingcomponent.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog-with-delayingcomponent.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog-with-delayingcomponent.xml Mon Dec  7 07:32:41 2015
@@ -30,6 +30,7 @@
     <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>
 

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml Mon Dec  7 07:32:41 2015
@@ -30,6 +30,7 @@
     <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>
 

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-tolerant-search.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-tolerant-search.xml?rev=1718258&r1=1718257&r2=1718258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-tolerant-search.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-tolerant-search.xml Mon Dec  7 07:32:41 2015
@@ -25,6 +25,7 @@
 
   <directoryFactory name="DirectoryFactory"
     class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}" />
+  <schemaFactory class="ClassicIndexSchemaFactory"/>
 
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>