You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2011/11/05 13:47:05 UTC

svn commit: r1197949 [1/7] - in /lucene/dev/branches/solrcloud: ./ dev-tools/eclipse/ dev-tools/idea/.idea/ dev-tools/idea/lucene/ dev-tools/idea/lucene/contrib/ dev-tools/idea/lucene/contrib/misc/ dev-tools/maven/ dev-tools/maven/lucene/contrib/misc/ ...

Author: yonik
Date: Sat Nov  5 12:46:53 2011
New Revision: 1197949

URL: http://svn.apache.org/viewvc?rev=1197949&view=rev
Log:
merge trunk

Added:
    lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingCodec.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingCodec.java
    lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingPostingsFormat.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingPostingsFormat.java
    lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingSegmentInfosFormat.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingSegmentInfosFormat.java
    lucene/dev/branches/solrcloud/lucene/contrib/misc/src/resources/
      - copied from r1197868, lucene/dev/trunk/lucene/contrib/misc/src/resources/
    lucene/dev/branches/solrcloud/lucene/contrib/misc/src/resources/META-INF/
      - copied from r1197868, lucene/dev/trunk/lucene/contrib/misc/src/resources/META-INF/
    lucene/dev/branches/solrcloud/lucene/contrib/misc/src/resources/META-INF/services/
      - copied from r1197868, lucene/dev/trunk/lucene/contrib/misc/src/resources/META-INF/services/
    lucene/dev/branches/solrcloud/lucene/contrib/misc/src/resources/META-INF/services/org.apache.lucene.index.codecs.Codec
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/contrib/misc/src/resources/META-INF/services/org.apache.lucene.index.codecs.Codec
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/Codec.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/Codec.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultDocValuesFormat.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/DefaultDocValuesFormat.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultFieldsFormat.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/DefaultFieldsFormat.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultSegmentInfosFormat.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/DefaultSegmentInfosFormat.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DocValuesFormat.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/DocValuesFormat.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/FieldsFormat.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/FieldsFormat.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/PostingsBaseFormat.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/PostingsBaseFormat.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/PostingsFormat.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/PostingsFormat.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/SegmentInfosFormat.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/SegmentInfosFormat.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/
      - copied from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/Lucene3xCodec.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/Lucene3xCodec.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/Lucene3xFields.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/Lucene3xFields.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/Lucene3xPostingsFormat.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/Lucene3xPostingsFormat.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/SegmentTermDocs.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/SegmentTermDocs.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/SegmentTermEnum.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/SegmentTermEnum.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/SegmentTermPositions.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/SegmentTermPositions.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/TermBuffer.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/TermBuffer.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/TermInfo.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/TermInfo.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/TermInfosReader.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/TermInfosReader.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/TermInfosReaderIndex.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/TermInfosReaderIndex.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/package.html
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/package.html
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/
      - copied from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/lucene40/
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/DefaultSkipListReader.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/lucene40/DefaultSkipListReader.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/DefaultSkipListWriter.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/lucene40/DefaultSkipListWriter.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40Codec.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40Codec.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40PostingsBaseFormat.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40PostingsBaseFormat.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40PostingsFormat.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40PostingsFormat.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40PostingsReader.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40PostingsReader.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40PostingsWriter.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40PostingsWriter.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/package.html
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/lucene40/package.html
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/memory/MemoryPostingsFormat.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/memory/MemoryPostingsFormat.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/perfield/
      - copied from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/perfield/
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/perfield/PerFieldPostingsFormat.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/perfield/PerFieldPostingsFormat.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/pulsing/Pulsing40PostingsFormat.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/pulsing/Pulsing40PostingsFormat.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/pulsing/PulsingPostingsFormat.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/pulsing/PulsingPostingsFormat.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextPostingsFormat.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextPostingsFormat.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/CollectionStatistics.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/CollectionStatistics.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/TermStatistics.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/TermStatistics.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/NamedSPILoader.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/NamedSPILoader.java
    lucene/dev/branches/solrcloud/lucene/src/resources/
      - copied from r1197868, lucene/dev/trunk/lucene/src/resources/
    lucene/dev/branches/solrcloud/lucene/src/resources/META-INF/
      - copied from r1197868, lucene/dev/trunk/lucene/src/resources/META-INF/
    lucene/dev/branches/solrcloud/lucene/src/resources/META-INF/services/
      - copied from r1197868, lucene/dev/trunk/lucene/src/resources/META-INF/services/
    lucene/dev/branches/solrcloud/lucene/src/resources/META-INF/services/org.apache.lucene.index.codecs.Codec
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/resources/META-INF/services/org.apache.lucene.index.codecs.Codec
    lucene/dev/branches/solrcloud/lucene/src/resources/META-INF/services/org.apache.lucene.index.codecs.PostingsFormat
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/resources/META-INF/services/org.apache.lucene.index.codecs.PostingsFormat
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/
      - copied from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/
      - copied from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/
      - copied from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/
      - copied from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/analysis/
      - copied from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/analysis/
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/analysis/CollationTestBase.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/analysis/CollationTestBase.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/analysis/MockAnalyzer.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/analysis/MockAnalyzer.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/analysis/MockFixedLengthPayloadFilter.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/analysis/MockFixedLengthPayloadFilter.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/analysis/MockPayloadAnalyzer.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/analysis/MockPayloadAnalyzer.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/analysis/MockTokenFilter.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/analysis/MockTokenFilter.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/analysis/MockTokenizer.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/analysis/MockTokenizer.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/analysis/MockVariableLengthPayloadFilter.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/analysis/MockVariableLengthPayloadFilter.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/analysis/VocabularyAssert.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/analysis/VocabularyAssert.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/
      - copied from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/DocHelper.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/DocHelper.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/MockIndexInput.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/MockIndexInput.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/MockRandomMergePolicy.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/MockRandomMergePolicy.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/RandomCodec.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/RandomCodec.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/RandomIndexWriter.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/RandomIndexWriter.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/codecs/
      - copied from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/codecs/
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/codecs/lucene40ords/
      - copied from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/codecs/lucene40ords/
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/codecs/lucene40ords/Lucene40WithOrds.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/codecs/lucene40ords/Lucene40WithOrds.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/codecs/mockintblock/
      - copied from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/codecs/mockintblock/
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/codecs/mockintblock/MockFixedIntBlockPostingsFormat.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/codecs/mockintblock/MockFixedIntBlockPostingsFormat.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/codecs/mockintblock/MockVariableIntBlockPostingsFormat.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/codecs/mockintblock/MockVariableIntBlockPostingsFormat.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/codecs/mockrandom/
      - copied from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/codecs/mockrandom/
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/codecs/mockrandom/MockRandomPostingsFormat.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/codecs/mockrandom/MockRandomPostingsFormat.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/codecs/mocksep/
      - copied from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/codecs/mocksep/
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/codecs/mocksep/MockSepDocValuesFormat.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/codecs/mocksep/MockSepDocValuesFormat.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/codecs/mocksep/MockSepPostingsFormat.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/codecs/mocksep/MockSepPostingsFormat.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/codecs/mocksep/MockSingleIntFactory.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/codecs/mocksep/MockSingleIntFactory.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/codecs/mocksep/MockSingleIntIndexInput.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/codecs/mocksep/MockSingleIntIndexInput.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/codecs/mocksep/MockSingleIntIndexOutput.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/codecs/mocksep/MockSingleIntIndexOutput.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/codecs/nestedpulsing/
      - copied from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/codecs/nestedpulsing/
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/codecs/nestedpulsing/NestedPulsingPostingsFormat.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/codecs/nestedpulsing/NestedPulsingPostingsFormat.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/codecs/preflexrw/
      - copied from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/codecs/preflexrw/
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/codecs/preflexrw/PreFlexFieldsWriter.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/codecs/preflexrw/PreFlexFieldsWriter.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/codecs/preflexrw/PreFlexRWCodec.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/codecs/preflexrw/PreFlexRWCodec.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/codecs/preflexrw/PreFlexRWPostingsFormat.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/codecs/preflexrw/PreFlexRWPostingsFormat.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/codecs/preflexrw/TermInfosWriter.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/codecs/preflexrw/TermInfosWriter.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/codecs/ramonly/
      - copied from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/codecs/ramonly/
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/codecs/ramonly/RAMOnlyPostingsFormat.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/codecs/ramonly/RAMOnlyPostingsFormat.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/search/
      - copied from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/search/
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/search/AssertingIndexSearcher.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/search/AssertingIndexSearcher.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/search/CachingWrapperFilterHelper.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/search/CachingWrapperFilterHelper.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/search/CheckHits.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/search/CheckHits.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/search/QueryUtils.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/search/QueryUtils.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/search/RandomSimilarityProvider.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/search/RandomSimilarityProvider.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/store/
      - copied from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/store/
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/store/MockDirectoryWrapper.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/store/MockDirectoryWrapper.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/store/MockIndexInputWrapper.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/store/MockIndexInputWrapper.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/store/MockIndexOutputWrapper.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/store/MockIndexOutputWrapper.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/store/MockLockFactoryWrapper.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/store/MockLockFactoryWrapper.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/store/_TestHelper.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/store/_TestHelper.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/util/
      - copied from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/util/
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/util/LineFileDocs.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/util/LineFileDocs.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/util/LuceneJUnitDividingSelector.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/util/LuceneJUnitDividingSelector.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/util/LuceneJUnitResultFormatter.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/util/LuceneJUnitResultFormatter.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCase.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCase.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCaseRunner.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCaseRunner.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/util/SmartRandom.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/util/SmartRandom.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/util/ThreeLongs.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/util/ThreeLongs.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/util/ThrottledIndexOutput.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/util/ThrottledIndexOutput.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/util/_TestIgnoredException.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/util/_TestIgnoredException.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/util/_TestUtil.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/util/_TestUtil.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/util/automaton/
      - copied from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/util/automaton/
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/util/automaton/AutomatonTestUtil.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/util/automaton/AutomatonTestUtil.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/util/automaton/DaciukMihovAutomatonBuilder.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/util/automaton/DaciukMihovAutomatonBuilder.java
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/util/europarl.lines.txt.gz
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/util/europarl.lines.txt.gz
    lucene/dev/branches/solrcloud/lucene/src/test-framework/java/overview.html
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/java/overview.html
    lucene/dev/branches/solrcloud/lucene/src/test-framework/resources/
      - copied from r1197868, lucene/dev/trunk/lucene/src/test-framework/resources/
    lucene/dev/branches/solrcloud/lucene/src/test-framework/resources/META-INF/
      - copied from r1197868, lucene/dev/trunk/lucene/src/test-framework/resources/META-INF/
    lucene/dev/branches/solrcloud/lucene/src/test-framework/resources/META-INF/services/
      - copied from r1197868, lucene/dev/trunk/lucene/src/test-framework/resources/META-INF/services/
    lucene/dev/branches/solrcloud/lucene/src/test-framework/resources/META-INF/services/org.apache.lucene.index.codecs.Codec
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/resources/META-INF/services/org.apache.lucene.index.codecs.Codec
    lucene/dev/branches/solrcloud/lucene/src/test-framework/resources/META-INF/services/org.apache.lucene.index.codecs.PostingsFormat
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test-framework/resources/META-INF/services/org.apache.lucene.index.codecs.PostingsFormat
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterNRTIsCurrent.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterNRTIsCurrent.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/codecs/lucene3x/
      - copied from r1197868, lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/lucene3x/
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/codecs/lucene3x/TestImpersonation.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/lucene3x/TestImpersonation.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/codecs/lucene3x/TestSurrogates.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/lucene3x/TestSurrogates.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/codecs/lucene3x/TestTermInfosReaderIndex.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/lucene3x/TestTermInfosReaderIndex.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/codecs/perfield/
      - copied from r1197868, lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/perfield/
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/codecs/perfield/TestPerFieldPostingsFormat.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/perfield/TestPerFieldPostingsFormat.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/util/TestNamedSPILoader.java
      - copied unchanged from r1197868, lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestNamedSPILoader.java
    lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/core/CodecFactory.java
      - copied unchanged from r1197868, lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CodecFactory.java
    lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/core/DefaultCodecFactory.java
      - copied unchanged from r1197868, lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/DefaultCodecFactory.java
    lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/core/TestCodecSupport.java
      - copied unchanged from r1197868, lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestCodecSupport.java
