lucene-java-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From uschind...@apache.org
Subject svn commit: r931278 [1/10] - in /lucene/dev/trunk: lucene/ lucene/backwards/src/ lucene/backwards/src/java/org/apache/lucene/index/ lucene/backwards/src/java/org/apache/lucene/index/codecs/ lucene/backwards/src/java/org/apache/lucene/search/ lucene/bac...
Date Tue, 06 Apr 2010 19:19:36 GMT
Author: uschindler
Date: Tue Apr  6 19:19:27 2010
New Revision: 931278

URL: http://svn.apache.org/viewvc?rev=931278&view=rev
Log:
LUCENE-2370: Reintegrate flex_1458 branch into trunk (revision 931101)

Added:
    lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/index/codecs/
      - copied from r931101, lucene/java/branches/flex_1458/backwards/src/java/org/apache/lucene/index/codecs/
    lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/index/codecs/Codec.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/backwards/src/java/org/apache/lucene/index/codecs/Codec.java
    lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/index/codecs/CodecProvider.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/backwards/src/java/org/apache/lucene/index/codecs/CodecProvider.java
    lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/store/DataInput.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/backwards/src/java/org/apache/lucene/store/DataInput.java
    lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/store/DataOutput.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/backwards/src/java/org/apache/lucene/store/DataOutput.java
    lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/util/BytesRef.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/backwards/src/java/org/apache/lucene/util/BytesRef.java
    lucene/dev/trunk/lucene/contrib/benchmark/conf/basicNRT.alg
      - copied unchanged from r931101, lucene/java/branches/flex_1458/contrib/benchmark/conf/basicNRT.alg
    lucene/dev/trunk/lucene/contrib/benchmark/sortBench.py
      - copied unchanged from r931101, lucene/java/branches/flex_1458/contrib/benchmark/sortBench.py
    lucene/dev/trunk/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiDocMaker.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiDocMaker.java
    lucene/dev/trunk/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LineDocMaker.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LineDocMaker.java
    lucene/dev/trunk/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RollbackIndexTask.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RollbackIndexTask.java
    lucene/dev/trunk/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WaitTask.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WaitTask.java
    lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/misc/LengthNormModifier.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/misc/LengthNormModifier.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttribute.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttribute.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttributeImpl.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttributeImpl.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/tokenattributes/TermToBytesRefAttribute.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/tokenattributes/TermToBytesRefAttribute.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/AllDocsEnum.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/AllDocsEnum.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocsAndPositionsEnum.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/DocsAndPositionsEnum.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocsEnum.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/DocsEnum.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/Fields.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/Fields.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FieldsEnum.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/FieldsEnum.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexFileNameFilter.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/IndexFileNameFilter.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/LegacyFields.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/LegacyFields.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/LegacyFieldsEnum.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/LegacyFieldsEnum.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/LegacySegmentMergeInfo.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/LegacySegmentMergeInfo.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/LegacySegmentMergeQueue.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/LegacySegmentMergeQueue.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/LegacyTerms.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/LegacyTerms.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/MultiDocsAndPositionsEnum.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/MultiDocsAndPositionsEnum.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/MultiDocsEnum.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/MultiDocsEnum.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/MultiFields.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/MultiFields.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/MultiFieldsEnum.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/MultiFieldsEnum.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/MultiTerms.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/MultiTerms.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/MultiTermsEnum.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/MultiTermsEnum.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentReadState.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/SegmentReadState.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/Terms.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/Terms.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermsEnum.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/TermsEnum.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/
      - copied from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/Codec.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/Codec.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/CodecProvider.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/CodecProvider.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/FieldsConsumer.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/FieldsConsumer.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/FieldsProducer.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/FieldsProducer.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/MappingMultiDocsAndPositionsEnum.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/MappingMultiDocsAndPositionsEnum.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/MappingMultiDocsEnum.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/MappingMultiDocsEnum.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/MergeState.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/MergeState.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/MultiLevelSkipListReader.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/MultiLevelSkipListReader.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/MultiLevelSkipListWriter.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/MultiLevelSkipListWriter.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/PostingsConsumer.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/PostingsConsumer.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/TermsConsumer.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/TermsConsumer.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/intblock/
      - copied from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/intblock/FixedIntBlockIndexInput.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/FixedIntBlockIndexInput.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/intblock/FixedIntBlockIndexOutput.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/FixedIntBlockIndexOutput.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/intblock/IntBlockCodec.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/IntBlockCodec.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/intblock/SimpleIntBlockFactory.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/SimpleIntBlockFactory.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/intblock/SimpleIntBlockIndexInput.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/SimpleIntBlockIndexInput.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/intblock/SimpleIntBlockIndexOutput.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/intblock/SimpleIntBlockIndexOutput.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/preflex/
      - copied from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/preflex/PreFlexCodec.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/PreFlexCodec.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/preflex/PreFlexFields.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/PreFlexFields.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/preflex/SegmentTermDocs.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/SegmentTermDocs.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/preflex/SegmentTermEnum.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/SegmentTermEnum.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/preflex/SegmentTermPositions.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/SegmentTermPositions.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/preflex/TermBuffer.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/TermBuffer.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/preflex/TermInfo.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/TermInfo.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/preflex/TermInfosReader.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/preflex/TermInfosReader.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/pulsing/
      - copied from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/pulsing/
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/pulsing/PulsingCodec.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/pulsing/PulsingCodec.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/pulsing/PulsingPostingsReaderImpl.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/pulsing/PulsingPostingsReaderImpl.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/pulsing/PulsingPostingsWriterImpl.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/pulsing/PulsingPostingsWriterImpl.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/sep/
      - copied from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/sep/IntIndexInput.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/IntIndexInput.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/sep/IntIndexOutput.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/IntIndexOutput.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/sep/IntStreamFactory.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/IntStreamFactory.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/sep/SepCodec.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepCodec.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/sep/SepPostingsReaderImpl.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepPostingsReaderImpl.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/sep/SepPostingsWriterImpl.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepPostingsWriterImpl.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/sep/SepSkipListReader.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepSkipListReader.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/sep/SepSkipListWriter.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SepSkipListWriter.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/sep/SingleIntFactory.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SingleIntFactory.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/sep/SingleIntIndexInput.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SingleIntIndexInput.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/sep/SingleIntIndexOutput.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/sep/SingleIntIndexOutput.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/standard/
      - copied from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/standard/DefaultSkipListReader.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/DefaultSkipListReader.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/standard/DefaultSkipListWriter.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/DefaultSkipListWriter.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/standard/DeltaBytesReader.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/DeltaBytesReader.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/standard/DeltaBytesWriter.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/DeltaBytesWriter.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/standard/PagedBytes.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/PagedBytes.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/standard/SimpleStandardTermsIndexReader.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/SimpleStandardTermsIndexReader.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/standard/SimpleStandardTermsIndexWriter.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/SimpleStandardTermsIndexWriter.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/standard/StandardCodec.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardCodec.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/standard/StandardPostingsReader.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardPostingsReader.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/standard/StandardPostingsReaderImpl.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardPostingsReaderImpl.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/standard/StandardPostingsWriter.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardPostingsWriter.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/standard/StandardPostingsWriterImpl.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardPostingsWriterImpl.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/standard/StandardTermsDictReader.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardTermsDictReader.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/standard/StandardTermsDictWriter.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardTermsDictWriter.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/standard/StandardTermsIndexReader.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardTermsIndexReader.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/standard/StandardTermsIndexWriter.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/StandardTermsIndexWriter.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/standard/TermState.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/codecs/standard/TermState.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/AutomatonQuery.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/AutomatonQuery.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/AutomatonTermsEnum.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/AutomatonTermsEnum.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/FilteredTermsEnum.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FilteredTermsEnum.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/FuzzyTermsEnum.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FuzzyTermsEnum.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/PrefixTermsEnum.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/PrefixTermsEnum.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/RegexpQuery.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/RegexpQuery.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/SingleTermsEnum.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/SingleTermsEnum.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/TermRangeTermsEnum.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/TermRangeTermsEnum.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/function/MultiValueSource.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/function/MultiValueSource.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/DataInput.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/DataInput.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/DataOutput.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/DataOutput.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/Bits.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/Bits.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/BitsSlice.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/BitsSlice.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/BytesRef.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/BytesRef.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/CodecUtil.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/CodecUtil.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/DummyConcurrentLock.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/DummyConcurrentLock.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/IntsRef.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/IntsRef.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/MultiBits.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/MultiBits.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/NamedThreadFactory.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/NamedThreadFactory.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/ThreadInterruptedException.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/ThreadInterruptedException.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/automaton/   (props changed)
      - copied from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/automaton/
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/automaton/Automaton.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/automaton/Automaton.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/automaton/AutomatonProvider.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/automaton/AutomatonProvider.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/automaton/BasicAutomata.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/automaton/BasicAutomata.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/automaton/BasicOperations.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/automaton/BasicOperations.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/automaton/Lev1ParametricDescription.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/automaton/Lev1ParametricDescription.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/automaton/Lev2ParametricDescription.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/automaton/Lev2ParametricDescription.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/automaton/LevenshteinAutomata.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/automaton/LevenshteinAutomata.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/automaton/MinimizationOperations.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/automaton/MinimizationOperations.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/automaton/RegExp.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/automaton/RegExp.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/automaton/RunAutomaton.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/automaton/RunAutomaton.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/automaton/SpecialOperations.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/automaton/SpecialOperations.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/automaton/State.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/automaton/State.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/automaton/StatePair.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/automaton/StatePair.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/automaton/Transition.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/automaton/Transition.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/automaton/TransitionComparator.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/automaton/TransitionComparator.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/automaton/createLevAutomata.py
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/automaton/createLevAutomata.py
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/automaton/package.html
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/automaton/package.html
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/packed/
      - copied from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/packed/
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/packed/Direct16.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/packed/Direct16.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/packed/Direct32.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/packed/Direct32.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/packed/Direct64.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/packed/Direct64.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/packed/Direct8.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/packed/Direct8.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/packed/Packed32.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/packed/Packed32.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/packed/Packed64.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/packed/Packed64.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/packed/PackedInts.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/packed/PackedInts.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/packed/PackedReaderIterator.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/packed/PackedReaderIterator.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/packed/PackedWriter.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/packed/PackedWriter.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/packed/package.html
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/packed/package.html
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/TestExternalCodecs.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/test/org/apache/lucene/TestExternalCodecs.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/tokenattributes/TestCharTermAttributeImpl.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/tokenattributes/TestCharTermAttributeImpl.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/FlexTestUtil.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/FlexTestUtil.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestCodecs.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestCodecs.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFlex.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestFlex.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFlexExternalReader.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestFlexExternalReader.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermEnumSurrogate.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestTermEnumSurrogate.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/
      - copied from r931101, lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/codecs/
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/intblock/
      - copied from r931101, lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/codecs/intblock/
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/intblock/TestIntBlockCodec.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/codecs/intblock/TestIntBlockCodec.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/index.30.cfs.zip
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/index.30.cfs.zip
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/index.30.nocfs.zip
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/index.30.nocfs.zip
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestAutomatonQuery.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestAutomatonQuery.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFuzzyQuery2.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestFuzzyQuery2.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiTermQueryBWComp.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestMultiTermQueryBWComp.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestRegexpQuery.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestRegexpQuery.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestRegexpRandom.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestRegexpRandom.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestRegexpRandom2.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestRegexpRandom2.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestWildcardRandom.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestWildcardRandom.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/function/TestValueSource.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/function/TestValueSource.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/fuzzyTestData.txt
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/fuzzyTestData.txt
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/MultiCodecTestCase.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/MultiCodecTestCase.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestUnicodeUtil.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/TestUnicodeUtil.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/automaton/
      - copied from r931101, lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/automaton/
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/automaton/TestBasicOperations.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/automaton/TestBasicOperations.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/automaton/TestLevenshteinAutomata.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/automaton/TestLevenshteinAutomata.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/packed/
      - copied from r931101, lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/packed/
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/packed/TestPackedInts.java
      - copied unchanged from r931101, lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/packed/TestPackedInts.java
