You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ch...@apache.org on 2012/04/12 03:32:31 UTC
svn commit: r1325094 - in /lucene/dev/trunk/solr: ./
contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/
core/src/java/org/apache/solr/core/ core/src/java/org/apache/solr/handler/
core/src/java/org/apache/solr/handler/component/ core...
Author: chrism
Date: Thu Apr 12 01:32:29 2012
New Revision: 1325094
URL: http://svn.apache.org/viewvc?rev=1325094&view=rev
Log:
SOLR-3343: Moved non-shared utils out of solrj
Added:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/DOMUtil.java
- copied, changed from r1325088, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/DOMUtil.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/FastWriter.java
- copied, changed from r1325088, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/FastWriter.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/FileUtils.java
- copied, changed from r1325088, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/FileUtils.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/RTimer.java
- copied, changed from r1325088, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/RTimer.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/RegexFileFilter.java
- copied, changed from r1325088, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/RegexFileFilter.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SystemIdResolver.java
- copied, changed from r1325088, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/SystemIdResolver.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/util/DOMUtilTest.java
- copied, changed from r1325088, lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/util/DOMUtilTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/util/FileUtilsTest.java
- copied, changed from r1325088, lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/util/FileUtilsTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/util/TestSystemIdResolver.java
- copied, changed from r1325088, lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/util/TestSystemIdResolver.java
Removed:
lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/DOMUtil.java
lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/FastWriter.java
lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/FileUtils.java
lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/RTimer.java
lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/RegexFileFilter.java
lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/SystemIdResolver.java
lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/util/DOMUtilTest.java
lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/util/FileUtilsTest.java
lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/util/TestSystemIdResolver.java
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java
lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java
lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/Config.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/PluginInfo.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrConfig.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapShooter.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/CSVResponseWriter.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/CacheConfig.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/plugin/MapPluginLoader.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/plugin/NamedListPluginLoader.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/xslt/TransformerProvider.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java
lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1325094&r1=1325093&r2=1325094&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Thu Apr 12 01:32:29 2012
@@ -1,4 +1,4 @@
- Apache Solr Release Notes
+ Apache Solr Release Notes
Introduction
------------
@@ -486,6 +486,9 @@ Other Changes
* SOLR-3322: Add more context to IndexReaderFactory.newReader (ab)
+* SOLR-3343: Moved FastWriter, FileUtils, RegexFileFilter, RTimer and SystemIdResolver
+ from org.apache.solr.common to org.apache.solr.util (Chris Male)
+
Documentation
----------------------
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java?rev=1325094&r1=1325093&r2=1325094&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java Thu Apr 12 01:32:29 2012
@@ -27,7 +27,7 @@ import org.apache.solr.common.util.Conte
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.ContentStream;
import org.apache.solr.common.util.StrUtils;
-import org.apache.solr.common.util.SystemIdResolver;
+import org.apache.solr.util.SystemIdResolver;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrResourceLoader;
import org.apache.solr.handler.RequestHandlerBase;
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java?rev=1325094&r1=1325093&r2=1325094&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java Thu Apr 12 01:32:29 2012
@@ -25,7 +25,7 @@ import org.apache.solr.schema.SchemaFiel
import org.apache.solr.common.util.ContentStream;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.StrUtils;
-import org.apache.solr.common.util.SystemIdResolver;
+import org.apache.solr.util.SystemIdResolver;
import org.apache.solr.common.util.XMLErrorLogger;
import static org.apache.solr.handler.dataimport.DataImportHandlerException.wrapAndThrow;
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java?rev=1325094&r1=1325093&r2=1325094&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java Thu Apr 12 01:32:29 2012
@@ -20,7 +20,7 @@ import static org.apache.solr.handler.da
import static org.apache.solr.handler.dataimport.DataImportHandlerException.wrapAndThrow;
import org.apache.solr.core.SolrCore;
import org.apache.solr.common.ResourceLoader;
-import org.apache.solr.common.util.SystemIdResolver;
+import org.apache.solr.util.SystemIdResolver;
import org.apache.solr.common.util.XMLErrorLogger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/Config.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/Config.java?rev=1325094&r1=1325093&r2=1325094&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/Config.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/Config.java Thu Apr 12 01:32:29 2012
@@ -19,8 +19,8 @@ package org.apache.solr.core;
import org.apache.lucene.util.Version;
import org.apache.solr.common.SolrException;
-import org.apache.solr.common.util.DOMUtil;
-import org.apache.solr.common.util.SystemIdResolver;
+import org.apache.solr.util.DOMUtil;
+import org.apache.solr.util.SystemIdResolver;
import org.apache.solr.common.util.XMLErrorLogger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java?rev=1325094&r1=1325093&r2=1325094&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java Thu Apr 12 01:32:29 2012
@@ -57,9 +57,9 @@ import org.apache.solr.common.SolrExcept
import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.common.cloud.ZooKeeperException;
import org.apache.solr.common.params.CoreAdminParams;
-import org.apache.solr.common.util.DOMUtil;
-import org.apache.solr.common.util.FileUtils;
-import org.apache.solr.common.util.SystemIdResolver;
+import org.apache.solr.util.DOMUtil;
+import org.apache.solr.util.FileUtils;
+import org.apache.solr.util.SystemIdResolver;
import org.apache.solr.core.SolrXMLSerializer.SolrCoreXMLDef;
import org.apache.solr.core.SolrXMLSerializer.SolrXMLDef;
import org.apache.solr.handler.admin.CoreAdminHandler;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/PluginInfo.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/PluginInfo.java?rev=1325094&r1=1325093&r2=1325094&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/PluginInfo.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/PluginInfo.java Thu Apr 12 01:32:29 2012
@@ -17,7 +17,7 @@
package org.apache.solr.core;
import org.apache.solr.common.util.NamedList;
-import org.apache.solr.common.util.DOMUtil;
+import org.apache.solr.util.DOMUtil;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrConfig.java?rev=1325094&r1=1325093&r2=1325094&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrConfig.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrConfig.java Thu Apr 12 01:32:29 2012
@@ -19,8 +19,8 @@ package org.apache.solr.core;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
-import org.apache.solr.common.util.DOMUtil;
-import org.apache.solr.common.util.RegexFileFilter;
+import org.apache.solr.util.DOMUtil;
+import org.apache.solr.util.RegexFileFilter;
import org.apache.solr.handler.component.SearchComponent;
import org.apache.solr.request.SolrRequestHandler;
import org.apache.solr.response.QueryResponseWriter;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java?rev=1325094&r1=1325093&r2=1325094&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java Thu Apr 12 01:32:29 2012
@@ -47,7 +47,7 @@ import javax.naming.NoInitialContextExce
import org.apache.solr.analysis.CharFilterFactory;
import org.apache.solr.analysis.TokenFilterFactory;
import org.apache.solr.analysis.TokenizerFactory;
-import org.apache.solr.common.util.FileUtils;
+import org.apache.solr.util.FileUtils;
import org.apache.solr.common.ResourceLoader;
import org.apache.solr.common.SolrException;
import org.apache.solr.handler.component.SearchComponent;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java?rev=1325094&r1=1325093&r2=1325094&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java Thu Apr 12 01:32:29 2012
@@ -35,7 +35,7 @@ import org.apache.lucene.index.IndexComm
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.util.FastInputStream;
-import org.apache.solr.common.util.FileUtils;
+import org.apache.solr.util.FileUtils;
import org.apache.solr.common.util.JavaBinCodec;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrCore;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapShooter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapShooter.java?rev=1325094&r1=1325093&r2=1325094&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapShooter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapShooter.java Thu Apr 12 01:32:29 2012
@@ -58,7 +58,7 @@ public class SnapShooter {
if (location == null) snapDir = core.getDataDir();
else {
File base = new File(core.getCoreDescriptor().getInstanceDir());
- snapDir = org.apache.solr.common.util.FileUtils.resolvePath(base, location).getAbsolutePath();
+ snapDir = org.apache.solr.util.FileUtils.resolvePath(base, location).getAbsolutePath();
File dir = new File(snapDir);
if (!dir.exists()) dir.mkdirs();
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java?rev=1325094&r1=1325093&r2=1325094&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java Thu Apr 12 01:32:29 2012
@@ -29,7 +29,7 @@ import org.apache.solr.cloud.ZkControlle
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.QueryElevationParams;
import org.apache.solr.common.params.SolrParams;
-import org.apache.solr.common.util.DOMUtil;
+import org.apache.solr.util.DOMUtil;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.core.Config;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.java?rev=1325094&r1=1325093&r2=1325094&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.java Thu Apr 12 01:32:29 2012
@@ -25,7 +25,7 @@ import org.apache.lucene.util.BytesRef;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.common.util.NamedList;
-import org.apache.solr.common.util.RTimer;
+import org.apache.solr.util.RTimer;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrRequestInfo;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java?rev=1325094&r1=1325093&r2=1325094&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java Thu Apr 12 01:32:29 2012
@@ -22,7 +22,7 @@ import org.apache.solr.common.SolrExcept
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.params.ShardParams;
-import org.apache.solr.common.util.RTimer;
+import org.apache.solr.util.RTimer;
import org.apache.solr.core.CloseHook;
import org.apache.solr.core.PluginInfo;
import org.apache.solr.core.SolrCore;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/CSVResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/CSVResponseWriter.java?rev=1325094&r1=1325093&r2=1325094&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/CSVResponseWriter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/CSVResponseWriter.java Thu Apr 12 01:32:29 2012
@@ -25,7 +25,7 @@ import org.apache.solr.common.SolrDocume
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.DateUtil;
-import org.apache.solr.common.util.FastWriter;
+import org.apache.solr.util.FastWriter;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.schema.FieldType;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java?rev=1325094&r1=1325093&r2=1325094&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java Thu Apr 12 01:32:29 2012
@@ -27,7 +27,7 @@ import org.apache.lucene.util.BytesRef;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.common.util.Base64;
-import org.apache.solr.common.util.FastWriter;
+import org.apache.solr.util.FastWriter;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.transform.DocTransformer;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java?rev=1325094&r1=1325093&r2=1325094&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java Thu Apr 12 01:32:29 2012
@@ -24,7 +24,7 @@ import org.apache.lucene.util.Version;
import org.apache.solr.analysis.*;
import org.apache.solr.common.ResourceLoader;
import org.apache.solr.common.SolrException;
-import org.apache.solr.common.util.DOMUtil;
+import org.apache.solr.util.DOMUtil;
import org.apache.solr.core.Config;
import org.apache.solr.core.SolrResourceLoader;
import org.apache.solr.util.plugin.AbstractPluginLoader;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/IndexSchema.java?rev=1325094&r1=1325093&r2=1325094&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/IndexSchema.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/IndexSchema.java Thu Apr 12 01:32:29 2012
@@ -26,9 +26,9 @@ import org.apache.lucene.util.Version;
import org.apache.solr.common.ResourceLoader;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.SolrParams;
-import org.apache.solr.common.util.DOMUtil;
+import org.apache.solr.util.DOMUtil;
import org.apache.solr.common.util.NamedList;
-import org.apache.solr.common.util.SystemIdResolver;
+import org.apache.solr.util.SystemIdResolver;
import org.apache.solr.core.SolrConfig;
import org.apache.solr.core.Config;
import org.apache.solr.core.SolrResourceLoader;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/CacheConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/CacheConfig.java?rev=1325094&r1=1325093&r2=1325094&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/CacheConfig.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/CacheConfig.java Thu Apr 12 01:32:29 2012
@@ -23,7 +23,7 @@ import org.w3c.dom.NodeList;
import java.util.Map;
import org.apache.solr.common.SolrException;
-import org.apache.solr.common.util.DOMUtil;
+import org.apache.solr.util.DOMUtil;
import org.apache.solr.core.SolrConfig;
import org.apache.solr.core.SolrResourceLoader;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java?rev=1325094&r1=1325093&r2=1325094&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java Thu Apr 12 01:32:29 2012
@@ -51,7 +51,7 @@ import org.apache.solr.common.cloud.Slic
import org.apache.solr.common.cloud.ZkNodeProps;
import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.common.params.CommonParams;
-import org.apache.solr.common.util.FastWriter;
+import org.apache.solr.util.FastWriter;
import org.apache.solr.common.util.ContentStreamBase;
import org.apache.solr.core.*;
import org.apache.solr.handler.component.SearchHandler;
Copied: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/DOMUtil.java (from r1325088, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/DOMUtil.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/DOMUtil.java?p2=lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/DOMUtil.java&p1=lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/DOMUtil.java&r1=1325088&r2=1325094&rev=1325094&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/DOMUtil.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/DOMUtil.java Thu Apr 12 01:32:29 2012
@@ -1,4 +1,6 @@
-/**
+package org.apache.solr.util;
+
+/*
* 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.
@@ -15,11 +17,11 @@
* limitations under the License.
*/
-package org.apache.solr.common.util;
-
import java.util.*;
import org.apache.solr.common.SolrException;
+import org.apache.solr.common.util.NamedList;
+import org.apache.solr.common.util.StrUtils;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Copied: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/FastWriter.java (from r1325088, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/FastWriter.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/FastWriter.java?p2=lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/FastWriter.java&p1=lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/FastWriter.java&r1=1325088&r2=1325094&rev=1325094&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/FastWriter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/FastWriter.java Thu Apr 12 01:32:29 2012
@@ -1,4 +1,6 @@
-/**
+package org.apache.solr.util;
+
+/*
* 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.
@@ -15,8 +17,6 @@
* limitations under the License.
*/
-package org.apache.solr.common.util;
-
import java.io.Writer;
import java.io.IOException;
Copied: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/FileUtils.java (from r1325088, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/FileUtils.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/FileUtils.java?p2=lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/FileUtils.java&p1=lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/FileUtils.java&r1=1325088&r2=1325094&rev=1325094&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/FileUtils.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/FileUtils.java Thu Apr 12 01:32:29 2012
@@ -1,4 +1,6 @@
-/**
+package org.apache.solr.util;
+
+/*
* 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.
@@ -15,8 +17,6 @@
* limitations under the License.
*/
-package org.apache.solr.common.util;
-
import java.io.*;
import java.nio.channels.FileChannel;
Copied: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/RTimer.java (from r1325088, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/RTimer.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/RTimer.java?p2=lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/RTimer.java&p1=lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/RTimer.java&r1=1325088&r2=1325094&rev=1325094&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/RTimer.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/RTimer.java Thu Apr 12 01:32:29 2012
@@ -1,4 +1,6 @@
-/**
+package org.apache.solr.util;
+
+/*
* 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.
@@ -15,7 +17,8 @@
* limitations under the License.
*/
-package org.apache.solr.common.util;
+import org.apache.solr.common.util.NamedList;
+import org.apache.solr.common.util.SimpleOrderedMap;
import java.lang.System;
import java.lang.Thread;
Copied: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/RegexFileFilter.java (from r1325088, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/RegexFileFilter.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/RegexFileFilter.java?p2=lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/RegexFileFilter.java&p1=lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/RegexFileFilter.java&r1=1325088&r2=1325094&rev=1325094&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/RegexFileFilter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/RegexFileFilter.java Thu Apr 12 01:32:29 2012
@@ -1,4 +1,6 @@
-/**
+package org.apache.solr.util;
+
+/*
* 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.
@@ -15,8 +17,6 @@
* limitations under the License.
*/
-package org.apache.solr.common.util;
-
import java.io.File;
import java.io.FileFilter;
import java.util.regex.*;
Copied: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SystemIdResolver.java (from r1325088, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/SystemIdResolver.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SystemIdResolver.java?p2=lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SystemIdResolver.java&p1=lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/SystemIdResolver.java&r1=1325088&r2=1325094&rev=1325094&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/SystemIdResolver.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SystemIdResolver.java Thu Apr 12 01:32:29 2012
@@ -1,4 +1,6 @@
-/**
+package org.apache.solr.util;
+
+/*
* 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.
@@ -15,8 +17,6 @@
* limitations under the License.
*/
-package org.apache.solr.common.util;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java?rev=1325094&r1=1325093&r2=1325094&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java Thu Apr 12 01:32:29 2012
@@ -25,7 +25,7 @@ import org.slf4j.LoggerFactory;
import org.apache.solr.common.ResourceLoader;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
-import org.apache.solr.common.util.DOMUtil;
+import org.apache.solr.util.DOMUtil;
import org.apache.solr.core.SolrConfig;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/plugin/MapPluginLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/plugin/MapPluginLoader.java?rev=1325094&r1=1325093&r2=1325094&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/plugin/MapPluginLoader.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/plugin/MapPluginLoader.java Thu Apr 12 01:32:29 2012
@@ -19,7 +19,7 @@ package org.apache.solr.util.plugin;
import java.util.Map;
-import org.apache.solr.common.util.DOMUtil;
+import org.apache.solr.util.DOMUtil;
import org.w3c.dom.Node;
/**
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/plugin/NamedListPluginLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/plugin/NamedListPluginLoader.java?rev=1325094&r1=1325093&r2=1325094&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/plugin/NamedListPluginLoader.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/plugin/NamedListPluginLoader.java Thu Apr 12 01:32:29 2012
@@ -19,7 +19,7 @@ package org.apache.solr.util.plugin;
import java.util.Map;
-import org.apache.solr.common.util.DOMUtil;
+import org.apache.solr.util.DOMUtil;
import org.w3c.dom.Node;
/**
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/xslt/TransformerProvider.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/xslt/TransformerProvider.java?rev=1325094&r1=1325093&r2=1325094&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/xslt/TransformerProvider.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/xslt/TransformerProvider.java Thu Apr 12 01:32:29 2012
@@ -30,7 +30,7 @@ import javax.xml.transform.TransformerFa
import javax.xml.transform.stream.StreamSource;
import org.apache.solr.common.ResourceLoader;
-import org.apache.solr.common.util.SystemIdResolver;
+import org.apache.solr.util.SystemIdResolver;
import org.apache.solr.common.util.XMLErrorLogger;
import org.apache.solr.core.SolrConfig;
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java?rev=1325094&r1=1325093&r2=1325094&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java Thu Apr 12 01:32:29 2012
@@ -23,7 +23,7 @@ import java.io.IOException;
import org.apache.solr.BaseDistributedSearchTestCase;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.params.CommonParams;
-import org.apache.solr.common.util.FileUtils;
+import org.apache.solr.util.FileUtils;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java?rev=1325094&r1=1325093&r2=1325094&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java Thu Apr 12 01:32:29 2012
@@ -23,7 +23,7 @@ import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.MapSolrParams;
import org.apache.solr.common.params.QueryElevationParams;
-import org.apache.solr.common.util.FileUtils;
+import org.apache.solr.util.FileUtils;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrCore;
import org.apache.solr.handler.component.QueryElevationComponent.ElevationObj;
Copied: lucene/dev/trunk/solr/core/src/test/org/apache/solr/util/DOMUtilTest.java (from r1325088, lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/util/DOMUtilTest.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/util/DOMUtilTest.java?p2=lucene/dev/trunk/solr/core/src/test/org/apache/solr/util/DOMUtilTest.java&p1=lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/util/DOMUtilTest.java&r1=1325088&r2=1325094&rev=1325094&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/util/DOMUtilTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/util/DOMUtilTest.java Thu Apr 12 01:32:29 2012
@@ -1,4 +1,6 @@
-/**
+package org.apache.solr.util;
+
+/*
* 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.
@@ -15,8 +17,8 @@
* limitations under the License.
*/
-package org.apache.solr.common.util;
-
+import org.apache.solr.common.util.NamedList;
+import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.util.DOMUtilTestBase;
public class DOMUtilTest extends DOMUtilTestBase {
Copied: lucene/dev/trunk/solr/core/src/test/org/apache/solr/util/FileUtilsTest.java (from r1325088, lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/util/FileUtilsTest.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/util/FileUtilsTest.java?p2=lucene/dev/trunk/solr/core/src/test/org/apache/solr/util/FileUtilsTest.java&p1=lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/util/FileUtilsTest.java&r1=1325088&r2=1325094&rev=1325094&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/util/FileUtilsTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/util/FileUtilsTest.java Thu Apr 12 01:32:29 2012
@@ -1,4 +1,6 @@
-/**
+package org.apache.solr.util;
+
+/*
* 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.
@@ -15,8 +17,6 @@
* limitations under the License.
*/
-package org.apache.solr.common.util;
-
import java.io.File;
import java.io.IOException;
Copied: lucene/dev/trunk/solr/core/src/test/org/apache/solr/util/TestSystemIdResolver.java (from r1325088, lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/util/TestSystemIdResolver.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/util/TestSystemIdResolver.java?p2=lucene/dev/trunk/solr/core/src/test/org/apache/solr/util/TestSystemIdResolver.java&p1=lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/util/TestSystemIdResolver.java&r1=1325088&r2=1325094&rev=1325094&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/util/TestSystemIdResolver.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/util/TestSystemIdResolver.java Thu Apr 12 01:32:29 2012
@@ -1,4 +1,6 @@
-/**
+package org.apache.solr.util;
+
+/*
* 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.
@@ -15,8 +17,6 @@
* limitations under the License.
*/
-package org.apache.solr.common.util;
-
import org.apache.solr.core.SolrResourceLoader;
import org.apache.solr.common.ResourceLoader;
import org.apache.lucene.util.LuceneTestCase;
@@ -38,7 +38,7 @@ public class TestSystemIdResolver extend
}
public void testResolving() throws Exception {
- final String testHome = SolrTestCaseJ4.getFile("solrj/solr/conf").getParent();
+ final String testHome = SolrTestCaseJ4.getFile("solr/conf").getParent();
final ResourceLoader loader = new SolrResourceLoader(testHome, this.getClass().getClassLoader());
final SystemIdResolver resolver = new SystemIdResolver(loader);
final String fileUri = new File(testHome+"/crazy-path-to-config.xml").toURI().toASCIIString();
@@ -57,10 +57,10 @@ public class TestSystemIdResolver extend
assertEquals(fileUri, resolver.resolveRelativeURI("solrres:/base.xml", fileUri).toASCIIString());
assertEquals("solrres:/base.xml", resolver.resolveRelativeURI(fileUri, "solrres:/base.xml").toASCIIString());
- // do some real resolves to I nputStreams with real existing files
+ // do some real resolves to InputStreams with real existing files
assertEntityResolving(resolver, "solrres:/schema.xml", "solrres:/solrconfig.xml", "schema.xml");
- assertEntityResolving(resolver, "solrres:/org/apache/solr/common/util/TestSystemIdResolver.class",
- "solrres:/org/apache/solr/common/ResourceLoader.class", "util/TestSystemIdResolver.class");
+ assertEntityResolving(resolver, "solrres:/org/apache/solr/util/TestSystemIdResolver.class",
+ "solrres:/org/apache/solr/util/RTimer.class", "TestSystemIdResolver.class");
assertEntityResolving(resolver, SystemIdResolver.createSystemIdFromResourceName(testHome+"/conf/schema.xml"),
SystemIdResolver.createSystemIdFromResourceName(testHome+"/conf/solrconfig.xml"), "schema.xml");
assertEntityResolving(resolver, SystemIdResolver.createSystemIdFromResourceName(testHome+"/crazy-path-to-schema.xml"),
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java?rev=1325094&r1=1325093&r2=1325094&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java Thu Apr 12 01:32:29 2012
@@ -28,7 +28,7 @@ import org.apache.solr.client.solrj.requ
import org.apache.solr.client.solrj.request.UpdateRequest;
import org.apache.solr.client.solrj.response.CoreAdminResponse;
import org.apache.solr.common.SolrInputDocument;
-import org.apache.solr.common.util.FileUtils;
+import org.apache.solr.util.FileUtils;
import org.apache.solr.core.CoreContainer;
import org.junit.Rule;
import org.junit.Test;