Removed:
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/PerFieldCodecWrapper.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/SegmentCodecs.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/CodecProvider.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/CoreCodecProvider.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/memory/MemoryCodec.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/preflex/
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/pulsing/PulsingCodec.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextCodec.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/standard/
    lucene/dev/branches/solrcloud/lucene/src/test-framework/org/
    lucene/dev/branches/solrcloud/lucene/src/test-framework/overview.html
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestPerFieldCodecSupport.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/codecs/preflex/
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/similarities/SpoofIndexSearcher.java
    lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/core/CodecProviderFactory.java
    lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/core/SchemaCodecProvider.java
    lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/core/MockCodecProviderFactory.java
    lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/core/TestCodecProviderSupport.java
Modified:
    lucene/dev/branches/solrcloud/   (props changed)
    lucene/dev/branches/solrcloud/dev-tools/eclipse/dot.classpath
    lucene/dev/branches/solrcloud/dev-tools/idea/.idea/compiler.xml
    lucene/dev/branches/solrcloud/dev-tools/idea/lucene/contrib/   (props changed)
    lucene/dev/branches/solrcloud/dev-tools/idea/lucene/contrib/misc/misc.iml
    lucene/dev/branches/solrcloud/dev-tools/idea/lucene/lucene.iml
    lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/misc/pom.xml.template
    lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/spatial/pom.xml.template
    lucene/dev/branches/solrcloud/dev-tools/maven/lucene/src/pom.xml.template
    lucene/dev/branches/solrcloud/dev-tools/maven/lucene/src/test-framework/pom.xml.template
    lucene/dev/branches/solrcloud/dev-tools/maven/pom.xml.template
    lucene/dev/branches/solrcloud/dev-tools/maven/solr/core/pom.xml.template
    lucene/dev/branches/solrcloud/lucene/   (props changed)
    lucene/dev/branches/solrcloud/lucene/CHANGES.txt
    lucene/dev/branches/solrcloud/lucene/MIGRATE.txt
    lucene/dev/branches/solrcloud/lucene/build.xml
    lucene/dev/branches/solrcloud/lucene/common-build.xml
    lucene/dev/branches/solrcloud/lucene/contrib/CHANGES.txt
    lucene/dev/branches/solrcloud/lucene/contrib/contrib-build.xml
    lucene/dev/branches/solrcloud/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java
    lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/IndexSplitter.java
    lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingSegmentInfosWriter.java
    lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingTermsDictReader.java
    lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingTermsIndexReader.java
    lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/store/DirectIOLinuxDirectory.java
    lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/store/WindowsDirectory.java
    lucene/dev/branches/solrcloud/lucene/contrib/misc/src/test/org/apache/lucene/index/TestNRTManager.java
    lucene/dev/branches/solrcloud/lucene/contrib/misc/src/test/org/apache/lucene/index/codecs/appending/TestAppendingCodec.java
    lucene/dev/branches/solrcloud/lucene/contrib/misc/src/test/org/apache/lucene/search/TestSearcherManager.java
    lucene/dev/branches/solrcloud/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java   (props changed)
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/CheckIndex.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DirectoryReader.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocFieldProcessor.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThreadPool.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/FieldInfo.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/FieldInfos.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/FreqProxTermsWriter.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/IndexFileDeleter.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/IndexFileNameFilter.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/IndexFileNames.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/IndexFormatTooNewException.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/IndexFormatTooOldException.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/IndexReader.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/IndexUpgrader.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/IndexWriter.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/IndexWriterConfig.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/IndexableFieldType.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/PerDocWriteState.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/PrefixCodedTerms.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/SegmentCoreReaders.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/SegmentInfo.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/SegmentInfos.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/SegmentMerger.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/SegmentReadState.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/SegmentWriteState.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/StoredFieldsWriter.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/TermVectorsReader.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/BlockTermsReader.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/BlockTermsWriter.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/BlockTreeTermsReader.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/BlockTreeTermsWriter.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultDocValuesConsumer.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultDocValuesProducer.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultFieldsReader.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultFieldsWriter.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultSegmentInfosReader.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultSegmentInfosWriter.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DocValuesReaderBase.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DocValuesWriterBase.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/FieldsProducer.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/FixedGapTermsIndexReader.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/FixedGapTermsIndexWriter.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/MultiLevelSkipListReader.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/PerDocConsumer.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/PerDocValues.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/PostingsReaderBase.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/PostingsWriterBase.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/SegmentInfosReader.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/SegmentInfosWriter.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/TermsIndexReaderBase.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/VariableGapTermsIndexReader.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/VariableGapTermsIndexWriter.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/sep/SepDocValuesConsumer.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/sep/SepDocValuesProducer.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/sep/SepPostingsReader.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/sep/SepPostingsWriter.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextFieldsReader.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextFieldsWriter.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/values/Bytes.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/values/IndexDocValues.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/values/PackedIntValues.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/values/ValueType.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/IndexSearcher.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/MultiPhraseQuery.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/PhraseQuery.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/TermQuery.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/similarities/BM25Similarity.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/similarities/LMSimilarity.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/similarities/MultiSimilarity.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/similarities/Similarity.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/similarities/SimilarityBase.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/similarities/TFIDFSimilarity.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/spans/SpanWeight.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/store/BufferedIndexInput.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/store/ChecksumIndexInput.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/store/CompoundFileDirectory.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/store/CompoundFileWriter.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/store/Directory.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/store/IndexInput.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/store/MMapDirectory.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/store/NIOFSDirectory.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/store/RAMDirectory.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/store/RAMInputStream.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/store/SimpleFSDirectory.java
    lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/CodecUtil.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/TestExternalCodecs.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/Test2BPostings.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/Test2BTerms.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestAddIndexes.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestBinaryTerms.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestCodecs.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestCompoundFile.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestDeletionPolicy.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestDoc.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestDocCount.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestDocTermOrds.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestFieldsReader.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestFlex.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestForTooMuchCloning.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestGlobalFieldNumbers.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexReader.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterCommit.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterConfig.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestLongPostings.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestOmitTf.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestReaderClosed.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestRollingUpdates.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestSegmentTermEnum.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestTermsEnum.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestTermsEnum2.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/codecs/intblock/TestIntBlockCodec.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/codecs/pulsing/Test10KPulsings.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/codecs/pulsing/TestPulsingReuse.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/values/TestDocValuesIndexing.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/values/TestTypePromotion.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/JustCompileSearch.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestDocValuesScoring.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestPrefixRandom.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestRegexpRandom2.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestSearchAfter.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestSearchWithThreads.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestSimilarity.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestSort.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestSubScorerFreqs.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/store/TestBufferedIndexInput.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/store/TestHugeRamFile.java
    lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/util/fst/TestFSTs.java
    lucene/dev/branches/solrcloud/modules/analysis/common/src/test/org/apache/lucene/collation/TestCollationKeyAnalyzer.java
    lucene/dev/branches/solrcloud/modules/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyAnalyzer.java
    lucene/dev/branches/solrcloud/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java
    lucene/dev/branches/solrcloud/modules/facet/src/test/org/apache/lucene/facet/search/TestTopKInEachNodeResultHandler.java
    lucene/dev/branches/solrcloud/modules/facet/src/test/org/apache/lucene/facet/search/sampling/BaseSampleTestTopK.java
    lucene/dev/branches/solrcloud/modules/facet/src/test/org/apache/lucene/util/SlowRAMDirectory.java
    lucene/dev/branches/solrcloud/modules/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java
    lucene/dev/branches/solrcloud/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
    lucene/dev/branches/solrcloud/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/DocFreqValueSource.java
    lucene/dev/branches/solrcloud/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/IDFValueSource.java
    lucene/dev/branches/solrcloud/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxDocValueSource.java
    lucene/dev/branches/solrcloud/modules/queryparser/src/test/org/apache/lucene/queryparser/xml/builders/TestNumericRangeFilterBuilder.java   (props changed)
    lucene/dev/branches/solrcloud/modules/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java
    lucene/dev/branches/solrcloud/modules/suggest/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java
    lucene/dev/branches/solrcloud/modules/suggest/src/test/org/apache/lucene/search/spell/TestPlainTextDictionary.java
    lucene/dev/branches/solrcloud/modules/suggest/src/test/org/apache/lucene/search/spell/TestSpellChecker.java
    lucene/dev/branches/solrcloud/solr/   (props changed)
    lucene/dev/branches/solrcloud/solr/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/solrcloud/solr/LICENSE.txt   (props changed)
    lucene/dev/branches/solrcloud/solr/NOTICE.txt   (props changed)
    lucene/dev/branches/solrcloud/solr/README.txt   (props changed)
    lucene/dev/branches/solrcloud/solr/build.xml   (props changed)
    lucene/dev/branches/solrcloud/solr/client/   (props changed)
    lucene/dev/branches/solrcloud/solr/client/ruby/solr-ruby/solr/conf/solrconfig.xml
    lucene/dev/branches/solrcloud/solr/client/ruby/solr-ruby/test/conf/solrconfig.xml
    lucene/dev/branches/solrcloud/solr/common-build.xml   (props changed)
    lucene/dev/branches/solrcloud/solr/contrib/   (props changed)
    lucene/dev/branches/solrcloud/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java
    lucene/dev/branches/solrcloud/solr/contrib/clustering/src/test-files/   (props changed)
    lucene/dev/branches/solrcloud/solr/contrib/clustering/src/test-files/clustering/solr/conf/solrconfig.xml
    lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler-extras/src/java/   (props changed)
    lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/conf/dataimport-solrconfig.xml
    lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler/src/java/   (props changed)
    lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler/src/test-files/   (props changed)
    lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/contentstream-solrconfig.xml
    lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/dataimport-nodatasource-solrconfig.xml
    lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/dataimport-solrconfig.xml
    lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler/src/test/org/   (props changed)
    lucene/dev/branches/solrcloud/solr/contrib/extraction/src/test-files/extraction/solr/conf/solrconfig.xml
    lucene/dev/branches/solrcloud/solr/contrib/uima/src/java/   (props changed)
    lucene/dev/branches/solrcloud/solr/contrib/uima/src/test-files/   (props changed)
    lucene/dev/branches/solrcloud/solr/contrib/uima/src/test-files/uima/solr/conf/solrconfig.xml
    lucene/dev/branches/solrcloud/solr/core/   (props changed)
    lucene/dev/branches/solrcloud/solr/core/src/java/   (props changed)
    lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/core/IndexReaderFactory.java
    lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/core/SolrConfig.java
    lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/core/SolrCore.java
    lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/core/StandardIndexReaderFactory.java
    lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
    lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java
    lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/schema/FieldType.java
    lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/search/LuceneQueryOptimizer.java
    lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
    lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java
    lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java
    lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
    lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
    lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java
    lucene/dev/branches/solrcloud/solr/core/src/test/   (props changed)
    lucene/dev/branches/solrcloud/solr/core/src/test-files/solr/conf/schema_codec.xml
    lucene/dev/branches/solrcloud/solr/core/src/test-files/solr/conf/solrconfig-elevate.xml
    lucene/dev/branches/solrcloud/solr/core/src/test-files/solr/conf/solrconfig-enableplugin.xml
    lucene/dev/branches/solrcloud/solr/core/src/test-files/solr/conf/solrconfig-master.xml
    lucene/dev/branches/solrcloud/solr/core/src/test-files/solr/conf/solrconfig-master1.xml
    lucene/dev/branches/solrcloud/solr/core/src/test-files/solr/conf/solrconfig-master2.xml
    lucene/dev/branches/solrcloud/solr/core/src/test-files/solr/conf/solrconfig-master3.xml
    lucene/dev/branches/solrcloud/solr/core/src/test-files/solr/conf/solrconfig-repeater.xml
    lucene/dev/branches/solrcloud/solr/core/src/test-files/solr/conf/solrconfig-slave.xml
    lucene/dev/branches/solrcloud/solr/core/src/test-files/solr/conf/solrconfig-slave1.xml
    lucene/dev/branches/solrcloud/solr/core/src/test-files/solr/conf/solrconfig-solcoreproperties.xml
    lucene/dev/branches/solrcloud/solr/core/src/test-files/solr/conf/solrconfig.xml
    lucene/dev/branches/solrcloud/solr/core/src/test-files/solr/conf/solrconfig_codec.xml
    lucene/dev/branches/solrcloud/solr/core/src/test-files/solr/crazy-path-to-config.xml
    lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/schema/TestCollationField.java
    lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java
    lucene/dev/branches/solrcloud/solr/dev-tools/   (props changed)
    lucene/dev/branches/solrcloud/solr/example/   (props changed)
    lucene/dev/branches/solrcloud/solr/example/example-DIH/solr/db/conf/solrconfig.xml
    lucene/dev/branches/solrcloud/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
    lucene/dev/branches/solrcloud/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
    lucene/dev/branches/solrcloud/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
    lucene/dev/branches/solrcloud/solr/example/solr/conf/solrconfig.xml
    lucene/dev/branches/solrcloud/solr/lib/   (props changed)
    lucene/dev/branches/solrcloud/solr/scripts/   (props changed)
    lucene/dev/branches/solrcloud/solr/site/   (props changed)
    lucene/dev/branches/solrcloud/solr/site-src/   (props changed)
    lucene/dev/branches/solrcloud/solr/solrj/   (props changed)
    lucene/dev/branches/solrcloud/solr/solrj/src/java/   (props changed)
    lucene/dev/branches/solrcloud/solr/solrj/src/test-files/solrj/solr/conf/solrconfig-slave1.xml
    lucene/dev/branches/solrcloud/solr/solrj/src/test/org/apache/solr/client/   (props changed)
    lucene/dev/branches/solrcloud/solr/solrj/src/test/org/apache/solr/client/solrj/   (props changed)
    lucene/dev/branches/solrcloud/solr/solrj/src/test/org/apache/solr/common/   (props changed)
    lucene/dev/branches/solrcloud/solr/test-framework/   (props changed)
    lucene/dev/branches/solrcloud/solr/testlogging.properties   (props changed)
    lucene/dev/branches/solrcloud/solr/webapp/   (props changed)

