FAQ
Author: ehatcher
Date: Tue Nov 24 01:25:00 2015
New Revision: 1716007

URL: http://svn.apache.org/viewvc?rev=1716007&view=rev
Log:
SOLR-8307: move EmptyEntityResolver to another package to avoid conflict with solr-core and javadoc generation

Added:
     lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/EmptyEntityResolver.java
       - copied, changed from r1715863, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/util/EmptyEntityResolver.java
Removed:
     lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/util/EmptyEntityResolver.java
Modified:
     lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathRecordReader.java
     lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java
     lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java
     lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java

Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathRecordReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathRecordReader.java?rev=1716007&r1=1716006&r2=1716007&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathRecordReader.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathRecordReader.java Tue Nov 24 01:25:00 2015
@@ -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;

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java?rev=1716007&r1=1716006&r2=1716007&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java Tue Nov 24 01:25:00 2015
@@ -45,7 +45,7 @@ import org.apache.solr.request.SolrQuery
  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;


Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java?rev=1716007&r1=1716006&r2=1716007&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java Tue Nov 24 01:25:00 2015
@@ -59,7 +59,7 @@ import org.apache.solr.update.CommitUpda
  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;

Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java?rev=1716007&r1=1716006&r2=1716007&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java Tue Nov 24 01:25:00 2015
@@ -25,7 +25,7 @@ import org.apache.solr.common.util.DateU
  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;


Copied: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/EmptyEntityResolver.java (from r1715863, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/util/EmptyEntityResolver.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/EmptyEntityResolver.java?p2=lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/EmptyEntityResolver.java&p1=lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/util/EmptyEntityResolver.java&r1=1715863&r2=1716007&rev=1716007&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/util/EmptyEntityResolver.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/EmptyEntityResolver.java Tue Nov 24 01:25:00 2015
@@ -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;

Search Discussions

Related Discussions

Discussion Navigation
viewthread | post
posts ‹ prev | 1 of 1 | next ›
Discussion Overview
groupcommits @
categorieslucene
postedNov 24, '15 at 1:25a
activeNov 24, '15 at 1:25a
posts1
users1
websitelucene.apache.org

1 user in discussion

Ehatcher: 1 post

People

Translate

site design / logo © 2021 Grokbase