This is an automated email from the ASF dual-hosted git repository.
munendrasn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/master by this push:
new cb94eeb SOLR-11266: remove content-type override from _default configSet
cb94eeb is described below
commit cb94eeb4919ff6484f186f534377d9ad9b24c33c
Author: Munendra S N <mu...@apache.org>
AuthorDate: Tue Jul 30 10:06:56 2019 +0530
SOLR-11266: remove content-type override from _default configSet
---
solr/CHANGES.txt | 3 +++
.../solr/configsets/_default/conf/solrconfig.xml | 16 +++++++++-------
solr/server/solr/configsets/_default/conf/solrconfig.xml | 16 +++++++++-------
.../sample_techproducts_configs/conf/solrconfig.xml | 2 ++
4 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 7052f77..135ea91 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -57,6 +57,9 @@ Upgrade Notes
* SOLR-13596: Deprecated GroupingSpecification methods are removed. (Munendra S N)
+* SOLR-11266: default Content-Type override for JSONResponseWriter from _default configSet is removed. Example has been
+ provided in sample_techproducts_configs to override content-type. (Ishan Chattopadhyaya, Munendra S N, Gus Heck)
+
Other Changes
----------------------
diff --git a/solr/core/src/test-files/solr/configsets/_default/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/_default/conf/solrconfig.xml
index 0a932c6..36f54bb 100644
--- a/solr/core/src/test-files/solr/configsets/_default/conf/solrconfig.xml
+++ b/solr/core/src/test-files/solr/configsets/_default/conf/solrconfig.xml
@@ -1291,13 +1291,15 @@
<queryResponseWriter name="schema.xml" class="solr.SchemaXmlResponseWriter"/>
-->
- <queryResponseWriter name="json" class="solr.JSONResponseWriter">
- <!-- For the purposes of the tutorial, JSON responses are written as
- plain text so that they are easy to read in *any* browser.
- If you expect a MIME type of "application/json" just remove this override.
- -->
- <str name="content-type">text/plain; charset=UTF-8</str>
- </queryResponseWriter>
+ <!-- Overriding the content-type of the response writer.
+ For example, Default content-type of JSON is application/json. This can be overridden to
+ text/plain so that response is easy to read in *any* browser.
+ -->
+ <!--
+ <queryResponseWriter name="json" class="solr.JSONResponseWriter">
+ <str name="content-type">text/plain; charset=UTF-8</str>
+ </queryResponseWriter>
+ -->
<!--
Custom response writers can be declared as needed...
diff --git a/solr/server/solr/configsets/_default/conf/solrconfig.xml b/solr/server/solr/configsets/_default/conf/solrconfig.xml
index 0a932c6..36f54bb 100644
--- a/solr/server/solr/configsets/_default/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/_default/conf/solrconfig.xml
@@ -1291,13 +1291,15 @@
<queryResponseWriter name="schema.xml" class="solr.SchemaXmlResponseWriter"/>
-->
- <queryResponseWriter name="json" class="solr.JSONResponseWriter">
- <!-- For the purposes of the tutorial, JSON responses are written as
- plain text so that they are easy to read in *any* browser.
- If you expect a MIME type of "application/json" just remove this override.
- -->
- <str name="content-type">text/plain; charset=UTF-8</str>
- </queryResponseWriter>
+ <!-- Overriding the content-type of the response writer.
+ For example, Default content-type of JSON is application/json. This can be overridden to
+ text/plain so that response is easy to read in *any* browser.
+ -->
+ <!--
+ <queryResponseWriter name="json" class="solr.JSONResponseWriter">
+ <str name="content-type">text/plain; charset=UTF-8</str>
+ </queryResponseWriter>
+ -->
<!--
Custom response writers can be declared as needed...
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
index 46cc2f4..dd7ebd2 100644
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
@@ -1524,6 +1524,8 @@
<queryResponseWriter name="schema.xml" class="solr.SchemaXmlResponseWriter"/>
-->
+ <!-- Overriding the content-type of the response writer.
+ -->
<queryResponseWriter name="json" class="solr.JSONResponseWriter">
<!-- For the purposes of the tutorial, JSON responses are written as
plain text so that they are easy to read in *any* browser.