Modified: lucene/dev/branches/solrcloud/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/eclipse/dot.classpath?rev=1197949&r1=1197948&r2=1197949&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/solrcloud/dev-tools/eclipse/dot.classpath Sat Nov  5 12:46:53 2011
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="src" path="lucene/src/test-framework/java"/>
+        <classpathentry kind="src" output="bin.tests-framework" path="lucene/src/test-framework/resources"/>
 	<classpathentry kind="src" path="lucene/src/java"/>
-	<classpathentry kind="src" path="lucene/src/test-framework"/>
+	<classpathentry kind="src" path="lucene/src/resources"/>
 	<classpathentry kind="src" path="lucene/src/test"/>
 	<classpathentry kind="src" path="lucene/contrib/demo/src/java"/>
 	<classpathentry kind="src" path="lucene/contrib/demo/src/resources"/>
@@ -13,6 +15,7 @@
 	<classpathentry kind="src" path="lucene/contrib/memory/src/java"/>
 	<classpathentry kind="src" path="lucene/contrib/memory/src/test"/>
 	<classpathentry kind="src" path="lucene/contrib/misc/src/java"/>
+	<classpathentry kind="src" output="bin.misc" path="lucene/contrib/misc/src/resources"/>
 	<classpathentry kind="src" path="lucene/contrib/misc/src/test"/>
 	<classpathentry kind="src" path="lucene/contrib/sandbox/src/java"/>
 	<classpathentry kind="src" path="lucene/contrib/sandbox/src/test"/>

