Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-8307: move EmptyEntityResolver to another package to avoid conflict with solr-core and javadoc generation 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1716007 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Erik Hatcher 2015-11-24 01:25:00 +00:00
parent 4995bbdd85
commit 255ff56d4e
5 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathRecordReader.java
View File

@ -17,7 +17,7 @@
package org.apache.solr.handler.dataimport;
import org.apache.solr.common.util.XMLErrorLogger;
import org.apache.solr.util.EmptyEntityResolver;
import org.apache.solr.common.EmptyEntityResolver;
import javax.xml.stream.XMLInputFactory;
import static javax.xml.stream.XMLStreamConstants.*;
import javax.xml.stream.XMLStreamException;

2
solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java
View File

@ -45,7 +45,7 @@ import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.schema.FieldType;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.SchemaField;
import org.apache.solr.util.EmptyEntityResolver;
import org.apache.solr.common.EmptyEntityResolver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java
View File

@ -59,7 +59,7 @@ import org.apache.solr.update.CommitUpdateCommand;
import org.apache.solr.update.DeleteUpdateCommand;
import org.apache.solr.update.RollbackUpdateCommand;
import org.apache.solr.update.processor.UpdateRequestProcessor;
import org.apache.solr.util.EmptyEntityResolver;
import org.apache.solr.common.EmptyEntityResolver;
import org.apache.solr.util.xslt.TransformerProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java
View File

@ -25,7 +25,7 @@ import org.apache.solr.common.util.DateUtil;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.common.util.XMLErrorLogger;
import org.apache.solr.util.EmptyEntityResolver;
import org.apache.solr.common.EmptyEntityResolver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

4
solr/solrj/src/java/org/apache/solr/util/EmptyEntityResolver.java → solr/solrj/src/java/org/apache/solr/common/EmptyEntityResolver.java
View File

@ -1,4 +1,4 @@
package org.apache.solr.util;
package org.apache.solr.common;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@ -24,8 +24,6 @@ import javax.xml.XMLConstants;
import javax.xml.parsers.SAXParserFactory;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLResolver;
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
import org.apache.commons.io.input.ClosedInputStream;