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/03/30 03:25:39 UTC

svn commit: r1307204 - in /lucene/dev/branches/lucene3930/solr: core/src/java/org/apache/solr/handler/ core/src/java/org/apache/solr/internal/csv/ core/src/java/org/apache/solr/internal/csv/writer/ core/src/java/org/apache/solr/servlet/ core/src/test/o...

Author: chrism
Date: Fri Mar 30 01:25:38 2012
New Revision: 1307204

URL: http://svn.apache.org/viewvc?rev=1307204&view=rev
Log:
LUCENE-3930: Moved noggit back to original package, fixed javadocs in both noggit and commons csv code

Added:
    lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/noggit/
      - copied from r1307165, lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/internal/noggit/
Removed:
    lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/internal/noggit/
Modified:
    lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/handler/JsonLoader.java
    lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/internal/csv/CharBuffer.java
    lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVField.java
    lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/servlet/ZookeeperInfoServlet.java
    lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/TestGroupingSearch.java
    lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/TestJoin.java
    lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java
    lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java
    lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/search/TestRecovery.java
    lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/noggit/CharArr.java
    lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/noggit/CharUtil.java
    lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/noggit/JSONParser.java
    lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/noggit/JSONUtil.java
    lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/noggit/JSONWriter.java
    lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/noggit/ObjectBuilder.java
    lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/common/cloud/CloudState.java
    lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/common/cloud/CoreState.java
    lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/common/cloud/Slice.java
    lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/common/cloud/ZkNodeProps.java
    lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
    lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/common/util/ByteUtils.java
    lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java

Modified: lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/handler/JsonLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/handler/JsonLoader.java?rev=1307204&r1=1307203&r2=1307204&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/handler/JsonLoader.java (original)
+++ lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/handler/JsonLoader.java Fri Mar 30 01:25:38 2012
@@ -24,9 +24,9 @@ import java.util.Map;
 import java.util.Stack;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.solr.internal.noggit.JSONParser;
-import org.apache.solr.internal.noggit.JSONUtil;
-import org.apache.solr.internal.noggit.ObjectBuilder;
+import org.apache.noggit.JSONParser;
+import org.apache.noggit.JSONUtil;
+import org.apache.noggit.ObjectBuilder;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.SolrInputDocument;
 import org.apache.solr.common.SolrInputField;

