From 9184a44687ac7c454f773fc219a85067534154fe Mon Sep 17 00:00:00 2001 From: Noble Paul Date: Wed, 26 Nov 2014 10:27:53 +0000 Subject: [PATCH] SOLR-6792 deprecate AdminHandlers, Clean up solrconfig.xml of unnecessary plugin definitions, implicit registration of /replication, /get and /admin/* handlers git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1641790 13f79535-47bb-0310-9956-ffa450edef68 --- solr/CHANGES.txt | 4 + .../org/apache/solr/core/PluginsRegistry.java | 89 +++++++++++++++++++ .../org/apache/solr/core/RequestHandlers.java | 3 +- .../java/org/apache/solr/core/SolrCore.java | 6 +- .../solr/handler/SolrConfigHandler.java | 8 -- .../solr/handler/UpdateRequestHandler.java | 11 --- .../solr/handler/admin/AdminHandlers.java | 5 ++ .../conf/solrconfig-analytics-query.xml | 8 -- .../conf/solrconfig-collapseqparser.xml | 10 --- .../conf/solrconfig-components-name.xml | 2 - .../conf/solrconfig-deeppaging.xml | 9 -- ...solrconfig-doc-expire-update-processor.xml | 8 -- .../solrconfig-externalversionconstraint.xml | 10 --- .../conf/solrconfig-implicitproperties.xml | 4 - .../conf/solrconfig-managed-schema.xml | 8 -- .../conf/solrconfig-master-throttled.xml | 2 - .../conf/solrconfig-master1-keepOneBackup.xml | 1 - .../collection1/conf/solrconfig-master2.xml | 2 - .../collection1/conf/solrconfig-minimal.xml | 3 - .../conf/solrconfig-plugcollector.xml | 11 --- .../collection1/conf/solrconfig-repeater.xml | 2 - .../conf/solrconfig-schemaless.xml | 11 +-- .../collection1/conf/solrconfig-slave.xml | 2 - .../collection1/conf/solrconfig-slave1.xml | 5 -- ...solrconfig-tlog-with-delayingcomponent.xml | 12 --- .../solr/collection1/conf/solrconfig-tlog.xml | 11 --- .../conf/solrconfig-tolerant-search.xml | 5 -- .../conf/solrconfig-withgethandler.xml | 9 +- .../solr/collection1/conf/solrconfig.xml | 12 +-- .../solr/collection1/conf/solrconfig_perf.xml | 2 - .../org/apache/solr/MinimalSchemaTest.java | 2 + .../test/org/apache/solr/core/TestConfig.java | 4 - .../org/apache/solr/core/TestConfigSets.java | 4 +- .../multicore/core0/conf/solrconfig.xml | 24 +---- .../multicore/core1/conf/solrconfig.xml | 21 ----- .../basic_configs/conf/solrconfig.xml | 58 ------------ .../conf/solrconfig.xml | 50 +---------- .../conf/solrconfig.xml | 75 ---------------- 38 files changed, 112 insertions(+), 401 deletions(-) create mode 100644 solr/core/src/java/org/apache/solr/core/PluginsRegistry.java diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 1263f786da5..248bf3e3091 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -423,6 +423,10 @@ Other Changes * SOLR-6751: Exceptions thrown in the analysis chain in DirectUpdateHandler2 should return a BAD_REQUEST status (Alan Woodward) +* SOLR-SOLR-6792 : deprecate AdminHandlers, Clean up solrconfig.xml of + unnecessary plugin definitions, implicit registration of /replication, + /get and /admin/* handlers (Noble Paul) + ================== 4.10.3 ================== Bug Fixes diff --git a/solr/core/src/java/org/apache/solr/core/PluginsRegistry.java b/solr/core/src/java/org/apache/solr/core/PluginsRegistry.java new file mode 100644 index 00000000000..3ec165efc16 --- /dev/null +++ b/solr/core/src/java/org/apache/solr/core/PluginsRegistry.java @@ -0,0 +1,89 @@ +package org.apache.solr.core; + +/* + * 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. + */ + + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; + +import org.apache.solr.common.util.NamedList; +import org.apache.solr.handler.PingRequestHandler; +import org.apache.solr.handler.RealTimeGetHandler; +import org.apache.solr.handler.ReplicationHandler; +import org.apache.solr.handler.SolrConfigHandler; +import org.apache.solr.handler.UpdateRequestHandler; +import org.apache.solr.handler.admin.LoggingHandler; +import org.apache.solr.handler.admin.LukeRequestHandler; +import org.apache.solr.handler.admin.PluginInfoHandler; +import org.apache.solr.handler.admin.PropertiesRequestHandler; +import org.apache.solr.handler.admin.ShowFileRequestHandler; +import org.apache.solr.handler.admin.SolrInfoMBeanHandler; +import org.apache.solr.handler.admin.SystemInfoHandler; +import org.apache.solr.handler.admin.ThreadDumpHandler; +import org.apache.solr.request.SolrRequestHandler; + +import static java.util.Collections.singletonMap; +import static org.apache.solr.common.cloud.ZkNodeProps.makeMap; +import static org.apache.solr.core.PluginInfo.DEFAULTS; +import static org.apache.solr.core.PluginInfo.INVARIANTS; + +public class PluginsRegistry { + + public static List getHandlers(SolrCore solrCore){ + List implicits = new ArrayList<>(); + + //update handle implicits + implicits.add(getReqHandlerInfo("/update", UpdateRequestHandler.class, null)); + implicits.add(getReqHandlerInfo(UpdateRequestHandler.JSON_PATH, UpdateRequestHandler.class, singletonMap("update.contentType", "application/json"))); + implicits.add(getReqHandlerInfo(UpdateRequestHandler.CSV_PATH, UpdateRequestHandler.class, singletonMap("update.contentType", "application/csv"))); + implicits.add(getReqHandlerInfo(UpdateRequestHandler.DOC_PATH, UpdateRequestHandler.class, makeMap("update.contentType", "application/json", "json.command", "false"))); + + //solrconfighandler + implicits.add(getReqHandlerInfo("/config", SolrConfigHandler.class, null)); + + //register replicationhandler always for SolrCloud + implicits.add(getReqHandlerInfo("/replication", ReplicationHandler.class,null)); + + implicits.add(getReqHandlerInfo("/get", RealTimeGetHandler.class, + makeMap( + "omitHeader", "true", + "wt", "json", + "indent", "true"))); + //register adminHandlers + implicits.add(getReqHandlerInfo("/admin/luke", LukeRequestHandler.class, null)); + implicits.add(getReqHandlerInfo("/admin/system", SystemInfoHandler.class, null)); + implicits.add(getReqHandlerInfo("/admin/mbeans", SolrInfoMBeanHandler.class, null)); + implicits.add(getReqHandlerInfo("/admin/plugins", PluginInfoHandler.class, null)); + implicits.add(getReqHandlerInfo("/admin/threads", ThreadDumpHandler.class, null)); + implicits.add(getReqHandlerInfo("/admin/properties", PropertiesRequestHandler.class, null)); + implicits.add(getReqHandlerInfo("/admin/logging", LoggingHandler.class, null)); + implicits.add(getReqHandlerInfo("/admin/file", ShowFileRequestHandler.class, null)); + PluginInfo ping = getReqHandlerInfo("/admin/ping", PingRequestHandler.class, null); + ping.initArgs.add(INVARIANTS, new NamedList<>(makeMap("echoParams", "all", "q", "solrpingquery"))); + implicits.add(ping); + return implicits; + } + + public static PluginInfo getReqHandlerInfo(String name, Class clz, Map defaults){ + if(defaults == null) defaults= Collections.emptyMap(); + Map m = makeMap("name", name, "class", clz.getName()); + return new PluginInfo(SolrRequestHandler.TYPE, m, new NamedList<>(singletonMap(DEFAULTS, new NamedList(defaults))),null); + } +} diff --git a/solr/core/src/java/org/apache/solr/core/RequestHandlers.java b/solr/core/src/java/org/apache/solr/core/RequestHandlers.java index 6abb35611e0..64fd248dbc8 100644 --- a/solr/core/src/java/org/apache/solr/core/RequestHandlers.java +++ b/solr/core/src/java/org/apache/solr/core/RequestHandlers.java @@ -139,7 +139,8 @@ public final class RequestHandlers { * Handlers will be registered and initialized in the order they appear in solrconfig.xml */ - void initHandlersFromConfig(SolrConfig config, List implicits){ + void initHandlersFromConfig(SolrConfig config){ + List implicits = PluginsRegistry.getHandlers(core); // use link map so we iterate in the same order Map handlers = new LinkedHashMap<>(); Map implicitInfoMap= new HashMap<>(); diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java index 929caf16347..8819dc262f9 100644 --- a/solr/core/src/java/org/apache/solr/core/SolrCore.java +++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java @@ -807,11 +807,7 @@ public final class SolrCore implements SolrInfoMBean, Closeable { // Processors initialized before the handlers updateProcessorChains = loadUpdateProcessorChains(); reqHandlers = new RequestHandlers(this); - List implicitReqHandlerInfo = new ArrayList<>(); - UpdateRequestHandler.addImplicits(implicitReqHandlerInfo); - SolrConfigHandler.addImplicits(implicitReqHandlerInfo); - - reqHandlers.initHandlersFromConfig(solrConfig, implicitReqHandlerInfo); + reqHandlers.initHandlersFromConfig(solrConfig); // Handle things that should eventually go away initDeprecatedSupport(); diff --git a/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java b/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java index 3bdccfcb276..661b25e1c00 100644 --- a/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java @@ -312,14 +312,6 @@ public class SolrConfigHandler extends RequestHandlerBase implements SolrCoreAwa req.setParams(SolrParams.wrapDefaults(params, new MapSolrParams(map))); } - - public static void addImplicits(List infoList){ - Map m = makeMap("name", "/config", "class", SolrConfigHandler.class.getName()); - infoList.add(new PluginInfo(SolrRequestHandler.TYPE, m, new NamedList<>(singletonMap(DEFAULTS, new NamedList())), null)); - } - - - @Override public SolrRequestHandler getSubHandler(String path) { if(subPaths.contains(path)) return this; diff --git a/solr/core/src/java/org/apache/solr/handler/UpdateRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/UpdateRequestHandler.java index 1956afda9b2..eeac7c41d16 100644 --- a/solr/core/src/java/org/apache/solr/handler/UpdateRequestHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/UpdateRequestHandler.java @@ -172,17 +172,6 @@ public class UpdateRequestHandler extends ContentStreamHandlerBase { return "Add documents using XML (with XSLT), CSV, JSON, or javabin"; } - public static void addImplicits(List implicits) { - implicits.add(getPluginInfo("/update",Collections.emptyMap())); - implicits.add(getPluginInfo(JSON_PATH, singletonMap("update.contentType", "application/json"))); - implicits.add(getPluginInfo(CSV_PATH, singletonMap("update.contentType", "application/csv"))); - implicits.add(getPluginInfo(DOC_PATH, makeMap("update.contentType", "application/json", "json.command","false"))); - } - - static PluginInfo getPluginInfo(String name, Map defaults){ - Map m = makeMap("name", name, "class", UpdateRequestHandler.class.getName()); - return new PluginInfo("requestHandler", m, new NamedList<>( singletonMap("defaults", new NamedList(defaults))) ,null); - } public static final String DOC_PATH = "/update/json/docs"; public static final String JSON_PATH = "/update/json"; public static final String CSV_PATH = "/update/csv"; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/AdminHandlers.java b/solr/core/src/java/org/apache/solr/handler/admin/AdminHandlers.java index 381e558f731..9b91bf558e9 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/AdminHandlers.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/AdminHandlers.java @@ -27,14 +27,18 @@ import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.request.SolrRequestHandler; import org.apache.solr.response.SolrQueryResponse; import org.apache.solr.util.plugin.SolrCoreAware; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A special Handler that registers all standard admin handlers * * @since solr 1.3 */ +@Deprecated public class AdminHandlers implements SolrCoreAware, SolrRequestHandler { + public static Logger log = LoggerFactory.getLogger(AdminHandlers.class); NamedList initArgs = null; private static class StandardHandler { @@ -100,6 +104,7 @@ public class AdminHandlers implements SolrCoreAware, SolrRequestHandler } } } + log.warn(" is deprecated . It is not required anymore"); } diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml index f20ada6de3f..6c7fe6c43f7 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml @@ -185,7 +185,6 @@ - true - - - true - - @@ -230,8 +224,6 @@ based HashBitset. --> - - diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml index 04c02c5c15b..0dc3de6f123 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml @@ -185,8 +185,6 @@ - - @@ -201,12 +199,6 @@ based HashBitset. --> true - - - true - - - dismax @@ -230,8 +222,6 @@ based HashBitset. --> - - diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml index 9c22805c196..cdd3c5d375c 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml @@ -50,8 +50,6 @@ - - diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-deeppaging.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-deeppaging.xml index 78cfe258326..a4e5b3bdb35 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-deeppaging.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-deeppaging.xml @@ -45,15 +45,6 @@ ${solr.test.useFilterForSortedQuery} - - - - true - - - - - diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-doc-expire-update-processor.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-doc-expire-update-processor.xml index bae8d5c9e5e..a18fc9527d2 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-doc-expire-update-processor.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-doc-expire-update-processor.xml @@ -38,15 +38,7 @@ - - - true - - - - - diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xml index f7ff2cff9b0..131833dc510 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xml @@ -34,10 +34,6 @@ - - - - ${solr.ulog.dir:} @@ -115,11 +111,5 @@ - - - true - - - diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml index ecea9a316fb..04dd91cbf91 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml @@ -48,8 +48,6 @@ - - @@ -66,8 +64,6 @@ - - diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml index 991f870e399..d545ec80297 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml @@ -36,7 +36,6 @@ 1 - diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml index 8595904f180..094d2325e7f 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml @@ -56,8 +56,6 @@ - - diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml index 8272a30b2da..ccb4d4243eb 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml @@ -54,8 +54,5 @@ - - - diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml index 7c89a1d7eb0..8105bb60dc6 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml @@ -185,8 +185,6 @@ - - @@ -201,11 +199,6 @@ based HashBitset. --> true - - - true - - @@ -230,8 +223,6 @@ based HashBitset. --> - - @@ -250,8 +241,6 @@ based HashBitset. --> - - lowerpunctfilt diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml index 404c292caf5..61b427c7f06 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml @@ -40,8 +40,6 @@ - - commit 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 index 3208ec04a33..654cb394957 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml @@ -39,21 +39,14 @@ true - - - true - - - + add-unknown-fields-to-the-schema - - - diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog-with-delayingcomponent.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog-with-delayingcomponent.xml index f62a2e109f2..5db588f152d 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog-with-delayingcomponent.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog-with-delayingcomponent.xml @@ -46,16 +46,6 @@ - - - true - - - - - - - ${solr.ulog.dir:} @@ -85,8 +75,6 @@ - - bogus.txt diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml index d0dbc2f22fa..75ea5ca74eb 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml @@ -46,16 +46,6 @@ - - - true - - - - - - - ${solr.ulog.dir:} @@ -85,7 +75,6 @@ - diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-tolerant-search.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-tolerant-search.xml index 99fb48d3395..f733be4267c 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-tolerant-search.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-tolerant-search.xml @@ -48,10 +48,5 @@ - - - - diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-withgethandler.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-withgethandler.xml index 5ccbd21f4e3..70f4a684084 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-withgethandler.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-withgethandler.xml @@ -45,14 +45,7 @@ - - - - - - - true - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml index 902a2ce670e..a70aa0b8d03 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml @@ -190,8 +190,6 @@ - - @@ -206,12 +204,6 @@ true - - - true - - - dismax @@ -235,8 +227,6 @@ - - bogus.txt @@ -267,7 +257,7 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml index f51d6edb237..803362e55fc 100755 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml @@ -71,6 +71,4 @@ - - diff --git a/solr/core/src/test/org/apache/solr/MinimalSchemaTest.java b/solr/core/src/test/org/apache/solr/MinimalSchemaTest.java index ebcdf0481a8..c9fb555498f 100644 --- a/solr/core/src/test/org/apache/solr/MinimalSchemaTest.java +++ b/solr/core/src/test/org/apache/solr/MinimalSchemaTest.java @@ -105,12 +105,14 @@ public class MinimalSchemaTest extends SolrTestCaseJ4 { Set handlerNames = h.getCore().getRequestHandlers().keySet(); for (String handler : handlerNames) { try { + if (handler.startsWith("/update")) { continue; } if (handler.startsWith("/mlt")) { continue; } + if(handler.equals("/admin/ping")) continue; assertQ("failure w/handler: '" + handler + "'", req("qt", handler, diff --git a/solr/core/src/test/org/apache/solr/core/TestConfig.java b/solr/core/src/test/org/apache/solr/core/TestConfig.java index 8f065f49b96..023ab5a42b8 100644 --- a/solr/core/src/test/org/apache/solr/core/TestConfig.java +++ b/solr/core/src/test/org/apache/solr/core/TestConfig.java @@ -107,10 +107,6 @@ public class TestConfig extends SolrTestCaseJ4 { ShowFileRequestHandler handler = (ShowFileRequestHandler) h.getCore().getRequestHandler("/admin/file"); assertTrue("file handler should have been automatically registered", handler != null); - //System.out.println( handler.getHiddenFiles() ); - // should not contain: solrconfig.xml schema.xml admin-extra.html - assertFalse(handler.getHiddenFiles().contains("schema.xml".toUpperCase(Locale.ROOT))); - assertTrue(handler.getHiddenFiles().contains("PROTWORDS.TXT")); } // If defaults change, add test methods to cover each version diff --git a/solr/core/src/test/org/apache/solr/core/TestConfigSets.java b/solr/core/src/test/org/apache/solr/core/TestConfigSets.java index faf8ad49d60..2e238675edd 100644 --- a/solr/core/src/test/org/apache/solr/core/TestConfigSets.java +++ b/solr/core/src/test/org/apache/solr/core/TestConfigSets.java @@ -121,7 +121,7 @@ public class TestConfigSets extends SolrTestCaseJ4 { // We initially don't have a /get handler defined SolrCore core = container.create(new CoreDescriptor(container, "core1", testDirectory + "/core", "configSet", "configset-2")); assertThat("No /get handler should be defined in the initial configuration", - core.getRequestHandler("/get"), is(nullValue())); + core.getRequestHandler("/dump"), is(nullValue())); // Now copy in a config with a /get handler and reload FileUtils.copyFile(getFile("solr/collection1/conf/solrconfig-withgethandler.xml"), @@ -130,7 +130,7 @@ public class TestConfigSets extends SolrTestCaseJ4 { core = container.getCore("core1"); assertThat("A /get handler should be defined in the reloaded configuration", - core.getRequestHandler("/get"), is(notNullValue())); + core.getRequestHandler("/dump"), is(notNullValue())); core.close(); container.shutdown(); diff --git a/solr/example/multicore/core0/conf/solrconfig.xml b/solr/example/multicore/core0/conf/solrconfig.xml index 4a5f4c63d98..2608d027821 100644 --- a/solr/example/multicore/core0/conf/solrconfig.xml +++ b/solr/example/multicore/core0/conf/solrconfig.xml @@ -57,35 +57,13 @@ - - - - true - - - - - - - - - - - solrpingquery - - - all - - - + solr diff --git a/solr/example/multicore/core1/conf/solrconfig.xml b/solr/example/multicore/core1/conf/solrconfig.xml index 27d3d108aa1..40ea23bc7f0 100644 --- a/solr/example/multicore/core1/conf/solrconfig.xml +++ b/solr/example/multicore/core1/conf/solrconfig.xml @@ -57,34 +57,13 @@ - - - - true - - - - - - - - - - solrpingquery - - - all - - diff --git a/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml b/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml index d2b88a2f9fa..48db0dd3ec7 100755 --- a/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml +++ b/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml @@ -445,25 +445,6 @@ - - - - true - json - true - - - - - - - - - solrpingquery - - - all - - - - - @@ -593,22 +550,7 @@ - - - - - - - true - json - true - - - - - - - - - - - - solrpingquery - - - all - - - - + 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 8e1a68230c9..3451073a22a 100755 --- a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml +++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml @@ -903,24 +903,6 @@ - - - - true - json - true - - - - - - - solrpingquery - - - all - - - - @@ -1239,41 +1199,6 @@ - - - - - - -