apache · epugh · Aug 10, 2022 · Aug 9, 2022 · Aug 9, 2022 · Aug 9, 2022
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
@@ -147,6 +147,8 @@ Other Changes
 
 * SOLR-16304: No more @Slow annotation for tests! (Mike Drob)
 
+* SOLR-16331: Migrate remaining managed-schema files to be managed-schema.xml.  (Eric Pugh)
+
 Build
 ---------------------
 * SOLR-16204: Change Lucene dependency to Lucene 9.1.0 (Elia Porciani via Alessandro Benedetti)

diff --git a/.../core/src/test-files/solr/collection1/conf/bad-solrconfig-unexpected-schema-attribute.xml b/.../core/src/test-files/solr/collection1/conf/bad-solrconfig-unexpected-schema-attribute.xml
@@ -24,7 +24,7 @@
   <!-- The presence of bogusParam should trigger failure -->
   <schemaFactory class="ManagedIndexSchemaFactory">
     <bool name="mutable">false</bool>
-    <str name="managedSchemaResourceName">managed-schema</str>
+    <str name="managedSchemaResourceName">managed-schema.xml</str>
     <str name="bogusParam">bogusValue</str>
   </schemaFactory>
 

diff --git a/...test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml b/...test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml
@@ -18,7 +18,7 @@
 -->
 
 <!--
-   Test Config that enumerates many different parsing update processor chain 
+   Test Config that enumerates many different parsing update processor chain
    configurations.
   -->
 <config>
@@ -28,7 +28,7 @@
 
   <schemaFactory class="ManagedIndexSchemaFactory">
     <bool name="mutable">true</bool>
-    <str name="managedSchemaResourceName">managed-schema</str>
+    <str name="managedSchemaResourceName">managed-schema.xml</str>
   </schemaFactory>
 
   <updateRequestProcessorChain name="add-fields-no-run-processor">
@@ -128,7 +128,7 @@
     <processor class="solr.DistributedUpdateProcessorFactory" />
     <processor class="solr.RunUpdateProcessorFactory" />
   </updateRequestProcessorChain>
-  
+
   <!-- This chain has one of the typeMappings set as default=true, instead of falling back to the defaultFieldType -->
   <updateRequestProcessorChain name="add-fields-default-mapping">
     <processor class="solr.AddSchemaFieldsUpdateProcessorFactory">

diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml
@@ -24,7 +24,7 @@
   <!-- This is intentionally commented out, see SOLR-8131 -->
   <!--<schemaFactory class="ManagedIndexSchemaFactory">-->
     <!--<bool name="mutable">${managed.schema.mutable}</bool>-->
-    <!--<str name="managedSchemaResourceName">managed-schema</str>-->
+    <!--<str name="managedSchemaResourceName">managed-schema.xml</str>-->
   <!--</schemaFactory>-->
 
   <codecFactory class="solr.SchemaCodecFactory"/>
@@ -38,7 +38,7 @@
   <requestDispatcher>
     <requestParsers enableStreamBody="true" />
   </requestDispatcher>
-  
+
   <requestHandler name="/select" class="solr.SearchHandler">
     <bool name="httpCaching">true</bool>
   </requestHandler>
@@ -70,7 +70,7 @@
         <str>EEE MMM ppd HH:mm:ss [z ]yyyy</str>
       </arr>
     </processor>
-     
+
     <processor class="solr.AddSchemaFieldsUpdateProcessorFactory">
       <str name="defaultFieldType">text</str>
       <lst name="typeMapping">

diff --git a/...ud-managed-autocommit/conf/managed-schema → ...anaged-autocommit/conf/managed-schema.xml b/...ud-managed-autocommit/conf/managed-schema → ...anaged-autocommit/conf/managed-schema.xml
diff --git a/solr/core/src/test-files/solr/configsets/cloud-managed-autocommit/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/cloud-managed-autocommit/conf/solrconfig.xml
@@ -28,7 +28,7 @@
 
   <schemaFactory class="ManagedIndexSchemaFactory">
     <bool name="mutable">${managed.schema.mutable}</bool>
-    <str name="managedSchemaResourceName">managed-schema</str>
+    <str name="managedSchemaResourceName">managed-schema.xml</str>
   </schemaFactory>
 
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
@@ -57,4 +57,4 @@
     </lst>
 
   </requestHandler>
-</config>
+</config>
diff --git a/...d-managed-preanalyzed/conf/managed-schema → ...naged-preanalyzed/conf/managed-schema.xml b/...d-managed-preanalyzed/conf/managed-schema → ...naged-preanalyzed/conf/managed-schema.xml
diff --git a/solr/core/src/test-files/solr/configsets/cloud-managed-preanalyzed/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/cloud-managed-preanalyzed/conf/solrconfig.xml
@@ -28,7 +28,7 @@
 
   <schemaFactory class="ManagedIndexSchemaFactory">
     <bool name="mutable">${managed.schema.mutable:true}</bool>
-    <str name="managedSchemaResourceName">managed-schema</str>
+    <str name="managedSchemaResourceName">managed-schema.xml</str>
   </schemaFactory>
 
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>