Modified: lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/internal/csv/CharBuffer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/internal/csv/CharBuffer.java?rev=1307204&r1=1307203&r2=1307204&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/internal/csv/CharBuffer.java (original)
+++ lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/internal/csv/CharBuffer.java Fri Mar 30 01:25:38 2012
@@ -172,7 +172,6 @@ public class CharBuffer {
      * modifying it.
      * This method allows to avoid copying if the caller knows the exact capacity
      * before.
-     * @return
      */
     public char[] getCharacters() {
         if (c.length == length) {
@@ -193,7 +192,6 @@ public class CharBuffer {
     /**
      * Converts the contents of the buffer into a StringBuffer.
      * This method involves copying the new data once!
-     * @return
      */
     public StringBuffer toStringBuffer() {
         StringBuffer sb = new StringBuffer(length);
@@ -204,7 +202,6 @@ public class CharBuffer {
     /**
      * Converts the contents of the buffer into a StringBuffer.
      * This method involves copying the new data once!
-     * @return
      */
     public String toString() {
         return new String(c, 0, length);

Modified: lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVField.java?rev=1307204&r1=1307203&r2=1307204&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVField.java (original)
+++ lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVField.java Fri Mar 30 01:25:38 2012
@@ -104,7 +104,6 @@ public class CSVField {
     /**
      * Does this field override fill ?
      * 
-     * @return
      */
     public boolean overrideFill() {
         return overrideFill;

Modified: lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/servlet/ZookeeperInfoServlet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/servlet/ZookeeperInfoServlet.java?rev=1307204&r1=1307203&r2=1307204&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/servlet/ZookeeperInfoServlet.java (original)
+++ lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/servlet/ZookeeperInfoServlet.java Fri Mar 30 01:25:38 2012
@@ -18,8 +18,8 @@
 package org.apache.solr.servlet;
 
 import org.apache.lucene.util.BytesRef;
-import org.apache.solr.internal.noggit.CharArr;
-import org.apache.solr.internal.noggit.JSONWriter;
+import org.apache.noggit.CharArr;
+import org.apache.noggit.JSONWriter;
 import org.apache.solr.cloud.ZkController;
 import org.apache.solr.common.cloud.SolrZkClient;
 import org.apache.solr.core.CoreContainer;

Modified: lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/TestGroupingSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/TestGroupingSearch.java?rev=1307204&r1=1307203&r2=1307204&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/TestGroupingSearch.java (original)
+++ lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/TestGroupingSearch.java Fri Mar 30 01:25:38 2012
@@ -18,8 +18,8 @@
 package org.apache.solr;
 
 import org.apache.lucene.search.FieldCache;
-import org.apache.solr.internal.noggit.JSONUtil;
-import org.apache.solr.internal.noggit.ObjectBuilder;
+import org.apache.noggit.JSONUtil;
+import org.apache.noggit.ObjectBuilder;
 import org.apache.solr.common.params.GroupParams;
 import org.apache.solr.request.SolrQueryRequest;
 import org.apache.solr.schema.IndexSchema;

Modified: lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/TestJoin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/TestJoin.java?rev=1307204&r1=1307203&r2=1307204&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/TestJoin.java (original)
+++ lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/TestJoin.java Fri Mar 30 01:25:38 2012
@@ -21,8 +21,8 @@ import org.apache.lucene.search.FieldCac
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.BooleanQuery;
 
-import org.apache.solr.internal.noggit.JSONUtil;
-import org.apache.solr.internal.noggit.ObjectBuilder;
+import org.apache.noggit.JSONUtil;
+import org.apache.noggit.ObjectBuilder;
 import org.apache.solr.common.params.ModifiableSolrParams;
 import org.apache.solr.core.SolrCore;
 import org.apache.solr.handler.JsonUpdateRequestHandler;

Modified: lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java?rev=1307204&r1=1307203&r2=1307204&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java (original)
+++ lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java Fri Mar 30 01:25:38 2012
@@ -17,7 +17,7 @@
 
 package org.apache.solr.request;
 
-import org.apache.solr.internal.noggit.ObjectBuilder;
+import org.apache.noggit.ObjectBuilder;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.params.ModifiableSolrParams;

Modified: lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java?rev=1307204&r1=1307203&r2=1307204&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java (original)
+++ lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java Fri Mar 30 01:25:38 2012
@@ -25,7 +25,7 @@ import org.apache.lucene.index.*;
 import org.apache.lucene.search.*;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.util.BytesRef;
-import org.apache.solr.internal.noggit.ObjectBuilder;
+import org.apache.noggit.ObjectBuilder;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.SolrInputDocument;

Modified: lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/search/TestRecovery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/search/TestRecovery.java?rev=1307204&r1=1307203&r2=1307204&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/search/TestRecovery.java (original)
+++ lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/search/TestRecovery.java Fri Mar 30 01:25:38 2012
@@ -18,8 +18,8 @@ package org.apache.solr.search;
 
 
 import org.apache.lucene.util.BytesRef;
-import org.apache.solr.internal.noggit.JSONUtil;
-import org.apache.solr.internal.noggit.ObjectBuilder;
+import org.apache.noggit.JSONUtil;
+import org.apache.noggit.ObjectBuilder;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.common.util.ByteUtils;
 import org.apache.solr.request.SolrQueryRequest;

Modified: lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/noggit/CharArr.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/noggit/CharArr.java?rev=1307204&r1=1307165&r2=1307204&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/noggit/CharArr.java (original)
+++ lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/noggit/CharArr.java Fri Mar 30 01:25:38 2012
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.solr.internal.noggit;
+package org.apache.noggit;
 
 
 import java.io.IOException;

Modified: lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/noggit/CharUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/noggit/CharUtil.java?rev=1307204&r1=1307165&r2=1307204&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/noggit/CharUtil.java (original)
+++ lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/noggit/CharUtil.java Fri Mar 30 01:25:38 2012
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.solr.internal.noggit;
+package org.apache.noggit;
 
 
 /**

Modified: lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/noggit/JSONParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/noggit/JSONParser.java?rev=1307204&r1=1307165&r2=1307204&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/noggit/JSONParser.java (original)
+++ lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/noggit/JSONParser.java Fri Mar 30 01:25:38 2012
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.solr.internal.noggit;
+package org.apache.noggit;
 
 import java.io.IOException;
 import java.io.Reader;

Modified: lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/noggit/JSONUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/noggit/JSONUtil.java?rev=1307204&r1=1307165&r2=1307204&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/noggit/JSONUtil.java (original)
+++ lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/noggit/JSONUtil.java Fri Mar 30 01:25:38 2012
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.solr.internal.noggit;
+package org.apache.noggit;
 
 /**
  * @author yonik
@@ -43,7 +43,7 @@ public class JSONUtil {
   /**
    * @param o  The object to convert to JSON
    * @param indentSize  The number of space characters to use as an indent (default 2). 0=newlines but no spaces, -1=no indent at all.
-   * @return
+   * @return Given Object converted to its JSON representation using the given indentSize
    */
   public static String toJSON(Object o, int indentSize) {
     CharArr out = new CharArr();

Modified: lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/noggit/JSONWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/noggit/JSONWriter.java?rev=1307204&r1=1307165&r2=1307204&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/noggit/JSONWriter.java (original)
+++ lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/noggit/JSONWriter.java Fri Mar 30 01:25:38 2012
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.solr.internal.noggit;
+package org.apache.noggit;
 
 import java.util.*;
 

Modified: lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/noggit/ObjectBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/noggit/ObjectBuilder.java?rev=1307204&r1=1307165&r2=1307204&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/noggit/ObjectBuilder.java (original)
+++ lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/noggit/ObjectBuilder.java Fri Mar 30 01:25:38 2012
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.solr.internal.noggit;
+package org.apache.noggit;
 
 import java.util.*;
 import java.io.IOException;

Modified: lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/common/cloud/CloudState.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/common/cloud/CloudState.java?rev=1307204&r1=1307203&r2=1307204&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/common/cloud/CloudState.java (original)
+++ lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/common/cloud/CloudState.java Fri Mar 30 01:25:38 2012
@@ -27,7 +27,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import org.apache.solr.internal.noggit.JSONWriter;
+import org.apache.noggit.JSONWriter;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.SolrException.ErrorCode;
 import org.apache.solr.common.cloud.HashPartitioner.Range;

Modified: lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/common/cloud/CoreState.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/common/cloud/CoreState.java?rev=1307204&r1=1307203&r2=1307204&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/common/cloud/CoreState.java (original)
+++ lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/common/cloud/CoreState.java Fri Mar 30 01:25:38 2012
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.solr.internal.noggit.JSONWriter;
+import org.apache.noggit.JSONWriter;
 
 public class CoreState implements JSONWriter.Writable {
 

Modified: lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/common/cloud/Slice.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/common/cloud/Slice.java?rev=1307204&r1=1307203&r2=1307204&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/common/cloud/Slice.java (original)
+++ lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/common/cloud/Slice.java Fri Mar 30 01:25:38 2012
@@ -17,7 +17,7 @@ package org.apache.solr.common.cloud;
  * limitations under the License.
  */
 
-import org.apache.solr.internal.noggit.JSONWriter;
+import org.apache.noggit.JSONWriter;
 
 import java.util.Collections;
 import java.util.HashMap;

Modified: lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/common/cloud/ZkNodeProps.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/common/cloud/ZkNodeProps.java?rev=1307204&r1=1307203&r2=1307204&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/common/cloud/ZkNodeProps.java (original)
+++ lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/common/cloud/ZkNodeProps.java Fri Mar 30 01:25:38 2012
@@ -23,7 +23,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.Map.Entry;
 
-import org.apache.solr.internal.noggit.JSONWriter;
+import org.apache.noggit.JSONWriter;
 
 // Immutable
 public class ZkNodeProps implements JSONWriter.Writable {

Modified: lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java?rev=1307204&r1=1307203&r2=1307204&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java (original)
+++ lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java Fri Mar 30 01:25:38 2012
@@ -32,10 +32,10 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 
-import org.apache.solr.internal.noggit.CharArr;
-import org.apache.solr.internal.noggit.JSONParser;
-import org.apache.solr.internal.noggit.JSONWriter;
-import org.apache.solr.internal.noggit.ObjectBuilder;
+import org.apache.noggit.CharArr;
+import org.apache.noggit.JSONParser;
+import org.apache.noggit.JSONWriter;
+import org.apache.noggit.ObjectBuilder;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.SolrException.ErrorCode;
 import org.apache.solr.common.util.ByteUtils;

Modified: lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/common/util/ByteUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/common/util/ByteUtils.java?rev=1307204&r1=1307203&r2=1307204&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/common/util/ByteUtils.java (original)
+++ lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/common/util/ByteUtils.java Fri Mar 30 01:25:38 2012
@@ -17,7 +17,7 @@
 
 package org.apache.solr.common.util;
 
-import org.apache.solr.internal.noggit.CharArr;
+import org.apache.noggit.CharArr;
 
 public class ByteUtils {
 

Modified: lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java?rev=1307204&r1=1307203&r2=1307204&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java (original)
+++ lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java Fri Mar 30 01:25:38 2012
@@ -16,7 +16,7 @@
  */
 package org.apache.solr.common.util;
 
-import org.apache.solr.internal.noggit.CharArr;
+import org.apache.noggit.CharArr;
 import org.apache.solr.common.SolrDocument;
 import org.apache.solr.common.SolrDocumentList;
 import org.apache.solr.common.SolrInputDocument;