Removed:
    lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/analysis/TestNumericTokenStream.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/CharBlockPool.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DefaultSkipListReader.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DefaultSkipListWriter.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FormatPostingsDocsConsumer.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FormatPostingsDocsWriter.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FormatPostingsFieldsConsumer.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FormatPostingsFieldsWriter.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FormatPostingsPositionsConsumer.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FormatPostingsPositionsWriter.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FormatPostingsTermsConsumer.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FormatPostingsTermsWriter.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentMergeInfo.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentMergeQueue.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentTermDocs.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentTermEnum.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentTermPositions.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermBuffer.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermInfo.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermInfosReader.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermInfosWriter.java
Modified:
    lucene/dev/trunk/lucene/   (props changed)
    lucene/dev/trunk/lucene/CHANGES.txt   (contents, props changed)
    lucene/dev/trunk/lucene/LICENSE.txt
    lucene/dev/trunk/lucene/NOTICE.txt
    lucene/dev/trunk/lucene/backwards/src/   (props changed)
    lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/index/SegmentInfo.java
    lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/index/SegmentMerger.java
    lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/index/SegmentReader.java
    lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java   (props changed)
    lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/store/IndexInput.java
    lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/store/IndexOutput.java
    lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/util/UnicodeUtil.java
    lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java   (props changed)
    lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/analysis/tokenattributes/TestTermAttributeImpl.java
    lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/document/TestDateTools.java   (props changed)
    lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/document/TestNumberTools.java   (props changed)
    lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java   (props changed)
    lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/index/TestDoc.java
    lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/index/TestIndexReader.java
    lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/index/TestIndexWriter.java
    lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
    lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/index/TestIndexWriterReader.java
    lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/index/TestLazyProxSkipping.java
    lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java
    lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/index/TestPayloads.java
    lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/index/TestSegmentMerger.java
    lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/index/TestSegmentReader.java
    lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/index/TestSegmentTermDocs.java
    lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/index/TestSegmentTermEnum.java
    lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/index/TestStressIndexing2.java
    lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/search/CheckHits.java
    lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
    lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java
    lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java
    lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/search/TestSort.java
    lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/search/TestTermScorer.java
    lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/search/TestWildcard.java
    lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java   (contents, props changed)
    lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/util/TestNumericUtils.java
    lucene/dev/trunk/lucene/build.xml   (contents, props changed)
    lucene/dev/trunk/lucene/common-build.xml
    lucene/dev/trunk/lucene/contrib/   (props changed)
    lucene/dev/trunk/lucene/contrib/CHANGES.txt   (props changed)
    lucene/dev/trunk/lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
    lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
    lucene/dev/trunk/lucene/contrib/highlighter/src/test/   (props changed)
    lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java   (props changed)
    lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/index/FieldNormModifier.java
    lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java
    lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/index/TermVectorAccessor.java
    lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java
    lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java
    lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/DuplicateFilter.java
    lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/FuzzyLikeThisQuery.java
    lucene/dev/trunk/lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteSort.java
    lucene/dev/trunk/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/CartesianShapeFilter.java
    lucene/dev/trunk/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestCartesian.java
    lucene/dev/trunk/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestDistance.java
    lucene/dev/trunk/lucene/contrib/spellchecker/src/java/org/apache/lucene/search/spell/LuceneDictionary.java
    lucene/dev/trunk/lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SrndPrefixQuery.java
    lucene/dev/trunk/lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SrndTermQuery.java
    lucene/dev/trunk/lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SrndTruncQuery.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/NumericTokenStream.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/Token.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java   (props changed)
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/tokenattributes/TermAttribute.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/tokenattributes/TermAttributeImpl.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/document/CompressionTools.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/AbstractAllTermDocs.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/AllTermDocs.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/ByteBlockPool.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/ByteSliceReader.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/ByteSliceWriter.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/CheckIndex.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/CompoundFileReader.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DirectoryReader.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocFieldProcessor.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocFieldProcessorPerThread.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocInverterPerField.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocInverterPerThread.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FieldInfo.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FieldInfos.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FilterIndexReader.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FreqProxFieldMergeState.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FreqProxTermsWriter.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexFileDeleter.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexFileNames.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexReader.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriterConfig.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/MultiReader.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/MultipleTermPositions.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/ParallelPostingsArray.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/ParallelReader.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/ReadOnlyDirectoryReader.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentInfo.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentInfos.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentMerger.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentReader.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentWriteState.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/StoredFieldsWriter.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/Term.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermDocs.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermEnum.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermPositions.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermVectorsTermsWriterPerField.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermVectorsTermsWriterPerThread.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermVectorsWriter.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermsHashConsumerPerField.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermsHashPerField.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermsHashPerThread.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/ConstantScoreQuery.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/ExactPhraseScorer.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/FieldCache.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/FieldCacheImpl.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/FieldCacheRangeFilter.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/FilteredTermEnum.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/FuzzyQuery.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/FuzzyTermEnum.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/MatchAllDocsQuery.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/MultiPhraseQuery.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/MultiTermQuery.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java   (contents, props changed)
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/NumericRangeFilter.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/NumericRangeQuery.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/PhrasePositions.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/PhraseQuery.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/PhraseScorer.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/PrefixQuery.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/PrefixTermEnum.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/Similarity.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/SingleTermEnum.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/SloppyPhraseScorer.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/TermQuery.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/TermRangeFilter.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/TermRangeQuery.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/TermRangeTermEnum.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/TermScorer.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/WildcardQuery.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/WildcardTermEnum.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/function/ValueSourceQuery.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/spans/SpanTermQuery.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/spans/Spans.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/spans/TermSpans.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/Directory.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/IndexInput.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/IndexOutput.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/ArrayUtil.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/BitVector.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/NumericUtils.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/OpenBitSet.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/RamUsageEstimator.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/ReaderUtil.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/UnicodeUtil.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/TestDemo.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/TestSearchForDuplicates.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java   (props changed)
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestNumericTokenStream.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/tokenattributes/TestSimpleAttributeImpls.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/tokenattributes/TestTermAttributeImpl.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestDateTools.java   (contents, props changed)
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestNumberTools.java   (props changed)
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestAddIndexesNoOptimize.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java   (contents, props changed)
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDoc.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReader.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReaderReopen.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterConfig.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNorms.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestOmitTf.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestPayloads.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentReader.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentTermDocs.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentTermEnum.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressIndexing.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/CheckHits.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/JustCompileSearch.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/QueryUtils.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFuzzyQuery.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPositionIncrement.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPrefixQuery.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSort.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermRangeQuery.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermScorer.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestWildcard.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/function/TestOrdValues.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/store/MockRAMDirectory.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java   (contents, props changed)
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestNumericUtils.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/handler/AnalysisRequestHandler.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/response/PHPSerializedResponseWriter.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/schema/TrieDateField.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/schema/TrieField.java
    lucene/dev/trunk/solr/src/test/org/apache/solr/search/TestDocSet.java