Modified: lucene/dev/branches/solrcloud/dev-tools/idea/.idea/compiler.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/idea/.idea/compiler.xml?rev=1197949&r1=1197948&r2=1197949&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/idea/.idea/compiler.xml (original)
+++ lucene/dev/branches/solrcloud/dev-tools/idea/.idea/compiler.xml Sat Nov  5 12:46:53 2011
@@ -36,6 +36,7 @@
       <entry name="?*.xsl" />
       <entry name="?*.vm" />
       <entry name="?*.zip" />
+      <entry name="org.apache.lucene.index.codecs*" />
       <entry name="README*" />
     </wildcardResourcePatterns>
   </component>

Modified: lucene/dev/branches/solrcloud/dev-tools/idea/lucene/contrib/misc/misc.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/idea/lucene/contrib/misc/misc.iml?rev=1197949&r1=1197948&r2=1197949&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/idea/lucene/contrib/misc/misc.iml (original)
+++ lucene/dev/branches/solrcloud/dev-tools/idea/lucene/contrib/misc/misc.iml Sat Nov  5 12:46:53 2011
@@ -5,6 +5,7 @@
     <output-test url="file://$MODULE_DIR$/../../build/contrib/misc/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/resources" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
     </content>

Modified: lucene/dev/branches/solrcloud/dev-tools/idea/lucene/lucene.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/idea/lucene/lucene.iml?rev=1197949&r1=1197948&r2=1197949&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/idea/lucene/lucene.iml (original)
+++ lucene/dev/branches/solrcloud/dev-tools/idea/lucene/lucene.iml Sat Nov  5 12:46:53 2011
@@ -5,9 +5,11 @@
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/test-framework/resources" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test-framework/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/resources" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/tools/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test-framework" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
       <excludeFolder url="file://$MODULE_DIR$/dist" />

