diff --git a/dev-tools/eclipse/dot.classpath b/dev-tools/eclipse/dot.classpath index 6de80f0b85f..5589282b3ec 100644 --- a/dev-tools/eclipse/dot.classpath +++ b/dev-tools/eclipse/dot.classpath @@ -13,7 +13,6 @@ - diff --git a/lucene/contrib/misc/src/resources/META-INF/services/org.apache.lucene.index.codecs.Codec b/lucene/contrib/misc/src/resources/META-INF/services/org.apache.lucene.index.codecs.Codec deleted file mode 100644 index c29837d9289..00000000000 --- a/lucene/contrib/misc/src/resources/META-INF/services/org.apache.lucene.index.codecs.Codec +++ /dev/null @@ -1,16 +0,0 @@ -# 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. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -org.apache.lucene.index.codecs.appending.AppendingCodec diff --git a/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingCodec.java b/lucene/src/java/org/apache/lucene/index/codecs/appending/AppendingCodec.java similarity index 100% rename from lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingCodec.java rename to lucene/src/java/org/apache/lucene/index/codecs/appending/AppendingCodec.java diff --git a/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingPostingsFormat.java b/lucene/src/java/org/apache/lucene/index/codecs/appending/AppendingPostingsFormat.java similarity index 100% rename from lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingPostingsFormat.java rename to lucene/src/java/org/apache/lucene/index/codecs/appending/AppendingPostingsFormat.java diff --git a/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingSegmentInfosFormat.java b/lucene/src/java/org/apache/lucene/index/codecs/appending/AppendingSegmentInfosFormat.java similarity index 100% rename from lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingSegmentInfosFormat.java rename to lucene/src/java/org/apache/lucene/index/codecs/appending/AppendingSegmentInfosFormat.java diff --git a/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingSegmentInfosWriter.java b/lucene/src/java/org/apache/lucene/index/codecs/appending/AppendingSegmentInfosWriter.java similarity index 100% rename from lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingSegmentInfosWriter.java rename to lucene/src/java/org/apache/lucene/index/codecs/appending/AppendingSegmentInfosWriter.java diff --git a/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingTermsDictReader.java b/lucene/src/java/org/apache/lucene/index/codecs/appending/AppendingTermsDictReader.java similarity index 100% rename from lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingTermsDictReader.java rename to lucene/src/java/org/apache/lucene/index/codecs/appending/AppendingTermsDictReader.java diff --git a/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingTermsDictWriter.java b/lucene/src/java/org/apache/lucene/index/codecs/appending/AppendingTermsDictWriter.java similarity index 100% rename from lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingTermsDictWriter.java rename to lucene/src/java/org/apache/lucene/index/codecs/appending/AppendingTermsDictWriter.java diff --git a/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingTermsIndexReader.java b/lucene/src/java/org/apache/lucene/index/codecs/appending/AppendingTermsIndexReader.java similarity index 100% rename from lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingTermsIndexReader.java rename to lucene/src/java/org/apache/lucene/index/codecs/appending/AppendingTermsIndexReader.java diff --git a/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingTermsIndexWriter.java b/lucene/src/java/org/apache/lucene/index/codecs/appending/AppendingTermsIndexWriter.java similarity index 100% rename from lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingTermsIndexWriter.java rename to lucene/src/java/org/apache/lucene/index/codecs/appending/AppendingTermsIndexWriter.java diff --git a/lucene/src/resources/META-INF/services/org.apache.lucene.index.codecs.Codec b/lucene/src/resources/META-INF/services/org.apache.lucene.index.codecs.Codec index de644791164..d87ffb46b06 100644 --- a/lucene/src/resources/META-INF/services/org.apache.lucene.index.codecs.Codec +++ b/lucene/src/resources/META-INF/services/org.apache.lucene.index.codecs.Codec @@ -16,3 +16,4 @@ org.apache.lucene.index.codecs.lucene40.Lucene40Codec org.apache.lucene.index.codecs.lucene3x.Lucene3xCodec org.apache.lucene.index.codecs.simpletext.SimpleTextCodec +org.apache.lucene.index.codecs.appending.AppendingCodec diff --git a/lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCase.java b/lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCase.java index 08c83c8f584..ca44d8d209b 100644 --- a/lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCase.java +++ b/lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCase.java @@ -40,6 +40,7 @@ import org.apache.lucene.document.FieldType; import org.apache.lucene.index.*; import org.apache.lucene.index.codecs.Codec; import org.apache.lucene.index.codecs.PostingsFormat; +import org.apache.lucene.index.codecs.appending.AppendingCodec; import org.apache.lucene.index.codecs.lucene40.Lucene40Codec; import org.apache.lucene.index.codecs.preflexrw.PreFlexRWCodec; import org.apache.lucene.index.codecs.simpletext.SimpleTextCodec; @@ -286,6 +287,8 @@ public abstract class LuceneTestCase extends Assert { PREFLEX_IMPERSONATION_IS_ACTIVE = true; } else if ("SimpleText".equals(TEST_CODEC) || ("random".equals(TEST_CODEC) && randomVal == 9)) { codec = new SimpleTextCodec(); + } else if ("Appending".equals(TEST_CODEC) || ("random".equals(TEST_CODEC) && randomVal == 8)) { + codec = new AppendingCodec(); } else if (!"random".equals(TEST_CODEC)) { codec = Codec.forName(TEST_CODEC); } else if ("random".equals(TEST_POSTINGSFORMAT)) { diff --git a/lucene/contrib/misc/src/test/org/apache/lucene/index/codecs/appending/TestAppendingCodec.java b/lucene/src/test/org/apache/lucene/index/codecs/appending/TestAppendingCodec.java similarity index 100% rename from lucene/contrib/misc/src/test/org/apache/lucene/index/codecs/appending/TestAppendingCodec.java rename to lucene/src/test/org/apache/lucene/index/codecs/appending/TestAppendingCodec.java