Propchange: lucene/dev/trunk/lucene/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr  6 19:19:27 2010
@@ -1,5 +1,6 @@
+/lucene/java/branches/flex_1458:824912-931101
 /lucene/java/branches/lucene_2_4:748824
-/lucene/java/branches/lucene_2_9:817269-818600,825998,829134,829881,831036,896850,909334
+/lucene/java/branches/lucene_2_9:817269-818600,829134,829881,831036,896850,909334
 /lucene/java/branches/lucene_2_9_back_compat_tests:818601-821336
 /lucene/java/branches/lucene_3_0:880793,896906
-/lucene/java/trunk:924483-925561
+/lucene/java/trunk:924483-924731,924781,925176-925462

Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=931278&r1=931277&r2=931278&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Tue Apr  6 19:19:27 2010
@@ -1,5 +1,79 @@
 Lucene Change Log
 
+======================= Flexible Indexing Branch =======================
+
+Changes in backwards compatibility policy
+
+* LUCENE-1458, LUCENE-2111, LUCENE-2354: Changes from flexible indexing:
+
+  - MultiReader ctor now throws IOException
+
+  - Directory.copy/Directory.copyTo now copies all files (not just
+    index files), since what is and isn't and index file is now
+    dependent on the codecs used. (Mike McCandless)
+
+  - UnicodeUtil now uses BytesRef for UTF-8 output, and some method
+    signatures have changed to CharSequence.  These are internal APIs
+    and subject to change suddenly.  (Robert Muir, Mike McCandless)
+
+  - Positional queries (PhraseQuery, *SpanQuery) will now throw an
+    exception if use them on a field that omits positions during
+    indexing (previously they silently returned no results).
+
+  - FieldCache.(Byte,Short,Int,Long,Float,Double}Parser's API has
+    changed -- each parse method now takes a BytesRef instead of a
+    String.  If you have an existing Parser, a simple way to fix it is
+    invoke BytesRef.utf8ToString, and pass that String to your
+    existing parser.  This will work, but performance would be better
+    if you could fix your parser to instead operate directly on the
+    byte[] in the BytesRef.
+
+  - The internal (experimental) API of NumericUtils changed completely
+    from String to BytesRef. Client code should never use this class,
+    so the change would normally not affect you. If you used some of
+    the methods to inspect terms or create TermQueries out of
+    prefix encoded terms, change to use BytesRef. Please note:
+    Do not use TermQueries to search for single numeric terms.
+    The recommended way is to create a corresponding NumericRangeQuery
+    with upper and lower bound equal and included. TermQueries do not
+    score correct, so the constant score mode of NRQ is the only
+    correct way to handle single value queries.
+  
+  - NumericTokenStream now works directly on byte[] terms. If you
+    plug a TokenFilter on top of this stream, you will likely get
+    an IllegalArgumentException, because the NTS does not support
+    TermAttribute/CharTermAttribute. If you want to further filter
+    or attach Payloads to NTS, use the new NumericTermAttribute.
+
+Bug Fixes
+
+* LUCENE-2222: FixedIntBlockIndexInput incorrectly read one block of
+  0s before the actual data.  (Renaud Delbru via Mike McCandless)
+
+* LUCENE-2344: PostingsConsumer.merge was failing to call finishDoc,
+  which caused corruption for sep codec.  Also fixed several tests to
+  test all 4 core codecs.  (Renaud Delbru via Mike McCandless)
+  
+New features
+
+* LUCENE-1606, LUCENE-2089: Adds AutomatonQuery, a MultiTermQuery that 
+  matches terms against a finite-state machine. Implement WildcardQuery
+  and FuzzyQuery with finite-state methods. Adds RegexpQuery.
+  (Robert Muir, Mike McCandless, Uwe Schindler, Mark Miller)
+
+* LUCENE-1990: Adds internal packed ints implementation, to be used
+  for more efficient storage of int arrays when the values are
+  bounded, for example for storing the terms dict index Toke Toke
+  Eskildsen via Mike McCandless)
+
+* LUCENE-2321: Cutover to a more RAM efficient packed-ints based
+  representation for the in-memory terms dict index.  (Mike
+  McCandless)
+
+* LUCENE-2126: Add new classes for data (de)serialization: DataInput
+  and DataOutput.  IndexInput and IndexOutput extend these new classes.
+  (Michael Busch)
+
 ======================= Trunk (not yet released) =======================
 
 Changes in backwards compatibility policy