Modified: lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/misc/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/misc/pom.xml.template?rev=1197949&r1=1197948&r2=1197949&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/misc/pom.xml.template (original)
+++ lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/misc/pom.xml.template Sat Nov  5 12:46:53 2011
@@ -53,6 +53,11 @@
     <outputDirectory>${build-directory}/classes/java</outputDirectory>
     <testOutputDirectory>${build-directory}/classes/test</testOutputDirectory>
     <sourceDirectory>src/java</sourceDirectory>
+    <resources>
+      <resource>
+        <directory>src/resources</directory>
+      </resource>
+    </resources>
     <testSourceDirectory>src/test</testSourceDirectory>
     <testResources>
       <testResource>

Modified: lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/spatial/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/spatial/pom.xml.template?rev=1197949&r1=1197948&r2=1197949&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/spatial/pom.xml.template (original)
+++ lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/spatial/pom.xml.template Sat Nov  5 12:46:53 2011
@@ -38,14 +38,14 @@
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-core</artifactId>
+      <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-test-framework</artifactId>
+      <artifactId>lucene-core</artifactId>
       <version>${project.version}</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

Modified: lucene/dev/branches/solrcloud/dev-tools/maven/lucene/src/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/maven/lucene/src/pom.xml.template?rev=1197949&r1=1197948&r2=1197949&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/maven/lucene/src/pom.xml.template (original)
+++ lucene/dev/branches/solrcloud/dev-tools/maven/lucene/src/pom.xml.template Sat Nov  5 12:46:53 2011
@@ -57,16 +57,24 @@
     <outputDirectory>${build-directory}/classes/java</outputDirectory>
     <testOutputDirectory>${build-directory}/classes/test</testOutputDirectory>
     <sourceDirectory>java</sourceDirectory>
