You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by is...@apache.org on 2020/09/19 05:22:35 UTC
[lucene-solr] 07/10: Revert "SOLR-14151: move the SolrClassLoader
interface to SolrJ"
This is an automated email from the ASF dual-hosted git repository.
ishan pushed a commit to branch jira/solr-14151-revert-8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 54d2f10233bf4e0a8360d27c810beed8683081f1
Author: Ishan Chattopadhyaya <is...@apache.org>
AuthorDate: Sat Sep 19 10:51:21 2020 +0530
Revert "SOLR-14151: move the SolrClassLoader interface to SolrJ"
This reverts commit c5612861e9657d82fe4b1f40996ce5d8e19b72bd.
---
.../cloud => core/src/java/org/apache/solr/core}/SolrClassLoader.java | 2 +-
solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java | 1 -
solr/core/src/java/org/apache/solr/pkg/PackageListeningClassLoader.java | 2 +-
solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java | 2 +-
solr/core/src/java/org/apache/solr/schema/IndexSchema.java | 2 +-
.../core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java | 2 +-
6 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/SolrClassLoader.java b/solr/core/src/java/org/apache/solr/core/SolrClassLoader.java
similarity index 96%
rename from solr/solrj/src/java/org/apache/solr/common/cloud/SolrClassLoader.java
rename to solr/core/src/java/org/apache/solr/core/SolrClassLoader.java
index 98e920d..7973b63 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/SolrClassLoader.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrClassLoader.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.solr.common.cloud;
+package org.apache.solr.core;
/** A generic interface to load plugin classes */
diff --git a/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java b/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java
index 4261a10..810c48d 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java
@@ -41,7 +41,6 @@ import org.apache.lucene.codecs.DocValuesFormat;
import org.apache.lucene.codecs.PostingsFormat;
import org.apache.lucene.util.IOUtils;
import org.apache.solr.common.SolrException;
-import org.apache.solr.common.cloud.SolrClassLoader;
import org.apache.solr.handler.component.SearchComponent;
import org.apache.solr.handler.component.ShardHandlerFactory;
import org.apache.solr.request.SolrRequestHandler;
diff --git a/solr/core/src/java/org/apache/solr/pkg/PackageListeningClassLoader.java b/solr/core/src/java/org/apache/solr/pkg/PackageListeningClassLoader.java
index c10af0c..ced4bd0 100644
--- a/solr/core/src/java/org/apache/solr/pkg/PackageListeningClassLoader.java
+++ b/solr/core/src/java/org/apache/solr/pkg/PackageListeningClassLoader.java
@@ -22,7 +22,7 @@ import org.apache.solr.common.MapWriter;
import org.apache.solr.common.SolrException;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.PluginInfo;
-import org.apache.solr.common.cloud.SolrClassLoader;
+import org.apache.solr.core.SolrClassLoader;
import org.apache.solr.core.SolrResourceLoader;
import java.io.IOException;
diff --git a/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java b/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java
index abe6125..d42cd54 100644
--- a/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java
+++ b/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java
@@ -33,7 +33,7 @@ import org.apache.lucene.analysis.util.TokenizerFactory;
import org.apache.lucene.util.Version;
import org.apache.solr.analysis.TokenizerChain;
import org.apache.solr.common.SolrException;
-import org.apache.solr.common.cloud.SolrClassLoader;
+import org.apache.solr.core.SolrClassLoader;
import org.apache.solr.core.SolrConfig;
import org.apache.solr.util.DOMUtil;
import org.apache.solr.util.plugin.AbstractPluginLoader;
diff --git a/solr/core/src/java/org/apache/solr/schema/IndexSchema.java b/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
index eb0c86e..60727d0 100644
--- a/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
+++ b/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
@@ -66,7 +66,7 @@ import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.Pair;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.core.CoreContainer;
-import org.apache.solr.common.cloud.SolrClassLoader;
+import org.apache.solr.core.SolrClassLoader;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrResourceLoader;
import org.apache.solr.core.XmlConfigFile;
diff --git a/solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java b/solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java
index 3a90013..8324f2d 100644
--- a/solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java
+++ b/solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java
@@ -22,7 +22,7 @@ import java.util.List;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
-import org.apache.solr.common.cloud.SolrClassLoader;
+import org.apache.solr.core.SolrClassLoader;
import org.apache.solr.util.DOMUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;