diff --git a/...figsets/cloud-managed/conf/managed-schema → ...ets/cloud-managed/conf/managed-schema.xml b/...figsets/cloud-managed/conf/managed-schema → ...ets/cloud-managed/conf/managed-schema.xml
diff --git a/solr/core/src/test-files/solr/configsets/cloud-managed/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/cloud-managed/conf/solrconfig.xml
@@ -28,7 +28,7 @@
 
   <schemaFactory class="ManagedIndexSchemaFactory">
     <bool name="mutable">${managed.schema.mutable}</bool>
-    <str name="managedSchemaResourceName">managed-schema</str>
+    <str name="managedSchemaResourceName">managed-schema.xml</str>
   </schemaFactory>
 
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>

diff --git a/solr/core/src/test-files/solr/configsets/upload/legacy-managed-schema/managed-schema b/solr/core/src/test-files/solr/configsets/upload/legacy-managed-schema/managed-schema
@@ -15,6 +15,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
+
+<!-- This file should be called managed-schema.xml, but leaving it here to prove
+that we still are backwards compatible with this format.  -->
 <schema name="minimal" version="1.1">
  <types>
   <fieldType name="string" class="solr.StrField"/>

diff --git a/solr/core/src/test/org/apache/solr/handler/admin/ShowFileRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/ShowFileRequestHandlerTest.java
@@ -89,7 +89,7 @@ public void testGetRawFile() throws SolrServerException, IOException {
     SolrClient client = getSolrClient();
     // assertQ(req("qt", "/admin/file"));
     // TODO file bug that SolrJettyTestBase extends SolrTestCaseJ4
-    QueryRequest request = new QueryRequest(params("file", "managed-schema"));
+    QueryRequest request = new QueryRequest(params("file", "managed-schema.xml"));
     request.setPath("/admin/file");
     final AtomicBoolean readFile = new AtomicBoolean();
     request.setResponseParser(

diff --git a/...iles/solr/collection1/conf/managed-schema → .../solr/collection1/conf/managed-schema.xml b/...iles/solr/collection1/conf/managed-schema → .../solr/collection1/conf/managed-schema.xml
@@ -267,10 +267,10 @@
 
     <!-- A general text field that has reasonable, generic
          cross-language defaults: it tokenizes with StandardTokenizer,
-	       removes stop words from case-insensitive "stopwords.txt"
-	       (empty by default), and down cases.  At query time only, it
-	       also applies synonyms.
-	  -->
+         removes stop words from case-insensitive "stopwords.txt"
+         (empty by default), and down cases.  At query time only, it
+         also applies synonyms.
+    -->
     <fieldType name="text_general" class="solr.TextField" positionIncrementGap="100" multiValued="true">
       <analyzer type="index">
         <tokenizer class="solr.StandardTokenizerFactory"/>
@@ -290,7 +290,7 @@
     </fieldType>
 
     <!-- Just like text_general except it reverses the characters of
-	       each token, to enable more efficient leading wildcard queries.
+         each token, to enable more efficient leading wildcard queries.
     -->
     <dynamicField name="*_txt_rev" type="text_general_rev"  indexed="true"  stored="true"/>
     <fieldType name="text_general_rev" class="solr.TextField" positionIncrementGap="100">

diff --git a/..._techproducts_configs/conf/managed-schema → ...hproducts_configs/conf/managed-schema.xml b/..._techproducts_configs/conf/managed-schema → ...hproducts_configs/conf/managed-schema.xml
diff --git a/solr/solrj/src/test-files/solrj/solr/multicore/core0/conf/solrconfig.xml b/solr/solrj/src/test-files/solrj/solr/multicore/core0/conf/solrconfig.xml
@@ -33,7 +33,7 @@
 
        <schemaFactory class="ManagedIndexSchemaFactory">
          <bool name="mutable">true</bool>
-         <str name="managedSchemaResourceName">managed-schema</str>
+         <str name="managedSchemaResourceName">managed-schema.xml</str>
        </schemaFactory>
 
        When ManagedIndexSchemaFactory is specified, Solr will load the schema from

diff --git a/solr/solrj/src/test-files/solrj/solr/multicore/core1/conf/solrconfig.xml b/solr/solrj/src/test-files/solrj/solr/multicore/core1/conf/solrconfig.xml
@@ -33,7 +33,7 @@
 
        <schemaFactory class="ManagedIndexSchemaFactory">
          <bool name="mutable">true</bool>
-         <str name="managedSchemaResourceName">managed-schema</str>
+         <str name="managedSchemaResourceName">managed-schema.xml</str>
        </schemaFactory>
 
        When ManagedIndexSchemaFactory is specified, Solr will load the schema from
-Original file line number
+Diff line change
@@ Expand Up / @@ -147,6 +147,8 @@ Other Changes @@
     * SOLR-16304: No more @Slow annotation for tests! (Mike Drob)
+    * SOLR-16331: Migrate remaining managed-schema files to be managed-schema.xml.  (Eric Pugh)
     Build
     ---------------------
     * SOLR-16204: Change Lucene dependency to Lucene 9.1.0 (Elia Porciani via Alessandro Benedetti)
@@ Expand Down @@