+    <resources>
+      <resource>
+        <directory>resources</directory>
+      </resource>
+    </resources>
     <testSourceDirectory>test</testSourceDirectory>
     <testResources>
       <testResource>
-        <directory>${project.build.testSourceDirectory}</directory>
+        <directory>test-framework/resources</directory>
+      </testResource>
+      <testResource>
+        <directory>test-framework/java</directory>
         <excludes>
           <exclude>**/*.java</exclude>
         </excludes>
       </testResource>
       <testResource>
-        <directory>test-framework</directory>
+        <directory>${project.build.testSourceDirectory}</directory>
         <excludes>
           <exclude>**/*.java</exclude>
         </excludes>

Modified: lucene/dev/branches/solrcloud/dev-tools/maven/lucene/src/test-framework/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/maven/lucene/src/test-framework/pom.xml.template?rev=1197949&r1=1197948&r2=1197949&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/maven/lucene/src/test-framework/pom.xml.template (original)
+++ lucene/dev/branches/solrcloud/dev-tools/maven/lucene/src/test-framework/pom.xml.template Sat Nov  5 12:46:53 2011
@@ -53,9 +53,12 @@
   <build>
     <directory>${build-directory}</directory>
     <outputDirectory>${build-directory}/classes/test-framework</outputDirectory>
-    <sourceDirectory>.</sourceDirectory>
+    <sourceDirectory>java</sourceDirectory>
     <resources>
       <resource>
