You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/02/05 16:44:50 UTC
svn commit: r1240750 - in /lucene/dev/trunk/lucene/src:
java/org/apache/lucene/codecs/lucene3x/
test-framework/java/org/apache/lucene/codecs/lucene3x/
test-framework/java/org/apache/lucene/codecs/preflexrw/
test-framework/java/org/apache/lucene/util/ t...
Author: rmuir
Date: Sun Feb 5 15:44:49 2012
New Revision: 1240750
URL: http://svn.apache.org/viewvc?rev=1240750&view=rev
Log:
LUCENE-3752: move preflex-rw to lucene3x package (and make 3.x impl details package-private)
Added:
lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/
- copied from r1240735, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/preflexrw/
Removed:
lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/preflexrw/
Modified:
lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFieldInfosFormat.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFieldInfosReader.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFields.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xNormsFormat.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xPostingsFormat.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xSegmentInfosFormat.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xSegmentInfosReader.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xStoredFieldsFormat.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xStoredFieldsReader.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xTermVectorsFormat.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xTermVectorsReader.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermDocs.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermEnum.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermPositions.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/TermInfo.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/TermInfosReader.java
lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWCodec.java
lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWFieldInfosFormat.java
lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWFieldInfosReader.java
lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWFieldInfosWriter.java
lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWFieldsWriter.java
lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWNormsConsumer.java
lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWNormsFormat.java
lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWPostingsFormat.java
lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWSegmentInfosFormat.java
lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWSegmentInfosWriter.java
lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWStoredFieldsFormat.java
lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWStoredFieldsWriter.java
lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWTermVectorsFormat.java
lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWTermVectorsWriter.java
lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/TermInfosWriter.java
lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCase.java
lucene/dev/trunk/lucene/src/test-framework/resources/META-INF/services/org.apache.lucene.codecs.Codec
lucene/dev/trunk/lucene/src/test/org/apache/lucene/codecs/lucene3x/TestImpersonation.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/codecs/lucene3x/TestSurrogates.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/codecs/lucene3x/TestTermInfosReaderIndex.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestMixedCodecs.java
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFieldInfosFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFieldInfosFormat.java?rev=1240750&r1=1240749&r2=1240750&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFieldInfosFormat.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFieldInfosFormat.java Sun Feb 5 15:44:49 2012
@@ -32,7 +32,7 @@ import org.apache.lucene.index.SegmentIn
* @lucene.experimental
*/
@Deprecated
-public class Lucene3xFieldInfosFormat extends FieldInfosFormat {
+class Lucene3xFieldInfosFormat extends FieldInfosFormat {
private final FieldInfosReader reader = new Lucene3xFieldInfosReader();
@Override
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFieldInfosReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFieldInfosReader.java?rev=1240750&r1=1240749&r2=1240750&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFieldInfosReader.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFieldInfosReader.java Sun Feb 5 15:44:49 2012
@@ -37,7 +37,7 @@ import org.apache.lucene.store.IndexInpu
* @deprecated
*/
@Deprecated
-public class Lucene3xFieldInfosReader extends FieldInfosReader {
+class Lucene3xFieldInfosReader extends FieldInfosReader {
/** Extension of field infos */
static final String FIELD_INFOS_EXTENSION = "fnm";
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFields.java?rev=1240750&r1=1240749&r2=1240750&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFields.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFields.java Sun Feb 5 15:44:49 2012
@@ -49,7 +49,7 @@ import org.apache.lucene.util.UnicodeUti
* @deprecated (4.0)
*/
@Deprecated
-public class Lucene3xFields extends FieldsProducer {
+class Lucene3xFields extends FieldsProducer {
private static final boolean DEBUG_SURROGATES = false;
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xNormsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xNormsFormat.java?rev=1240750&r1=1240749&r2=1240750&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xNormsFormat.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xNormsFormat.java Sun Feb 5 15:44:49 2012
@@ -34,7 +34,7 @@ import org.apache.lucene.index.SegmentRe
* @lucene.experimental
*/
@Deprecated
-public class Lucene3xNormsFormat extends NormsFormat {
+class Lucene3xNormsFormat extends NormsFormat {
@Override
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xPostingsFormat.java?rev=1240750&r1=1240749&r2=1240750&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xPostingsFormat.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xPostingsFormat.java Sun Feb 5 15:44:49 2012
@@ -36,7 +36,7 @@ import org.apache.lucene.index.SegmentRe
* @lucene.experimental
*/
@Deprecated
-public class Lucene3xPostingsFormat extends PostingsFormat {
+class Lucene3xPostingsFormat extends PostingsFormat {
/** Extension of terms file */
public static final String TERMS_EXTENSION = "tis";
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xSegmentInfosFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xSegmentInfosFormat.java?rev=1240750&r1=1240749&r2=1240750&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xSegmentInfosFormat.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xSegmentInfosFormat.java Sun Feb 5 15:44:49 2012
@@ -28,7 +28,7 @@ import org.apache.lucene.codecs.SegmentI
* @lucene.experimental
*/
@Deprecated
-public class Lucene3xSegmentInfosFormat extends SegmentInfosFormat {
+class Lucene3xSegmentInfosFormat extends SegmentInfosFormat {
private final SegmentInfosReader reader = new Lucene3xSegmentInfosReader();
@Override
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xSegmentInfosReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xSegmentInfosReader.java?rev=1240750&r1=1240749&r2=1240750&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xSegmentInfosReader.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xSegmentInfosReader.java Sun Feb 5 15:44:49 2012
@@ -23,8 +23,6 @@ import java.util.Map;
import org.apache.lucene.codecs.Codec;
import org.apache.lucene.codecs.SegmentInfosReader;
-// TODO we need a 3x version of stored fields reader
-import org.apache.lucene.codecs.lucene40.Lucene40StoredFieldsReader;
import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.index.IndexFormatTooOldException;
import org.apache.lucene.index.SegmentInfo;
@@ -40,7 +38,7 @@ import org.apache.lucene.store.IOContext
* @deprecated
*/
@Deprecated
-public class Lucene3xSegmentInfosReader extends SegmentInfosReader {
+class Lucene3xSegmentInfosReader extends SegmentInfosReader {
@Override
public void read(Directory directory, String segmentsFileName, ChecksumIndexInput input, SegmentInfos infos, IOContext context) throws IOException {
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xStoredFieldsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xStoredFieldsFormat.java?rev=1240750&r1=1240749&r2=1240750&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xStoredFieldsFormat.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xStoredFieldsFormat.java Sun Feb 5 15:44:49 2012
@@ -30,7 +30,7 @@ import org.apache.lucene.store.IOContext
/** @deprecated */
@Deprecated
-public class Lucene3xStoredFieldsFormat extends StoredFieldsFormat {
+class Lucene3xStoredFieldsFormat extends StoredFieldsFormat {
@Override
public StoredFieldsReader fieldsReader(Directory directory, SegmentInfo si,
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xStoredFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xStoredFieldsReader.java?rev=1240750&r1=1240749&r2=1240750&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xStoredFieldsReader.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xStoredFieldsReader.java Sun Feb 5 15:44:49 2012
@@ -46,7 +46,7 @@ import java.util.Set;
* @deprecated
*/
@Deprecated
-public final class Lucene3xStoredFieldsReader extends StoredFieldsReader implements Cloneable, Closeable {
+final class Lucene3xStoredFieldsReader extends StoredFieldsReader implements Cloneable, Closeable {
private final static int FORMAT_SIZE = 4;
/** Extension of stored fields file */
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xTermVectorsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xTermVectorsFormat.java?rev=1240750&r1=1240749&r2=1240750&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xTermVectorsFormat.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xTermVectorsFormat.java Sun Feb 5 15:44:49 2012
@@ -35,7 +35,7 @@ import org.apache.lucene.store.IOContext
* @lucene.experimental
*/
@Deprecated
-public class Lucene3xTermVectorsFormat extends TermVectorsFormat {
+class Lucene3xTermVectorsFormat extends TermVectorsFormat {
@Override
public TermVectorsReader vectorsReader(Directory directory,SegmentInfo segmentInfo, FieldInfos fieldInfos, IOContext context) throws IOException {
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xTermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xTermVectorsReader.java?rev=1240750&r1=1240749&r2=1240750&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xTermVectorsReader.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xTermVectorsReader.java Sun Feb 5 15:44:49 2012
@@ -48,7 +48,7 @@ import org.apache.lucene.util.IOUtils;
/** @deprecated */
@Deprecated
-public class Lucene3xTermVectorsReader extends TermVectorsReader {
+class Lucene3xTermVectorsReader extends TermVectorsReader {
// NOTE: if you make a new format, it must be larger than
// the current format
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermDocs.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermDocs.java?rev=1240750&r1=1240749&r2=1240750&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermDocs.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermDocs.java Sun Feb 5 15:44:49 2012
@@ -30,7 +30,7 @@ import org.apache.lucene.util.Bits;
/** @deprecated (4.0)
* @lucene.experimental */
@Deprecated
-public class SegmentTermDocs {
+class SegmentTermDocs {
//protected SegmentReader parent;
private final FieldInfos fieldInfos;
private final TermInfosReader tis;
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermEnum.java?rev=1240750&r1=1240749&r2=1240750&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermEnum.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermEnum.java Sun Feb 5 15:44:49 2012
@@ -31,7 +31,7 @@ import org.apache.lucene.index.IndexForm
* @lucene.experimental */
@Deprecated
-public final class SegmentTermEnum implements Cloneable {
+final class SegmentTermEnum implements Cloneable {
private IndexInput input;
FieldInfos fieldInfos;
long size;
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermPositions.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermPositions.java?rev=1240750&r1=1240749&r2=1240750&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermPositions.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermPositions.java Sun Feb 5 15:44:49 2012
@@ -29,7 +29,7 @@ import org.apache.lucene.store.IndexInpu
* @deprecated (4.0)
*/
@Deprecated
-public final class SegmentTermPositions
+final class SegmentTermPositions
extends SegmentTermDocs {
private IndexInput proxStream;
private IndexInput proxStreamOrig;
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/TermInfo.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/TermInfo.java?rev=1240750&r1=1240749&r2=1240750&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/TermInfo.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/TermInfo.java Sun Feb 5 15:44:49 2012
@@ -23,7 +23,7 @@ package org.apache.lucene.codecs.lucene3
* indexing. */
@Deprecated
-public class TermInfo {
+class TermInfo {
/** The number of documents which contain the term. */
public int docFreq = 0;
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/TermInfosReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/TermInfosReader.java?rev=1240750&r1=1240749&r2=1240750&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/TermInfosReader.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/codecs/lucene3x/TermInfosReader.java Sun Feb 5 15:44:49 2012
@@ -38,7 +38,7 @@ import org.apache.lucene.util.DoubleBarr
* @lucene.experimental
*/
@Deprecated
-public final class TermInfosReader {
+final class TermInfosReader {
private final Directory directory;
private final String segment;
private final FieldInfos fieldInfos;
Modified: lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWCodec.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWCodec.java?rev=1240750&r1=1240735&r2=1240750&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWCodec.java (original)
+++ lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWCodec.java Sun Feb 5 15:44:49 2012
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.preflexrw;
+package org.apache.lucene.codecs.lucene3x;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -26,10 +26,7 @@ import org.apache.lucene.codecs.Postings
import org.apache.lucene.codecs.SegmentInfosFormat;
import org.apache.lucene.codecs.StoredFieldsFormat;
import org.apache.lucene.codecs.TermVectorsFormat;
-import org.apache.lucene.codecs.lucene3x.Lucene3xCodec;
-import org.apache.lucene.codecs.lucene3x.Lucene3xNormsFormat;
import org.apache.lucene.codecs.lucene40.Lucene40LiveDocsFormat;
-import org.apache.lucene.codecs.lucene40.Lucene40StoredFieldsFormat;
import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.index.SegmentInfo;
import org.apache.lucene.util.LuceneTestCase;
Modified: lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWFieldInfosFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWFieldInfosFormat.java?rev=1240750&r1=1240735&r2=1240750&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWFieldInfosFormat.java (original)
+++ lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWFieldInfosFormat.java Sun Feb 5 15:44:49 2012
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.preflexrw;
+package org.apache.lucene.codecs.lucene3x;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,14 +20,13 @@ import java.io.IOException;
import org.apache.lucene.codecs.FieldInfosReader;
import org.apache.lucene.codecs.FieldInfosWriter;
-import org.apache.lucene.codecs.lucene3x.Lucene3xFieldInfosFormat;
/**
*
* @lucene.internal
* @lucene.experimental
*/
-public class PreFlexRWFieldInfosFormat extends Lucene3xFieldInfosFormat {
+class PreFlexRWFieldInfosFormat extends Lucene3xFieldInfosFormat {
@Override
public FieldInfosReader getFieldInfosReader() throws IOException {
Modified: lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWFieldInfosReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWFieldInfosReader.java?rev=1240750&r1=1240735&r2=1240750&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWFieldInfosReader.java (original)
+++ lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWFieldInfosReader.java Sun Feb 5 15:44:49 2012
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.preflexrw;
+package org.apache.lucene.codecs.lucene3x;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -36,7 +36,7 @@ import org.apache.lucene.store.IndexInpu
* @lucene.internal
* @lucene.experimental
*/
-public class PreFlexRWFieldInfosReader extends FieldInfosReader {
+class PreFlexRWFieldInfosReader extends FieldInfosReader {
static final int FORMAT_MINIMUM = PreFlexRWFieldInfosWriter.FORMAT_START;
@Override
Modified: lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWFieldInfosWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWFieldInfosWriter.java?rev=1240750&r1=1240735&r2=1240750&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWFieldInfosWriter.java (original)
+++ lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWFieldInfosWriter.java Sun Feb 5 15:44:49 2012
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.preflexrw;
+package org.apache.lucene.codecs.lucene3x;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,7 +31,7 @@ import org.apache.lucene.store.IndexOutp
* @lucene.internal
* @lucene.experimental
*/
-public class PreFlexRWFieldInfosWriter extends FieldInfosWriter {
+class PreFlexRWFieldInfosWriter extends FieldInfosWriter {
// TODO move to test-framework preflex RW?
/** Extension of field infos */
Modified: lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWFieldsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWFieldsWriter.java?rev=1240750&r1=1240735&r2=1240750&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWFieldsWriter.java (original)
+++ lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWFieldsWriter.java Sun Feb 5 15:44:49 2012
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.preflexrw;
+package org.apache.lucene.codecs.lucene3x;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -24,8 +24,6 @@ import org.apache.lucene.codecs.FieldsCo
import org.apache.lucene.codecs.PostingsConsumer;
import org.apache.lucene.codecs.TermStats;
import org.apache.lucene.codecs.TermsConsumer;
-import org.apache.lucene.codecs.lucene3x.Lucene3xPostingsFormat;
-import org.apache.lucene.codecs.lucene3x.TermInfo;
import org.apache.lucene.codecs.lucene40.Lucene40SkipListWriter;
import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.FieldInfo;
Modified: lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWNormsConsumer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWNormsConsumer.java?rev=1240750&r1=1240735&r2=1240750&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWNormsConsumer.java (original)
+++ lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWNormsConsumer.java Sun Feb 5 15:44:49 2012
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.preflexrw;
+package org.apache.lucene.codecs.lucene3x;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
Modified: lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWNormsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWNormsFormat.java?rev=1240750&r1=1240735&r2=1240750&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWNormsFormat.java (original)
+++ lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWNormsFormat.java Sun Feb 5 15:44:49 2012
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.preflexrw;
+package org.apache.lucene.codecs.lucene3x;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -18,14 +18,13 @@ package org.apache.lucene.codecs.preflex
import java.io.IOException;
import org.apache.lucene.codecs.PerDocConsumer;
-import org.apache.lucene.codecs.lucene3x.Lucene3xNormsFormat;
import org.apache.lucene.index.PerDocWriteState;
/**
* @lucene.internal
* @lucene.experimental
*/
-public class PreFlexRWNormsFormat extends Lucene3xNormsFormat {
+class PreFlexRWNormsFormat extends Lucene3xNormsFormat {
@Override
public PerDocConsumer docsConsumer(PerDocWriteState state) throws IOException {
Modified: lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWPostingsFormat.java?rev=1240750&r1=1240735&r2=1240750&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWPostingsFormat.java (original)
+++ lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWPostingsFormat.java Sun Feb 5 15:44:49 2012
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.preflexrw;
+package org.apache.lucene.codecs.lucene3x;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -21,8 +21,6 @@ import java.io.IOException;
import org.apache.lucene.codecs.FieldsConsumer;
import org.apache.lucene.codecs.FieldsProducer;
-import org.apache.lucene.codecs.lucene3x.Lucene3xFields;
-import org.apache.lucene.codecs.lucene3x.Lucene3xPostingsFormat;
import org.apache.lucene.index.SegmentWriteState;
import org.apache.lucene.index.SegmentReadState;
import org.apache.lucene.util.LuceneTestCase;
@@ -32,7 +30,7 @@ import org.apache.lucene.util.LuceneTest
*
* @lucene.experimental
*/
-public class PreFlexRWPostingsFormat extends Lucene3xPostingsFormat {
+class PreFlexRWPostingsFormat extends Lucene3xPostingsFormat {
public PreFlexRWPostingsFormat() {
// NOTE: we impersonate the PreFlex codec so that it can
Modified: lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWSegmentInfosFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWSegmentInfosFormat.java?rev=1240750&r1=1240735&r2=1240750&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWSegmentInfosFormat.java (original)
+++ lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWSegmentInfosFormat.java Sun Feb 5 15:44:49 2012
@@ -1,7 +1,6 @@
-package org.apache.lucene.codecs.preflexrw;
+package org.apache.lucene.codecs.lucene3x;
import org.apache.lucene.codecs.SegmentInfosWriter;
-import org.apache.lucene.codecs.lucene3x.Lucene3xSegmentInfosFormat;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -23,7 +22,7 @@ import org.apache.lucene.codecs.lucene3x
/**
* @lucene.experimental
*/
-public class PreFlexRWSegmentInfosFormat extends Lucene3xSegmentInfosFormat {
+class PreFlexRWSegmentInfosFormat extends Lucene3xSegmentInfosFormat {
private final SegmentInfosWriter writer = new PreFlexRWSegmentInfosWriter();
@Override
Modified: lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWSegmentInfosWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWSegmentInfosWriter.java?rev=1240750&r1=1240735&r2=1240750&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWSegmentInfosWriter.java (original)
+++ lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWSegmentInfosWriter.java Sun Feb 5 15:44:49 2012
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.preflexrw;
+package org.apache.lucene.codecs.lucene3x;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -22,7 +22,6 @@ import java.util.Map;
import java.util.Map.Entry;
import org.apache.lucene.codecs.SegmentInfosWriter;
-import org.apache.lucene.codecs.lucene3x.Lucene3xCodec;
import org.apache.lucene.index.SegmentInfo;
import org.apache.lucene.index.SegmentInfos;
import org.apache.lucene.store.ChecksumIndexOutput;
@@ -36,7 +35,7 @@ import org.apache.lucene.util.IOUtils;
* PreFlex implementation of {@link SegmentInfosWriter}.
* @lucene.experimental
*/
-public class PreFlexRWSegmentInfosWriter extends SegmentInfosWriter {
+class PreFlexRWSegmentInfosWriter extends SegmentInfosWriter {
@Override
public IndexOutput writeInfos(Directory dir, String segmentFileName, String codecID, SegmentInfos infos, IOContext context)
Modified: lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWStoredFieldsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWStoredFieldsFormat.java?rev=1240750&r1=1240735&r2=1240750&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWStoredFieldsFormat.java (original)
+++ lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWStoredFieldsFormat.java Sun Feb 5 15:44:49 2012
@@ -1,13 +1,12 @@
-package org.apache.lucene.codecs.preflexrw;
+package org.apache.lucene.codecs.lucene3x;
import java.io.IOException;
import org.apache.lucene.codecs.StoredFieldsWriter;
-import org.apache.lucene.codecs.lucene3x.Lucene3xStoredFieldsFormat;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IOContext;
-public class PreFlexRWStoredFieldsFormat extends Lucene3xStoredFieldsFormat {
+class PreFlexRWStoredFieldsFormat extends Lucene3xStoredFieldsFormat {
@Override
public StoredFieldsWriter fieldsWriter(Directory directory, String segment, IOContext context) throws IOException {
Modified: lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWStoredFieldsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWStoredFieldsWriter.java?rev=1240750&r1=1240735&r2=1240750&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWStoredFieldsWriter.java (original)
+++ lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWStoredFieldsWriter.java Sun Feb 5 15:44:49 2012
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.preflexrw;
+package org.apache.lucene.codecs.lucene3x;
/**
* Copyright 2004 The Apache Software Foundation
@@ -19,7 +19,6 @@ package org.apache.lucene.codecs.preflex
import java.io.IOException;
import org.apache.lucene.codecs.StoredFieldsWriter;
-import org.apache.lucene.codecs.lucene3x.Lucene3xStoredFieldsReader;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.index.IndexableField;
@@ -30,7 +29,7 @@ import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IOUtils;
/** @lucene.experimental */
-public final class PreFlexRWStoredFieldsWriter extends StoredFieldsWriter {
+final class PreFlexRWStoredFieldsWriter extends StoredFieldsWriter {
private final Directory directory;
private final String segment;
private IndexOutput fieldsStream;
Modified: lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWTermVectorsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWTermVectorsFormat.java?rev=1240750&r1=1240735&r2=1240750&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWTermVectorsFormat.java (original)
+++ lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWTermVectorsFormat.java Sun Feb 5 15:44:49 2012
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.preflexrw;
+package org.apache.lucene.codecs.lucene3x;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -21,15 +21,13 @@ import java.io.IOException;
import org.apache.lucene.codecs.TermVectorsReader;
import org.apache.lucene.codecs.TermVectorsWriter;
-import org.apache.lucene.codecs.lucene3x.Lucene3xTermVectorsFormat;
-import org.apache.lucene.codecs.lucene3x.Lucene3xTermVectorsReader;
import org.apache.lucene.index.FieldInfos;
import org.apache.lucene.index.SegmentInfo;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IOContext;
import org.apache.lucene.util.LuceneTestCase;
-public class PreFlexRWTermVectorsFormat extends Lucene3xTermVectorsFormat {
+class PreFlexRWTermVectorsFormat extends Lucene3xTermVectorsFormat {
@Override
public TermVectorsWriter vectorsWriter(Directory directory, String segment, IOContext context) throws IOException {
Modified: lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWTermVectorsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWTermVectorsWriter.java?rev=1240750&r1=1240735&r2=1240750&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWTermVectorsWriter.java (original)
+++ lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWTermVectorsWriter.java Sun Feb 5 15:44:49 2012
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.preflexrw;
+package org.apache.lucene.codecs.lucene3x;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -21,7 +21,6 @@ import java.io.IOException;
import java.util.Comparator;
import org.apache.lucene.codecs.TermVectorsWriter;
-import org.apache.lucene.codecs.lucene3x.Lucene3xTermVectorsReader;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.store.DataInput;
@@ -33,7 +32,7 @@ import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.StringHelper;
-public final class PreFlexRWTermVectorsWriter extends TermVectorsWriter {
+final class PreFlexRWTermVectorsWriter extends TermVectorsWriter {
private final Directory directory;
private final String segment;
private IndexOutput tvx = null, tvd = null, tvf = null;
Modified: lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/TermInfosWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/TermInfosWriter.java?rev=1240750&r1=1240735&r2=1240750&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/TermInfosWriter.java (original)
+++ lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/TermInfosWriter.java Sun Feb 5 15:44:49 2012
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.preflexrw;
+package org.apache.lucene.codecs.lucene3x;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -21,8 +21,6 @@ package org.apache.lucene.codecs.preflex
import java.io.Closeable;
import java.io.IOException;
-import org.apache.lucene.codecs.lucene3x.Lucene3xPostingsFormat;
-import org.apache.lucene.codecs.lucene3x.TermInfo;
import org.apache.lucene.index.FieldInfos;
import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.store.Directory;
Modified: lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCase.java?rev=1240750&r1=1240749&r2=1240750&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCase.java Sun Feb 5 15:44:49 2012
@@ -36,8 +36,8 @@ import org.apache.lucene.analysis.Analyz
import org.apache.lucene.codecs.Codec;
import org.apache.lucene.codecs.PostingsFormat;
import org.apache.lucene.codecs.appending.AppendingCodec;
+import org.apache.lucene.codecs.lucene3x.PreFlexRWCodec;
import org.apache.lucene.codecs.lucene40.Lucene40Codec;
-import org.apache.lucene.codecs.preflexrw.PreFlexRWCodec;
import org.apache.lucene.codecs.simpletext.SimpleTextCodec;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
Modified: lucene/dev/trunk/lucene/src/test-framework/resources/META-INF/services/org.apache.lucene.codecs.Codec
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test-framework/resources/META-INF/services/org.apache.lucene.codecs.Codec?rev=1240750&r1=1240749&r2=1240750&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test-framework/resources/META-INF/services/org.apache.lucene.codecs.Codec (original)
+++ lucene/dev/trunk/lucene/src/test-framework/resources/META-INF/services/org.apache.lucene.codecs.Codec Sun Feb 5 15:44:49 2012
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.lucene.codecs.preflexrw.PreFlexRWCodec
+org.apache.lucene.codecs.lucene3x.PreFlexRWCodec
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/codecs/lucene3x/TestImpersonation.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/codecs/lucene3x/TestImpersonation.java?rev=1240750&r1=1240749&r2=1240750&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/codecs/lucene3x/TestImpersonation.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/codecs/lucene3x/TestImpersonation.java Sun Feb 5 15:44:49 2012
@@ -18,7 +18,7 @@ package org.apache.lucene.codecs.lucene3
*/
import org.apache.lucene.codecs.Codec;
-import org.apache.lucene.codecs.preflexrw.PreFlexRWCodec;
+import org.apache.lucene.codecs.lucene3x.PreFlexRWCodec;
import org.apache.lucene.util.LuceneTestCase;
/**
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/codecs/lucene3x/TestSurrogates.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/codecs/lucene3x/TestSurrogates.java?rev=1240750&r1=1240749&r2=1240750&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/codecs/lucene3x/TestSurrogates.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/codecs/lucene3x/TestSurrogates.java Sun Feb 5 15:44:49 2012
@@ -18,7 +18,7 @@ package org.apache.lucene.codecs.lucene3
*/
import org.apache.lucene.store.*;
-import org.apache.lucene.codecs.preflexrw.PreFlexRWCodec;
+import org.apache.lucene.codecs.lucene3x.PreFlexRWCodec;
import org.apache.lucene.document.*;
import org.apache.lucene.analysis.*;
import org.apache.lucene.index.*;
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/codecs/lucene3x/TestTermInfosReaderIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/codecs/lucene3x/TestTermInfosReaderIndex.java?rev=1240750&r1=1240749&r2=1240750&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/codecs/lucene3x/TestTermInfosReaderIndex.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/codecs/lucene3x/TestTermInfosReaderIndex.java Sun Feb 5 15:44:49 2012
@@ -28,9 +28,9 @@ import org.apache.lucene.analysis.MockTo
import org.apache.lucene.codecs.Codec;
import org.apache.lucene.codecs.FieldInfosReader;
import org.apache.lucene.codecs.lucene3x.Lucene3xPostingsFormat;
+import org.apache.lucene.codecs.lucene3x.PreFlexRWCodec;
import org.apache.lucene.codecs.lucene3x.SegmentTermEnum;
import org.apache.lucene.codecs.lucene3x.TermInfosReaderIndex;
-import org.apache.lucene.codecs.preflexrw.PreFlexRWCodec;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.StringField;
import org.apache.lucene.index.CorruptIndexException;
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestMixedCodecs.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestMixedCodecs.java?rev=1240750&r1=1240749&r2=1240750&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestMixedCodecs.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestMixedCodecs.java Sun Feb 5 15:44:49 2012
@@ -22,7 +22,7 @@ import java.util.Set;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.codecs.Codec;
-import org.apache.lucene.codecs.preflexrw.PreFlexRWCodec;
+import org.apache.lucene.codecs.lucene3x.PreFlexRWCodec;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.StringField;
import org.apache.lucene.store.Directory;