@@ -297,8 +371,8 @@ Optimizations
 Build
 
 * LUCENE-2124: Moved the JDK-based collation support from contrib/collation 
-  into core, and moved the ICU-based collation support into contrib/icu.  
-  (Robert Muir)
+   into core, and moved the ICU-based collation support into contrib/icu.  
+   (Robert Muir)
 
 * LUCENE-2326: Removed SVN checkouts for backwards tests. The backwards branch
   is now included in the svn repository using "svn copy" after release.

Propchange: lucene/dev/trunk/lucene/CHANGES.txt
            ('svn:mergeinfo' removed)

Modified: lucene/dev/trunk/lucene/LICENSE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/LICENSE.txt?rev=931278&r1=931277&r2=931278&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/LICENSE.txt (original)
+++ lucene/dev/trunk/lucene/LICENSE.txt Tue Apr  6 19:19:27 2010
@@ -237,4 +237,60 @@ http://www.python.org. Full license is h
 
   http://www.python.org/download/releases/2.4.2/license/
 
+Some code in src/java/org/apache/lucene/util/automaton was
+derived from Brics automaton sources available at
+www.brics.dk/automaton/. Here is the copyright from those sources:
 
+/*
+ * Copyright (c) 2001-2009 Anders Moeller
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+ 
+The levenshtein automata tables in src/java/org/apache/lucene/util/automaton 
+were automatically generated with the moman/finenight FSA package.
+Here is the copyright for those sources:
+
+# Copyright (c) 2010, Jean-Philippe Barrette-LaPierre, <jpb@rrette.com>
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation
+# files (the "Software"), to deal in the Software without
+# restriction, including without limitation the rights to use,
+# copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following
+# conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.

Modified: lucene/dev/trunk/lucene/NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/NOTICE.txt?rev=931278&r1=931277&r2=931278&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/NOTICE.txt (original)
+++ lucene/dev/trunk/lucene/NOTICE.txt Tue Apr  6 19:19:27 2010
@@ -46,3 +46,12 @@ provided by Xiaoping Gao and copyright 2
 ICU4J, (under contrib/icu) is licensed under an MIT styles license
 (contrib/icu/lib/ICU-LICENSE.txt) and Copyright (c) 1995-2008 
 International Business Machines Corporation and others
+
+Brics Automaton (under src/java/org/apache/lucene/util/automaton) is 
+BSD-licensed, created by Anders Møller. See http://www.brics.dk/automaton/
+
+The levenshtein automata tables (under src/java/org/apache/lucene/util/automaton) were
+automatically generated with the moman/finenight FSA library, created by
+Jean-Philippe Barrette-LaPierre. This library is available under an MIT license,
+see http://sites.google.com/site/rrettesite/moman and 
+http://bitbucket.org/jpbarrette/moman/overview/

Propchange: lucene/dev/trunk/lucene/backwards/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Apr  6 19:19:27 2010
@@ -0,0 +1,8 @@
+/lucene/java/branches/flex_1458/backwards/src:824912-931101
+/lucene/java/branches/lucene_2_4/src:748824
+/lucene/java/branches/lucene_2_9/src:817269-818600,825998,829134,829881,831036
+/lucene/java/branches/lucene_2_9_back_compat_tests/src:818601-821336
+/lucene/java/branches/lucene_3_0/src:880754,880793,880823,881216,881317,881376,881473,881549,881820,882467,882890,883076,883080
+/lucene/java/branches/lucene_3_0_back_compat_tests/src:880869-912395
+/lucene/java/trunk/backwards/src:924483-924731,924781,925176-925462
+/lucene/java/trunk/src:881213,881315,881466,881819,882374,882807,882888,882977,883074-883075,885214

Modified: lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/index/SegmentInfo.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/index/SegmentInfo.java?rev=931278&r1=931277&r2=931278&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/index/SegmentInfo.java (original)
+++ lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/index/SegmentInfo.java Tue Apr  6 19:19:27 2010
@@ -21,6 +21,7 @@ import org.apache.lucene.store.Directory
 import org.apache.lucene.store.IndexOutput;
 import org.apache.lucene.store.IndexInput;
 import org.apache.lucene.util.BitVector;
+import org.apache.lucene.index.codecs.Codec;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
@@ -129,6 +130,12 @@ public final class SegmentInfo {
     assert docStoreOffset == -1 || docStoreSegment != null: "dso=" + docStoreOffset + " dss=" + docStoreSegment + " docCount=" + docCount;
   }
 
+  // stub
+  public SegmentInfo(String name, int docCount, Directory dir, boolean isCompoundFile, boolean hasSingleNormFile, 
+                     int docStoreOffset, String docStoreSegment, boolean docStoreIsCompoundFile, boolean hasProx,
+                     Codec codec) {
+  }
+
   /**
    * Copy everything from src SegmentInfo into our instance.
    */