+        <directory>resources</directory>
+      </resource>
+      <resource>
         <directory>${project.build.sourceDirectory}</directory>
         <excludes>
           <exclude>**/*.java</exclude>

Modified: lucene/dev/branches/solrcloud/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/maven/pom.xml.template?rev=1197949&r1=1197948&r2=1197949&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/solrcloud/dev-tools/maven/pom.xml.template Sat Nov  5 12:46:53 2011
@@ -306,6 +306,11 @@
         <version>2.2</version>
       </dependency>
       <dependency>
+        <groupId>org.eclipse.jdt</groupId>
+        <artifactId>core</artifactId>
+        <version>3.1.1</version>
+      </dependency>
+      <dependency>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>jetty</artifactId>
         <version>${patched.jetty.version}</version>

Modified: lucene/dev/branches/solrcloud/dev-tools/maven/solr/core/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/maven/solr/core/pom.xml.template?rev=1197949&r1=1197948&r2=1197949&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/maven/solr/core/pom.xml.template (original)
+++ lucene/dev/branches/solrcloud/dev-tools/maven/solr/core/pom.xml.template Sat Nov  5 12:46:53 2011
@@ -43,7 +43,13 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
+      <artifactId>solr-commons-csv</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>solr-noggit</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
@@ -107,8 +113,8 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.solr</groupId>
-      <artifactId>solr-commons-csv</artifactId>
+      <groupId>org.eclipse.jdt</groupId>
+      <artifactId>core</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>

Modified: lucene/dev/branches/solrcloud/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/CHANGES.txt?rev=1197949&r1=1197948&r2=1197949&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/solrcloud/lucene/CHANGES.txt Sat Nov  5 12:46:53 2011
@@ -194,6 +194,10 @@ Changes in backwards compatibility polic
   to the Bits interface. This method should never do I/O for performance reasons.
   (Mike McCandless, Uwe Schindler, Robert Muir, Chris Male, Yonik Seeley,
   Jason Rutherglen, Paul Elschot)
+
+* LUCENE-3559: The methods "docFreq" and "maxDoc" on IndexSearcher were removed,
+  as these are no longer used by the scoring system. See MIGRATE.txt for more
+  details.  (Robert Muir)
   
 Changes in Runtime Behavior
 
@@ -215,7 +219,7 @@ Changes in Runtime Behavior
 * LUCENE-2881: FieldInfos is now tracked per segment.  Before it was tracked
   per IndexWriter session, which resulted in FieldInfos that had the FieldInfo
   properties from all previous segments combined. Field numbers are now tracked
-  globally across IndexWriter sessions and persisted into a X.fnx file on
+  globally across IndexWriter sessions and persisted into a _X.fnx file on
   successful commit. The corresponding file format changes are backwards-
   compatible. (Michael Busch, Simon Willnauer)
   
@@ -375,9 +379,8 @@ New features
 * LUCENE-1458, LUCENE-2111: With flexible indexing it is now possible
   for an application to create its own postings codec, to alter how
   fields, terms, docs and positions are encoded into the index.  The
-  standard codec is the default codec.  Both IndexWriter and
-  IndexReader accept a CodecProvider class to obtain codecs for newly
-  written segments as well as existing segments opened for reading.
+  standard codec is the default codec. IndexWriter accepts a Codec
+  class to obtain codecs for newly written segments.
 
 * LUCENE-1458, LUCENE-2111: Some experimental codecs have been added
   for flexible indexing, including pulsing codec (inlines
@@ -403,7 +406,7 @@ New features
 * LUCENE-2489: Added PerFieldCodecWrapper (in oal.index.codecs) which
   lets you set the Codec per field (Mike McCandless)
 
-* LUCENE-2373: Extend CodecProvider to use SegmentInfosWriter and
+* LUCENE-2373: Extend Codec to use SegmentInfosWriter and
   SegmentInfosReader to allow customization of SegmentInfos data.
   (Andrzej Bialecki)
 
@@ -445,10 +448,10 @@ New features
   (i.e. \* or "*")  Custom QueryParser subclasses overriding getRangeQuery()
   will be passed null for any open endpoint. (Adriano Crestani, yonik)
 
-* LUCENE-2742: Add native per-field codec support. CodecProvider lets you now
-  register a codec for each field and which is in turn recorded in the segment
-  and field information. Codecs are maintained on a per-segment basis and be
-  resolved without knowing the actual codec used for writing the segment.
+* LUCENE-2742: Add native per-field postings format support. Codec lets you now
+  register a postings format for each field and which is in turn recorded 
+  into the index. Postings formtas are maintained on a per-segment basis and be
+  resolved without knowing the actual postings format used for writing the segment.
   (Simon Willnauer)
 
 * LUCENE-2741: Add support for multiple codecs that use the same file

Modified: lucene/dev/branches/solrcloud/lucene/MIGRATE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/MIGRATE.txt?rev=1197949&r1=1197948&r2=1197949&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/MIGRATE.txt (original)
+++ lucene/dev/branches/solrcloud/lucene/MIGRATE.txt Sat Nov  5 12:46:53 2011
@@ -395,6 +395,16 @@ LUCENE-1458, LUCENE-2111: Flexible Index
 
   The scorePayload method now takes a BytesRef. It is never null.
 
+* LUCENE-3559: The methods "docFreq" and "maxDoc" on IndexSearcher were removed,
+  as these are no longer used by the scoring system.
+
+  If you were using these casually in your code for reasons unrelated to scoring,
+  call them on the IndexSearcher's reader instead: getIndexReader().
+
+  If you were subclassing IndexSearcher and overriding these methods to alter
+  scoring, override IndexSearcher's termStatistics() and collectionStatistics()
+  methods instead.
+
 * LUCENE-3283: Lucene's core o.a.l.queryParser QueryParsers have been consolidated into module/queryparser,
   where other QueryParsers from the codebase will also be placed.  The following classes were moved:
   - o.a.l.queryParser.CharStream -> o.a.l.queryparser.classic.CharStream

Modified: lucene/dev/branches/solrcloud/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/build.xml?rev=1197949&r1=1197948&r2=1197949&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/build.xml (original)
+++ lucene/dev/branches/solrcloud/lucene/build.xml Sat Nov  5 12:46:53 2011
@@ -30,15 +30,15 @@
   </path>
 
   <path id="test.classpath">
-  	<path refid="classpath"/>
-    <path refid="junit-path"/>
     <pathelement location="${build.dir}/classes/test-framework"/>
+    <path refid="classpath"/>
+    <path refid="junit-path"/>
     <pathelement location="${build.dir}/classes/test"/>
   </path>
 
   <path id="junit.classpath">
-    <path refid="junit-path"/>
     <pathelement location="${build.dir}/classes/test-framework"/>
+    <path refid="junit-path"/>
     <pathelement location="${build.dir}/classes/test"/>
     <pathelement location="${build.dir}/classes/java"/>
     <pathelement path="${java.class.path}"/>
@@ -556,11 +556,11 @@
 	<sequential>
       <mkdir dir="${javadoc.dir}/test-framework"/>
       <invoke-javadoc
-          overview="src/test-framework/overview.html"
+          overview="src/test-framework/java/overview.html"
           destdir="${javadoc.dir}/test-framework"
           title="${Name} ${version} Test Framework API">
         <sources>
-          <packageset dir="src/test-framework"/>
+          <packageset dir="src/test-framework/java"/>
           <link href=""/>
         </sources>
       </invoke-javadoc>

Modified: lucene/dev/branches/solrcloud/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/common-build.xml?rev=1197949&r1=1197948&r2=1197949&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/common-build.xml (original)
+++ lucene/dev/branches/solrcloud/lucene/common-build.xml Sat Nov  5 12:46:53 2011
@@ -83,8 +83,7 @@
     </or>
   </condition>
   <property name="tests.multiplier" value="1" />
-  <property name="tests.codec" value="randomPerField" />
-  <property name="tests.codecprovider" value="random" />
+  <property name="tests.postingsformat" value="random" />
   <property name="tests.locale" value="random" />
   <property name="tests.timezone" value="random" />
   <property name="tests.directory" value="random" />
@@ -473,8 +472,13 @@
   </path>
   
   <target name="compile-test-framework" depends="compile-core">
-  	<compile-test-macro srcdir="${tests-framework.src.dir}" destdir="${common.dir}/build/classes/test-framework"
+  	<compile-test-macro srcdir="${tests-framework.src.dir}/java" destdir="${common.dir}/build/classes/test-framework"
   						test.classpath="test-framework.classpath"/>
+            <!-- Copy the resources folder (if existent) -->
+        <copy todir="${build.dir}/classes/test-framework" includeEmptyDirs="false">
+          <globmapper from="resources/*" to="*" handledirsep="yes"/>
+          <fileset dir="${tests-framework.src.dir}" includes="resources/**"/>
+       </copy>
   </target>
 
   <target name="compile-tools">
@@ -551,9 +555,7 @@
               <!-- directory for formatter lock -->
 	      <sysproperty key="tests.lockdir" value="${tests.lockdir}"/>
               <!-- set the codec tests should run with -->
-	      <sysproperty key="tests.codec" value="${tests.codec}"/>
-              <!-- set the codec provider tests should run with -->
-	      <sysproperty key="tests.codecprovider" value="${tests.codecprovider}"/>
+	      <sysproperty key="tests.postingsformat" value="${tests.postingsformat}"/>
               <!-- set the locale tests should run with -->
 	      <sysproperty key="tests.locale" value="${tests.locale}"/>
               <!-- set the timezone tests should run with -->

Modified: lucene/dev/branches/solrcloud/lucene/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/CHANGES.txt?rev=1197949&r1=1197948&r2=1197949&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/CHANGES.txt (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/CHANGES.txt Sat Nov  5 12:46:53 2011
@@ -88,6 +88,14 @@ Changes in backwards compatibility polic
 
  * LUCENE-3508: Changed some method signatures in decompounding TokenFilters
    to make them no longer use the Token class.  (Uwe Schindler)
+   
+ * LUCENE-3557: The various SpellChecker.indexDictionary methods were removed,
+   and consolidated to one:
+
+   indexDictionary(Dictionary dict, IndexWriterConfig config, boolean optimize)
+   
+   Previously, there was no way to specify an IndexWriterConfig, and some
+   of these methods would sneakily pass 'true' to optimize.  (Robert Muir)
 
 New Features
 

Modified: lucene/dev/branches/solrcloud/lucene/contrib/contrib-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/contrib-build.xml?rev=1197949&r1=1197948&r2=1197949&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/contrib-build.xml (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/contrib-build.xml Sat Nov  5 12:46:53 2011
@@ -39,8 +39,8 @@
   <path id="classpath" refid="base.classpath"/>
   
   <path id="test.base.classpath">
-    <path refid="classpath"/>
     <pathelement location="${common.dir}/build/classes/test-framework"/>
+    <path refid="classpath"/>
     <path refid="junit-path"/>
     <pathelement location="${build.dir}/classes/java"/>
   </path>

Modified: lucene/dev/branches/solrcloud/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java?rev=1197949&r1=1197948&r2=1197949&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java Sat Nov  5 12:46:53 2011
@@ -34,6 +34,7 @@ import org.apache.lucene.document.Field;
 import org.apache.lucene.document.TextField;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.index.codecs.lucene40.Lucene40PostingsFormat;
 import org.apache.lucene.queryparser.classic.QueryParser;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.TopDocs;
@@ -107,7 +108,7 @@ public class MemoryIndexTest extends Bas
     Directory ramdir = newDirectory();
     Analyzer analyzer = randomAnalyzer();
     IndexWriter writer = new IndexWriter(ramdir,
-                                         new IndexWriterConfig(TEST_VERSION_CURRENT, analyzer).setCodecProvider(_TestUtil.alwaysCodec("Standard")));
+                                         new IndexWriterConfig(TEST_VERSION_CURRENT, analyzer).setCodec(_TestUtil.alwaysPostingsFormat(new Lucene40PostingsFormat())));
     Document doc = new Document();
     Field field1 = newField("foo", fooField.toString(), TextField.TYPE_UNSTORED);
     Field field2 = newField("term", termField.toString(), TextField.TYPE_UNSTORED);

Modified: lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/IndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/IndexSplitter.java?rev=1197949&r1=1197948&r2=1197949&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/IndexSplitter.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/IndexSplitter.java Sat Nov  5 12:46:53 2011
@@ -27,7 +27,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.lucene.index.IndexWriter;  // Required for javadocs
-import org.apache.lucene.index.codecs.CodecProvider;
 import org.apache.lucene.store.FSDirectory;
 
 /**
@@ -54,8 +53,6 @@ import org.apache.lucene.store.FSDirecto
  */
 public class IndexSplitter {
   public SegmentInfos infos;
-  
-  private final CodecProvider codecs;
 
   FSDirectory fsDir;
 
@@ -96,17 +93,12 @@ public class IndexSplitter {
       is.split(targetDir, segs.toArray(new String[0]));
     }
   }