Modified: lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/index/SegmentMerger.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/index/SegmentMerger.java?rev=931278&r1=931277&r2=931278&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/index/SegmentMerger.java (original)
+++ lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/index/SegmentMerger.java Tue Apr  6 19:19:27 2010
@@ -29,6 +29,8 @@ import org.apache.lucene.index.MergePoli
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.IndexInput;
 import org.apache.lucene.store.IndexOutput;
+import org.apache.lucene.index.codecs.Codec;
+import org.apache.lucene.index.codecs.CodecProvider;
 
 /**
  * The SegmentMerger class combines two or more Segments, represented by an IndexReader ({@link #add},
@@ -98,7 +100,12 @@ final class SegmentMerger {
     }
     termIndexInterval = writer.getTermIndexInterval();
   }
-  
+
+  // stub
+  SegmentMerger(Directory dir, int termIndexInterval, String name, MergePolicy.OneMerge merge, CodecProvider codecs) {  
+    checkAbort = null;
+  }
+
   boolean hasProx() {
     return fieldInfos.hasProx();
   }
@@ -171,6 +178,11 @@ final class SegmentMerger {
     }
   }
 
+  // stub
+  final List<String> createCompoundFile(String fileName, SegmentInfo info) {
+    return null;
+  }
+
   final List<String> createCompoundFile(String fileName)
           throws IOException {
     CompoundFileWriter cfsWriter =
@@ -553,6 +565,11 @@ final class SegmentMerger {
     }
   }
 
+  // stub
+  Codec getCodec() {
+    return null;
+  }
+
   private SegmentMergeQueue queue = null;
 
   private final void mergeTerms() throws CorruptIndexException, IOException {

Modified: lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/index/SegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/index/SegmentReader.java?rev=931278&r1=931277&r2=931278&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/index/SegmentReader.java (original)
+++ lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/index/SegmentReader.java Tue Apr  6 19:19:27 2010
@@ -37,6 +37,7 @@ import org.apache.lucene.store.IndexInpu
 import org.apache.lucene.store.IndexOutput;
 import org.apache.lucene.util.BitVector;
 import org.apache.lucene.util.CloseableThreadLocal;
+import org.apache.lucene.index.codecs.CodecProvider;
 
 /** @version $Id */
 /**
@@ -594,6 +595,17 @@ public class SegmentReader extends Index
     return instance;
   }
 
+  // stub
+  public static SegmentReader get(boolean readOnly,
+                                  Directory dir,
+                                  SegmentInfo si,
+                                  int readBufferSize,
+                                  boolean doOpenStores,
+                                  int termInfosIndexDivisor,
+                                  CodecProvider codecs) {
+    return null;
+  }
+
   void openDocStores() throws IOException {
     core.openDocStores(si);
   }

Propchange: lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr  6 19:19:27 2010
@@ -1,6 +1,8 @@
+/lucene/java/branches/flex_1458/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:824912-931101
 /lucene/java/branches/lucene_2_4/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:748824
 /lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:817269-818600,825998,829134,829881,831036
 /lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:818601-821336
 /lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:880754,880793,880823,881216,881317,881376,881473,881549,881820,882467,882890,883076,883080,912383
-/lucene/java/trunk/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:924483-925561
+/lucene/java/branches/lucene_3_0_back_compat_tests/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:880869-912395
+/lucene/java/trunk/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:924483-924731,924781,925176-925462
 /lucene/java/trunk/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:881213,881315,881466,881819,881984,882374,882807,882888,882977,883074-883075,885214,912319,912324,912328,912335,912372

Modified: lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/store/IndexInput.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/store/IndexInput.java?rev=931278&r1=931277&r2=931278&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/store/IndexInput.java (original)
+++ lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/store/IndexInput.java Tue Apr  6 19:19:27 2010
@@ -17,180 +17,14 @@ package org.apache.lucene.store;
  * limitations under the License.
  */
 
-import java.io.IOException;
 import java.io.Closeable;
-import java.util.Map;
-import java.util.HashMap;
+import java.io.IOException;
 
 /** Abstract base class for input from a file in a {@link Directory}.  A
  * random-access input stream.  Used for all Lucene index input operations.
  * @see Directory
  */
-public abstract class IndexInput implements Cloneable,Closeable {
-  private byte[] bytes;                           // used by readString()
-  private char[] chars;                           // used by readModifiedUTF8String()
-  private boolean preUTF8Strings;                 // true if we are reading old (modified UTF8) string format
-
-  /** Reads and returns a single byte.
-   * @see IndexOutput#writeByte(byte)
-   */
-  public abstract byte readByte() throws IOException;
-
-  /** Reads a specified number of bytes into an array at the specified offset.
-   * @param b the array to read bytes into
-   * @param offset the offset in the array to start storing bytes
-   * @param len the number of bytes to read
-   * @see IndexOutput#writeBytes(byte[],int)
-   */
-  public abstract void readBytes(byte[] b, int offset, int len)
-    throws IOException;
-
-  /** Reads a specified number of bytes into an array at the
-   * specified offset with control over whether the read
-   * should be buffered (callers who have their own buffer
-   * should pass in "false" for useBuffer).  Currently only
-   * {@link BufferedIndexInput} respects this parameter.
-   * @param b the array to read bytes into
-   * @param offset the offset in the array to start storing bytes
-   * @param len the number of bytes to read
-   * @param useBuffer set to false if the caller will handle
-   * buffering.
-   * @see IndexOutput#writeBytes(byte[],int)
-   */
-  public void readBytes(byte[] b, int offset, int len, boolean useBuffer)
-    throws IOException
-  {
-    // Default to ignoring useBuffer entirely
-    readBytes(b, offset, len);
-  }
-
-  /** Reads four bytes and returns an int.
-   * @see IndexOutput#writeInt(int)
-   */
-  public int readInt() throws IOException {
-    return ((readByte() & 0xFF) << 24) | ((readByte() & 0xFF) << 16)
-         | ((readByte() & 0xFF) <<  8) |  (readByte() & 0xFF);
-  }
-
-  /** Reads an int stored in variable-length format.  Reads between one and
-   * five bytes.  Smaller values take fewer bytes.  Negative numbers are not
-   * supported.
-   * @see IndexOutput#writeVInt(int)
-   */
-  public int readVInt() throws IOException {
-    byte b = readByte();
-    int i = b & 0x7F;
-    for (int shift = 7; (b & 0x80) != 0; shift += 7) {
-      b = readByte();
-      i |= (b & 0x7F) << shift;
-    }
-    return i;
-  }
-
-  /** Reads eight bytes and returns a long.
-   * @see IndexOutput#writeLong(long)
-   */
-  public long readLong() throws IOException {
-    return (((long)readInt()) << 32) | (readInt() & 0xFFFFFFFFL);
-  }
-
-  /** Reads a long stored in variable-length format.  Reads between one and
-   * nine bytes.  Smaller values take fewer bytes.  Negative numbers are not
-   * supported. */
-  public long readVLong() throws IOException {
-    byte b = readByte();
-    long i = b & 0x7F;
-    for (int shift = 7; (b & 0x80) != 0; shift += 7) {
-      b = readByte();
-      i |= (b & 0x7FL) << shift;
-    }
-    return i;
-  }
-
-  /** Call this if readString should read characters stored
-   *  in the old modified UTF8 format (length in java chars
-   *  and java's modified UTF8 encoding).  This is used for
-   *  indices written pre-2.4 See LUCENE-510 for details. */
-  public void setModifiedUTF8StringsMode() {
-    preUTF8Strings = true;
-  }
-
-  /** Reads a string.
-   * @see IndexOutput#writeString(String)
-   */
-  public String readString() throws IOException {
-    if (preUTF8Strings)
-      return readModifiedUTF8String();
-    int length = readVInt();
-    if (bytes == null || length > bytes.length)
-      bytes = new byte[(int) (length*1.25)];
-    readBytes(bytes, 0, length);
-    return new String(bytes, 0, length, "UTF-8");
-  }
-
-  private String readModifiedUTF8String() throws IOException {
-    int length = readVInt();
-    if (chars == null || length > chars.length)
-      chars = new char[length];
-    readChars(chars, 0, length);
-    return new String(chars, 0, length);
-  }
-
-  /** Reads Lucene's old "modified UTF-8" encoded
-   *  characters into an array.
-   * @param buffer the array to read characters into
-   * @param start the offset in the array to start storing characters
-   * @param length the number of characters to read
-   * @see IndexOutput#writeChars(String,int,int)
-   * @deprecated -- please use readString or readBytes
-   *                instead, and construct the string
-   *                from those utf8 bytes
-   */
-  public void readChars(char[] buffer, int start, int length)
-       throws IOException {
-    final int end = start + length;
-    for (int i = start; i < end; i++) {
-      byte b = readByte();
-      if ((b & 0x80) == 0)
-	buffer[i] = (char)(b & 0x7F);
-      else if ((b & 0xE0) != 0xE0) {
-	buffer[i] = (char)(((b & 0x1F) << 6)
-		 | (readByte() & 0x3F));
-      } else
-	buffer[i] = (char)(((b & 0x0F) << 12)
-		| ((readByte() & 0x3F) << 6)
-	        |  (readByte() & 0x3F));
-    }
-  }
-
-  /**
-   * Expert
-   * 
-   * Similar to {@link #readChars(char[], int, int)} but does not do any conversion operations on the bytes it is reading in.  It still
-   * has to invoke {@link #readByte()} just as {@link #readChars(char[], int, int)} does, but it does not need a buffer to store anything
-   * and it does not have to do any of the bitwise operations, since we don't actually care what is in the byte except to determine
-   * how many more bytes to read
-   * @param length The number of chars to read
-   * @deprecated this method operates on old "modified utf8" encoded
-   *             strings
-   */
-  public void skipChars(int length) throws IOException{
-    for (int i = 0; i < length; i++) {
-      byte b = readByte();
-      if ((b & 0x80) == 0){
-        //do nothing, we only need one byte
-      }
-      else if ((b & 0xE0) != 0xE0) {
-        readByte();//read an additional byte
-      } else{      
-        //read two additional bytes.
-        readByte();
-        readByte();
-      }
-    }
-  }
-  
-
+public abstract class IndexInput extends DataInput implements Cloneable,Closeable {
   /** Closes the stream to further operations. */
   public abstract void close() throws IOException;
 
@@ -207,38 +41,4 @@ public abstract class IndexInput impleme
 
   /** The number of bytes in the file. */
   public abstract long length();
-
-  /** Returns a clone of this stream.
-   *
-   * <p>Clones of a stream access the same data, and are positioned at the same
-   * point as the stream they were cloned from.
-   *
-   * <p>Expert: Subclasses must ensure that clones may be positioned at
-   * different points in the input from each other and from the stream they
-   * were cloned from.
-   */
-  @Override
-  public Object clone() {
-    IndexInput clone = null;
-    try {
-      clone = (IndexInput)super.clone();
-    } catch (CloneNotSupportedException e) {}
-
-    clone.bytes = null;
-    clone.chars = null;
-
-    return clone;
-  }
-
-  public Map<String,String> readStringStringMap() throws IOException {
-    final Map<String,String> map = new HashMap<String,String>();
-    final int count = readInt();
-    for(int i=0;i<count;i++) {
-      final String key = readString();
-      final String val = readString();
-      map.put(key, val);
-    }
-
-    return map;
-  }
-}
+}
\ No newline at end of file



Mime
View raw message