-
-  public IndexSplitter(File dir) throws IOException {
-    this(dir, CodecProvider.getDefault());
-  }
   
-  public IndexSplitter(File dir, CodecProvider codecs) throws IOException {
+  public IndexSplitter(File dir) throws IOException {
     this.dir = dir;
-    this.codecs = codecs;
     fsDir = FSDirectory.open(dir);
-    infos = new SegmentInfos(codecs);
-    infos.read(fsDir, codecs);
+    infos = new SegmentInfos();
+    infos.read(fsDir);
   }
 
   public void listSegments() throws IOException {
@@ -140,13 +132,13 @@ public class IndexSplitter {
       infos.remove(idx);
     }
     infos.changed();
-    infos.commit(fsDir);
+    infos.commit(fsDir, infos.codecFormat());
   }
 
   public void split(File destDir, String[] segs) throws IOException {
     destDir.mkdirs();
     FSDirectory destFSDir = FSDirectory.open(destDir);
-    SegmentInfos destInfos = new SegmentInfos(codecs);
+    SegmentInfos destInfos = new SegmentInfos();
     destInfos.counter = infos.counter;
     for (String n : segs) {
       SegmentInfo info = getInfo(n);
@@ -160,7 +152,7 @@ public class IndexSplitter {
       }
     }
     destInfos.changed();
-    destInfos.commit(destFSDir);
+    destInfos.commit(destFSDir, infos.codecFormat());
     // System.out.println("destDir:"+destDir.getAbsolutePath());
   }
 

Modified: lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingSegmentInfosWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingSegmentInfosWriter.java?rev=1197949&r1=1197948&r2=1197949&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingSegmentInfosWriter.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingSegmentInfosWriter.java Sat Nov  5 12:46:53 2011
@@ -20,8 +20,6 @@ package org.apache.lucene.index.codecs.a
 import java.io.IOException;
 
 import org.apache.lucene.index.codecs.DefaultSegmentInfosWriter;
-import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.IOContext;
 import org.apache.lucene.store.IndexOutput;
 
 public class AppendingSegmentInfosWriter extends DefaultSegmentInfosWriter {

Modified: lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingTermsDictReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingTermsDictReader.java?rev=1197949&r1=1197948&r2=1197949&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingTermsDictReader.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingTermsDictReader.java Sat Nov  5 12:46:53 2011
@@ -34,9 +34,9 @@ public class AppendingTermsDictReader ex
   public AppendingTermsDictReader(TermsIndexReaderBase indexReader,
           Directory dir, FieldInfos fieldInfos, String segment,
           PostingsReaderBase postingsReader, IOContext context,
-          int termsCacheSize, int codecId) throws IOException {
+          int termsCacheSize, String segmentSuffix) throws IOException {
     super(indexReader, dir, fieldInfos, segment, postingsReader, context,
-          termsCacheSize, codecId);
+          termsCacheSize, segmentSuffix);
   }
   
   @Override