You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2011/10/01 05:05:07 UTC
svn commit: r1177888 [1/16] - in /lucene/dev/branches/lucene2621: ./
dev-tools/eclipse/ dev-tools/idea/lucene/contrib/ dev-tools/maven/ lucene/
lucene/contrib/ lucene/contrib/demo/src/java/org/apache/lucene/demo/
lucene/contrib/demo/src/java/org/apache...
Author: rmuir
Date: Sat Oct 1 03:04:53 2011
New Revision: 1177888
URL: http://svn.apache.org/viewvc?rev=1177888&view=rev
Log:
merge trunk (1175216:1177887)
Added:
lucene/dev/branches/lucene2621/lucene/contrib/misc/src/java/org/apache/lucene/search/
- copied from r1177887, lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/search/
lucene/dev/branches/lucene2621/lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherManager.java
- copied unchanged from r1177887, lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherManager.java
lucene/dev/branches/lucene2621/lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherWarmer.java
- copied unchanged from r1177887, lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherWarmer.java
lucene/dev/branches/lucene2621/lucene/contrib/misc/src/test/org/apache/lucene/search/TestSearcherManager.java
- copied unchanged from r1177887, lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/search/TestSearcherManager.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/analysis/Analyzer.java
- copied unchanged from r1177887, lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/Analyzer.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/analysis/AnalyzerWrapper.java
- copied unchanged from r1177887, lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/AnalyzerWrapper.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/document/DocumentStoredFieldVisitor.java
- copied unchanged from r1177887, lucene/dev/trunk/lucene/src/java/org/apache/lucene/document/DocumentStoredFieldVisitor.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/DocValuesReaderBase.java
- copied unchanged from r1177887, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/DocValuesReaderBase.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/DocValuesWriterBase.java
- copied unchanged from r1177887, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/DocValuesWriterBase.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/sep/SepDocValuesConsumer.java
- copied unchanged from r1177887, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/sep/SepDocValuesConsumer.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/sep/SepDocValuesProducer.java
- copied unchanged from r1177887, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/sep/SepDocValuesProducer.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/values/PackedIntValues.java
- copied unchanged from r1177887, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/PackedIntValues.java
lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
- copied unchanged from r1177887, lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
lucene/dev/branches/lucene2621/modules/benchmark/lib/commons-compress-1.2.jar
- copied unchanged from r1177887, lucene/dev/trunk/modules/benchmark/lib/commons-compress-1.2.jar
lucene/dev/branches/lucene2621/modules/facet/docs/
- copied from r1177887, lucene/dev/trunk/modules/facet/docs/
lucene/dev/branches/lucene2621/modules/facet/docs/userguide.html
- copied unchanged from r1177887, lucene/dev/trunk/modules/facet/docs/userguide.html
lucene/dev/branches/lucene2621/modules/grouping/CHANGES.txt
- copied unchanged from r1177887, lucene/dev/trunk/modules/grouping/CHANGES.txt
lucene/dev/branches/lucene2621/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxFloatFunction.java
- copied unchanged from r1177887, lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxFloatFunction.java
lucene/dev/branches/lucene2621/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MinFloatFunction.java
- copied unchanged from r1177887, lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/MinFloatFunction.java
lucene/dev/branches/lucene2621/solr/contrib/extraction/lib/commons-compress-1.2.jar
- copied unchanged from r1177887, lucene/dev/trunk/solr/contrib/extraction/lib/commons-compress-1.2.jar
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/schema/IndexSchemaRuntimeFieldTest.java
- copied unchanged from r1177887, lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/IndexSchemaRuntimeFieldTest.java
lucene/dev/branches/lucene2621/solr/test-framework/src/java/org/apache/solr/analysis/MockTokenizerFactory.java
- copied unchanged from r1177887, lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/analysis/MockTokenizerFactory.java
Removed:
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/analysis/ReusableAnalyzerBase.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/DocumentStoredFieldVisitor.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/values/IntsImpl.java
lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/codecs/mockrandom/MockRandomDocValuesCodec.java
lucene/dev/branches/lucene2621/modules/benchmark/lib/commons-compress-1.1.jar
lucene/dev/branches/lucene2621/solr/contrib/extraction/lib/commons-compress-1.1.jar
Modified:
lucene/dev/branches/lucene2621/ (props changed)
lucene/dev/branches/lucene2621/dev-tools/eclipse/dot.classpath
lucene/dev/branches/lucene2621/dev-tools/idea/lucene/contrib/ (props changed)
lucene/dev/branches/lucene2621/dev-tools/maven/pom.xml.template
lucene/dev/branches/lucene2621/lucene/ (props changed)
lucene/dev/branches/lucene2621/lucene/CHANGES.txt
lucene/dev/branches/lucene2621/lucene/MIGRATE.txt
lucene/dev/branches/lucene2621/lucene/common-build.xml
lucene/dev/branches/lucene2621/lucene/contrib/CHANGES.txt
lucene/dev/branches/lucene2621/lucene/contrib/demo/src/java/org/apache/lucene/demo/IndexFiles.java
lucene/dev/branches/lucene2621/lucene/contrib/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java
lucene/dev/branches/lucene2621/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/Highlighter.java
lucene/dev/branches/lucene2621/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java
lucene/dev/branches/lucene2621/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
lucene/dev/branches/lucene2621/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java
lucene/dev/branches/lucene2621/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java
lucene/dev/branches/lucene2621/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
lucene/dev/branches/lucene2621/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/OffsetLimitTokenFilterTest.java
lucene/dev/branches/lucene2621/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java
lucene/dev/branches/lucene2621/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java
lucene/dev/branches/lucene2621/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/IndexTimeSynonymTest.java
lucene/dev/branches/lucene2621/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java
lucene/dev/branches/lucene2621/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java
lucene/dev/branches/lucene2621/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
lucene/dev/branches/lucene2621/lucene/contrib/misc/src/java/org/apache/lucene/document/FieldSelectorVisitor.java
lucene/dev/branches/lucene2621/lucene/contrib/misc/src/java/org/apache/lucene/index/NRTManager.java
lucene/dev/branches/lucene2621/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingCodec.java
lucene/dev/branches/lucene2621/lucene/contrib/misc/src/test/org/apache/lucene/index/TestIndexSplitter.java
lucene/dev/branches/lucene2621/lucene/contrib/misc/src/test/org/apache/lucene/index/TestNRTManager.java
lucene/dev/branches/lucene2621/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java
lucene/dev/branches/lucene2621/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java (props changed)
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/analysis/TokenStream.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/document/BinaryField.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/document/Document.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/document/Field.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/document/StringField.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/document/TextField.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/DocFieldProcessor.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/IndexReader.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/IndexWriter.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/PersistentSnapshotDeletionPolicy.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/StoredFieldVisitor.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/Codec.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/DefaultDocValuesConsumer.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/DefaultDocValuesProducer.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/PerDocValues.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/memory/MemoryCodec.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/pulsing/PulsingCodec.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextCodec.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/standard/StandardCodec.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/values/Bytes.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/values/FixedDerefBytesImpl.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/values/FixedSortedBytesImpl.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/values/FixedStraightBytesImpl.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/values/Floats.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/values/IndexDocValuesArray.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/values/Ints.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/values/ValuesEnum.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/values/VarDerefBytesImpl.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/values/VarSortedBytesImpl.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/values/VarStraightBytesImpl.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/search/BooleanQuery.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/search/ConstantScoreQuery.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/search/FilteredQuery.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/search/IndexSearcher.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/search/MatchAllDocsQuery.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/search/MultiPhraseQuery.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/search/PhraseQuery.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/search/QueryTermVector.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/search/QueryWrapperFilter.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/search/SpanQueryFilter.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/search/TermQuery.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/search/Weight.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/search/payloads/PayloadSpanUtil.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/search/spans/FieldMaskingSpanQuery.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/search/spans/SpanMultiTermQueryWrapper.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/search/spans/SpanNearQuery.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/search/spans/SpanNotQuery.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/search/spans/SpanOrQuery.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/search/spans/SpanPositionCheckQuery.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/search/spans/SpanQuery.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/search/spans/SpanTermQuery.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/search/spans/SpanWeight.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/util/ByteBlockPool.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/util/BytesRef.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/util/packed/Direct16.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/util/packed/Direct32.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/util/packed/Direct64.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/util/packed/Direct8.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/util/packed/Packed32.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/util/packed/Packed64.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/util/packed/PackedInts.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/util/packed/PackedWriter.java
lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/analysis/BaseTokenStreamTestCase.java
lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/analysis/CollationTestBase.java
lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/analysis/MockAnalyzer.java
lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/analysis/MockPayloadAnalyzer.java
lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/DocHelper.java
lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/codecs/mockintblock/MockFixedIntBlockCodec.java
lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/codecs/mockintblock/MockVariableIntBlockCodec.java
lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/codecs/mockrandom/MockRandomCodec.java
lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/codecs/mocksep/MockSepCodec.java
lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/search/AssertingIndexSearcher.java
lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/search/QueryUtils.java
lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/util/LineFileDocs.java
lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/util/_TestUtil.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/TestAssertions.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/document/TestBinaryDocument.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/document/TestDocument.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/Test2BPostings.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/Test2BTerms.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestAddIndexes.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestAtomicUpdate.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestBinaryTerms.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDocTermOrds.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDocumentWriter.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestFieldsReader.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestGlobalFieldNumbers.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexReader.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexReaderReopen.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterCommit.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexableField.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestLongPostings.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestNRTThreads.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestOmitNorms.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestPayloads.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestSameTokenSamePosition.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestSegmentInfo.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestTermVectorsReader.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestTermVectorsWriter.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestTermdocPerf.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/values/TestDocValues.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/values/TestDocValuesIndexing.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/search/JustCompileSearch.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/search/TestPhraseQuery.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/search/TestPositionIncrement.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/search/TestSearchAfter.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/search/TestSort.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/search/TestTermRangeQuery.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/search/TestTermScorer.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/search/TestTermVectors.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/search/payloads/PayloadHelper.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/search/spans/JustCompileSearchSpans.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/search/spans/MultiSpansWrapper.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java
lucene/dev/branches/lucene2621/lucene/src/tools/prettify/lang-apollo.js
lucene/dev/branches/lucene2621/lucene/src/tools/prettify/lang-css.js
lucene/dev/branches/lucene2621/lucene/src/tools/prettify/lang-hs.js
lucene/dev/branches/lucene2621/lucene/src/tools/prettify/lang-lisp.js
lucene/dev/branches/lucene2621/lucene/src/tools/prettify/lang-lua.js
lucene/dev/branches/lucene2621/lucene/src/tools/prettify/lang-ml.js
lucene/dev/branches/lucene2621/lucene/src/tools/prettify/lang-proto.js
lucene/dev/branches/lucene2621/lucene/src/tools/prettify/lang-sql.js
lucene/dev/branches/lucene2621/lucene/src/tools/prettify/lang-vb.js
lucene/dev/branches/lucene2621/lucene/src/tools/prettify/lang-wiki.js
lucene/dev/branches/lucene2621/lucene/src/tools/prettify/prettify.css
lucene/dev/branches/lucene2621/lucene/src/tools/prettify/prettify.js
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/ca/CatalanAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/cn/ChineseAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/core/SimpleAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/core/StopAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/core/WhitespaceAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/da/DanishAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/el/GreekAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/eu/BasqueAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/hy/ArmenianAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/id/IndonesianAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/lv/LatvianAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PatternAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PerFieldAnalyzerWrapper.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/ro/RomanianAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapper.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.jflex
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/SUPPLEMENTARY.jflex-macro
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.jflex
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/std31/StandardTokenizerImpl31.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/std31/StandardTokenizerImpl31.jflex
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/std31/UAX29URLEmailTokenizerImpl31.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/std31/UAX29URLEmailTokenizerImpl31.jflex
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymMap.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/util/StopwordAnalyzerBase.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex
lucene/dev/branches/lucene2621/modules/analysis/common/src/java/org/apache/lucene/collation/CollationKeyAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/cn/TestChineseTokenizer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/commongrams/CommonGramsFilterTest.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestAnalyzers.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestStandardAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestUAX29URLEmailTokenizer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilter.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilter.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilter.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemmer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilter.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilter.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilter.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilter.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilter.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilter.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianStemmer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianLightStemFilter.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianStemmer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPerFieldAnalzyerWrapper.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseLightStemFilter.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseMinimalStemFilter.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseStemFilter.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianLightStemFilter.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishLightStemFilter.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSolrSynonymParser.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymMapFilter.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestWordnetSynonymParser.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/collation/TestCollationKeyFilter.java
lucene/dev/branches/lucene2621/modules/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUFoldingFilter.java
lucene/dev/branches/lucene2621/modules/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2Filter.java
lucene/dev/branches/lucene2621/modules/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUTransformFilter.java
lucene/dev/branches/lucene2621/modules/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizer.java
lucene/dev/branches/lucene2621/modules/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyFilter.java
lucene/dev/branches/lucene2621/modules/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/morfologik/src/test/org/apache/lucene/analysis/morfologik/TestMorfologikAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/smartcn/src/test/org/apache/lucene/analysis/cn/smart/TestSmartChineseAnalyzer.java
lucene/dev/branches/lucene2621/modules/analysis/stempel/src/java/org/apache/lucene/analysis/pl/PolishAnalyzer.java
lucene/dev/branches/lucene2621/modules/benchmark/CHANGES.txt
lucene/dev/branches/lucene2621/modules/benchmark/lib/commons-compress-NOTICE.txt
lucene/dev/branches/lucene2621/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java
lucene/dev/branches/lucene2621/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java
lucene/dev/branches/lucene2621/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/StreamUtils.java
lucene/dev/branches/lucene2621/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
lucene/dev/branches/lucene2621/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTaskTest.java
lucene/dev/branches/lucene2621/modules/facet/build.xml
lucene/dev/branches/lucene2621/modules/facet/src/examples/org/apache/lucene/facet/example/association/AssociationIndexer.java
lucene/dev/branches/lucene2621/modules/facet/src/examples/org/apache/lucene/facet/example/merge/TaxonomyMergeUtils.java
lucene/dev/branches/lucene2621/modules/facet/src/examples/org/apache/lucene/facet/example/multiCL/MultiCLIndexer.java
lucene/dev/branches/lucene2621/modules/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleIndexer.java
lucene/dev/branches/lucene2621/modules/facet/src/java/org/apache/lucene/facet/index/CategoryDocumentBuilder.java
lucene/dev/branches/lucene2621/modules/facet/src/java/org/apache/lucene/facet/package.html
lucene/dev/branches/lucene2621/modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/LuceneTaxonomyWriter.java
lucene/dev/branches/lucene2621/modules/facet/src/java/overview.html
lucene/dev/branches/lucene2621/modules/facet/src/test/org/apache/lucene/facet/FacetTestBase.java
lucene/dev/branches/lucene2621/modules/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java
lucene/dev/branches/lucene2621/modules/facet/src/test/org/apache/lucene/facet/search/CategoryListIteratorTest.java
lucene/dev/branches/lucene2621/modules/facet/src/test/org/apache/lucene/facet/search/TestTopKInEachNodeResultHandler.java
lucene/dev/branches/lucene2621/modules/facet/src/test/org/apache/lucene/facet/util/TestScoredDocIDsUtils.java
lucene/dev/branches/lucene2621/modules/grouping/src/java/org/apache/lucene/search/grouping/AbstractFirstPassGroupingCollector.java
lucene/dev/branches/lucene2621/modules/grouping/src/test/org/apache/lucene/search/grouping/TermAllGroupsCollectorTest.java
lucene/dev/branches/lucene2621/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
lucene/dev/branches/lucene2621/modules/join/src/java/org/apache/lucene/search/join/BlockJoinQuery.java
lucene/dev/branches/lucene2621/modules/queries/src/java/org/apache/lucene/queries/BooleanFilter.java
lucene/dev/branches/lucene2621/modules/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java
lucene/dev/branches/lucene2621/modules/queries/src/java/org/apache/lucene/queries/FilterClause.java
lucene/dev/branches/lucene2621/modules/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java
lucene/dev/branches/lucene2621/modules/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java
lucene/dev/branches/lucene2621/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java
lucene/dev/branches/lucene2621/modules/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java
lucene/dev/branches/lucene2621/modules/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java
lucene/dev/branches/lucene2621/modules/queryparser/CHANGES.txt
lucene/dev/branches/lucene2621/modules/queryparser/src/java/org/apache/lucene/queryparser/analyzing/AnalyzingQueryParser.java
lucene/dev/branches/lucene2621/modules/queryparser/src/java/org/apache/lucene/queryparser/classic/ParseException.java
lucene/dev/branches/lucene2621/modules/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserBase.java
lucene/dev/branches/lucene2621/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/AnalyzerQueryNodeProcessor.java
lucene/dev/branches/lucene2621/modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/LikeThisQueryBuilder.java
lucene/dev/branches/lucene2621/modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanOrTermsBuilder.java
lucene/dev/branches/lucene2621/modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermsFilterBuilder.java
lucene/dev/branches/lucene2621/modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermsQueryBuilder.java
lucene/dev/branches/lucene2621/modules/queryparser/src/test/org/apache/lucene/queryparser/analyzing/TestAnalyzingQueryParser.java
lucene/dev/branches/lucene2621/modules/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiAnalyzer.java
lucene/dev/branches/lucene2621/modules/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java
lucene/dev/branches/lucene2621/modules/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiPhraseQueryParsing.java
lucene/dev/branches/lucene2621/modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/precedence/TestPrecedenceQueryParser.java
lucene/dev/branches/lucene2621/modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiAnalyzerQPHelper.java
lucene/dev/branches/lucene2621/modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java
lucene/dev/branches/lucene2621/modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java
lucene/dev/branches/lucene2621/modules/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java
lucene/dev/branches/lucene2621/modules/queryparser/src/test/org/apache/lucene/queryparser/xml/builders/TestNumericRangeFilterBuilder.java (props changed)
lucene/dev/branches/lucene2621/modules/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java
lucene/dev/branches/lucene2621/solr/ (props changed)
lucene/dev/branches/lucene2621/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene2621/solr/LICENSE.txt (props changed)
lucene/dev/branches/lucene2621/solr/NOTICE.txt (props changed)
lucene/dev/branches/lucene2621/solr/README.txt (props changed)
lucene/dev/branches/lucene2621/solr/build.xml (props changed)
lucene/dev/branches/lucene2621/solr/client/ (props changed)
lucene/dev/branches/lucene2621/solr/common-build.xml (props changed)
lucene/dev/branches/lucene2621/solr/contrib/ (props changed)
lucene/dev/branches/lucene2621/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java
lucene/dev/branches/lucene2621/solr/contrib/clustering/src/test-files/ (props changed)
lucene/dev/branches/lucene2621/solr/contrib/clustering/src/test-files/clustering/solr/conf/schema.xml
lucene/dev/branches/lucene2621/solr/contrib/dataimporthandler-extras/src/java/ (props changed)
lucene/dev/branches/lucene2621/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/conf/dataimport-schema-no-unique-key.xml
lucene/dev/branches/lucene2621/solr/contrib/dataimporthandler/src/java/ (props changed)
lucene/dev/branches/lucene2621/solr/contrib/dataimporthandler/src/test-files/ (props changed)
lucene/dev/branches/lucene2621/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/dataimport-schema.xml
lucene/dev/branches/lucene2621/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/dataimport-solr_id-schema.xml
lucene/dev/branches/lucene2621/solr/contrib/dataimporthandler/src/test/org/ (props changed)
lucene/dev/branches/lucene2621/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java
lucene/dev/branches/lucene2621/solr/contrib/extraction/lib/commons-compress-NOTICE.txt
lucene/dev/branches/lucene2621/solr/contrib/extraction/src/test-files/extraction/solr/conf/schema.xml
lucene/dev/branches/lucene2621/solr/contrib/uima/src/java/ (props changed)
lucene/dev/branches/lucene2621/solr/contrib/uima/src/test-files/ (props changed)
lucene/dev/branches/lucene2621/solr/contrib/uima/src/test-files/uima/solr/conf/schema.xml
lucene/dev/branches/lucene2621/solr/core/ (props changed)
lucene/dev/branches/lucene2621/solr/core/src/java/ (props changed)
lucene/dev/branches/lucene2621/solr/core/src/java/org/apache/solr/analysis/FSTSynonymFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/java/org/apache/solr/analysis/HunspellStemFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/java/org/apache/solr/analysis/SolrAnalyzer.java
lucene/dev/branches/lucene2621/solr/core/src/java/org/apache/solr/analysis/TokenizerChain.java
lucene/dev/branches/lucene2621/solr/core/src/java/org/apache/solr/core/SolrCore.java
lucene/dev/branches/lucene2621/solr/core/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java
lucene/dev/branches/lucene2621/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
lucene/dev/branches/lucene2621/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
lucene/dev/branches/lucene2621/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java
lucene/dev/branches/lucene2621/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
lucene/dev/branches/lucene2621/solr/core/src/java/org/apache/solr/schema/BoolField.java
lucene/dev/branches/lucene2621/solr/core/src/java/org/apache/solr/schema/CollationField.java
lucene/dev/branches/lucene2621/solr/core/src/java/org/apache/solr/schema/FieldType.java
lucene/dev/branches/lucene2621/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
lucene/dev/branches/lucene2621/solr/core/src/java/org/apache/solr/schema/LatLonType.java
lucene/dev/branches/lucene2621/solr/core/src/java/org/apache/solr/schema/TextField.java
lucene/dev/branches/lucene2621/solr/core/src/java/org/apache/solr/search/Grouping.java
lucene/dev/branches/lucene2621/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java
lucene/dev/branches/lucene2621/solr/core/src/java/org/apache/solr/search/SolrConstantScoreQuery.java
lucene/dev/branches/lucene2621/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
lucene/dev/branches/lucene2621/solr/core/src/java/org/apache/solr/search/ValueSourceParser.java
lucene/dev/branches/lucene2621/solr/core/src/java/org/apache/solr/spelling/SpellingQueryConverter.java
lucene/dev/branches/lucene2621/solr/core/src/test/ (props changed)
lucene/dev/branches/lucene2621/solr/core/src/test-files/solr/conf/schema-copyfield-test.xml
lucene/dev/branches/lucene2621/solr/core/src/test-files/solr/conf/schema-required-fields.xml
lucene/dev/branches/lucene2621/solr/core/src/test-files/solr/conf/schema-reversed.xml
lucene/dev/branches/lucene2621/solr/core/src/test-files/solr/conf/schema-stop-keep.xml
lucene/dev/branches/lucene2621/solr/core/src/test-files/solr/conf/schema-trie.xml
lucene/dev/branches/lucene2621/solr/core/src/test-files/solr/conf/schema.xml
lucene/dev/branches/lucene2621/solr/core/src/test-files/solr/conf/schema11.xml
lucene/dev/branches/lucene2621/solr/core/src/test-files/solr/conf/schema12.xml
lucene/dev/branches/lucene2621/solr/core/src/test-files/solr/conf/schemasurround.xml
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/CommonGramsFilterFactoryTest.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/CommonGramsQueryFilterFactoryTest.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/DoubleMetaphoneFilterFactoryTest.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/LengthFilterTest.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/SnowballPorterFilterFactoryTest.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestBrazilianStemFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestBulgarianStemFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestCapitalizationFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestChineseFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestCollationKeyFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestCzechStemFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestDelimitedPayloadTokenFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestDictionaryCompoundWordTokenFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestElisionFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestEnglishMinimalStemFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestFinnishLightStemFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestFrenchLightStemFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestFrenchMinimalStemFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestGalicianStemFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestGermanLightStemFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestGermanMinimalStemFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestGermanStemFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestGreekLowerCaseFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestGreekStemFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestHungarianLightStemFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestHunspellStemFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestHyphenationCompoundWordTokenFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestIndonesianStemFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestItalianLightStemFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestKStemFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestKeywordMarkerFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestLatvianStemFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestMultiWordSynonyms.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestNGramFilters.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestPatternReplaceCharFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestPatternReplaceFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestPersianNormalizationFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestPhoneticFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestPorterStemFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestPortugueseLightStemFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestPortugueseMinimalStemFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestPortugueseStemFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestReverseStringFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestReversedWildcardFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestRussianLightStemFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestShingleFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestSpanishLightStemFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestStandardFactories.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestStemmerOverrideFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestSwedishLightStemFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestThaiWordFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestTrimFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestTurkishLowerCaseFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestWordDelimiterFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/cloud/CloudStateUpdateTest.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/cloud/ZkTestServer.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/handler/DocumentAnalysisRequestHandlerTest.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/search/TestSort.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/spelling/SimpleQueryConverter.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/update/AutoCommitTest.java
lucene/dev/branches/lucene2621/solr/dev-tools/ (props changed)
lucene/dev/branches/lucene2621/solr/example/ (props changed)
lucene/dev/branches/lucene2621/solr/lib/ (props changed)
lucene/dev/branches/lucene2621/solr/scripts/ (props changed)
lucene/dev/branches/lucene2621/solr/site/ (props changed)
lucene/dev/branches/lucene2621/solr/site-src/ (props changed)
lucene/dev/branches/lucene2621/solr/solrj/ (props changed)
lucene/dev/branches/lucene2621/solr/solrj/src/java/ (props changed)
lucene/dev/branches/lucene2621/solr/solrj/src/java/org/apache/solr/common/cloud/CloudState.java
lucene/dev/branches/lucene2621/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
lucene/dev/branches/lucene2621/solr/solrj/src/test-files/solrj/solr/conf/schema.xml
lucene/dev/branches/lucene2621/solr/solrj/src/test/org/apache/solr/client/ (props changed)
lucene/dev/branches/lucene2621/solr/solrj/src/test/org/apache/solr/client/solrj/ (props changed)
lucene/dev/branches/lucene2621/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
lucene/dev/branches/lucene2621/solr/solrj/src/test/org/apache/solr/common/ (props changed)
lucene/dev/branches/lucene2621/solr/test-framework/ (props changed)
lucene/dev/branches/lucene2621/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
lucene/dev/branches/lucene2621/solr/testlogging.properties (props changed)
lucene/dev/branches/lucene2621/solr/webapp/ (props changed)
lucene/dev/branches/lucene2621/solr/webapp/web/admin/analysis.jsp
Modified: lucene/dev/branches/lucene2621/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/eclipse/dot.classpath?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/lucene2621/dev-tools/eclipse/dot.classpath Sat Oct 1 03:04:53 2011
@@ -86,7 +86,7 @@
<classpathentry kind="lib" path="modules/analysis/morfologik/lib/morfologik-stemming-1.5.2.jar"/>
<classpathentry kind="lib" path="modules/benchmark/lib/commons-beanutils-1.7.0.jar"/>
<classpathentry kind="lib" path="modules/benchmark/lib/commons-collections-3.1.jar"/>
- <classpathentry kind="lib" path="modules/benchmark/lib/commons-compress-1.1.jar"/>
+ <classpathentry kind="lib" path="modules/benchmark/lib/commons-compress-1.2.jar"/>
<classpathentry kind="lib" path="modules/benchmark/lib/commons-digester-1.7.jar"/>
<classpathentry kind="lib" path="modules/benchmark/lib/commons-logging-1.0.4.jar"/>
<classpathentry kind="lib" path="modules/benchmark/lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar"/>
@@ -131,7 +131,7 @@
<classpathentry kind="lib" path="solr/contrib/extraction/lib/bcmail-jdk15-1.45.jar"/>
<classpathentry kind="lib" path="solr/contrib/extraction/lib/bcprov-jdk15-1.45.jar"/>
<classpathentry kind="lib" path="solr/contrib/extraction/lib/boilerpipe-1.1.0.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/commons-compress-1.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/commons-compress-1.2.jar"/>
<classpathentry kind="lib" path="solr/contrib/extraction/lib/dom4j-1.6.1.jar"/>
<classpathentry kind="lib" path="solr/contrib/extraction/lib/fontbox-1.3.1.jar"/>
<classpathentry kind="lib" path="solr/contrib/extraction/lib/jempbox-1.3.1.jar"/>
Modified: lucene/dev/branches/lucene2621/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/maven/pom.xml.template?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/lucene2621/dev-tools/maven/pom.xml.template Sat Oct 1 03:04:53 2011
@@ -213,7 +213,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.1</version>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
Modified: lucene/dev/branches/lucene2621/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/CHANGES.txt?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/lucene2621/lucene/CHANGES.txt Sat Oct 1 03:04:53 2011
@@ -153,42 +153,53 @@ Changes in backwards compatibility polic
interned. (Mike McCandless)
* LUCENE-2883: The contents of o.a.l.search.function has been consolidated into
- the queries module and can be found at o.a.l.queries.function. See MIGRATE.txt
- for more information (Chris Male)
+ the queries module and can be found at o.a.l.queries.function. See
+ MIGRATE.txt for more information (Chris Male)
-* LUCENE-2392, LUCENE-3299: Decoupled vector space scoring from Query/Weight/Scorer. If you
- extended Similarity directly before, you should extend TFIDFSimilarity instead.
- Similarity is now a lower-level API to implement other scoring algorithms.
- See MIGRATE.txt for more details.
+* LUCENE-2392, LUCENE-3299: Decoupled vector space scoring from
+ Query/Weight/Scorer. If you extended Similarity directly before, you should
+ extend TFIDFSimilarity instead. Similarity is now a lower-level API to
+ implement other scoring algorithms. See MIGRATE.txt for more details.
(David Nemeskey, Simon Willnauer, Mike Mccandless, Robert Muir)
-* LUCENE-3330: The expert visitor API in Scorer has been simplified and extended to support
- arbitrary relationships. To navigate to a scorer's children, call Scorer.getChildren().
- (Robert Muir)
-
-* LUCENE-2308: Field is now instantiated with an instance of IndexableFieldType, of which there
- is a core implementation FieldType. Most properties describing a Field have been moved to
- IndexableFieldType. See MIGRATE.txt for more details.
- (Nikola Tankovic, Mike McCandless, Chris Male)
+* LUCENE-3330: The expert visitor API in Scorer has been simplified and
+ extended to support arbitrary relationships. To navigate to a scorer's
+ children, call Scorer.getChildren(). (Robert Muir)
+
+* LUCENE-2308: Field is now instantiated with an instance of IndexableFieldType,
+ of which there is a core implementation FieldType. Most properties
+ describing a Field have been moved to IndexableFieldType. See MIGRATE.txt
+ for more details. (Nikola Tankovic, Mike McCandless, Chris Male)
+
+* LUCENE-3396: ReusableAnalyzerBase.TokenStreamComponents.reset(Reader) now
+ returns void instead of boolean. If a Component cannot be reset, it should
+ throw an Exception. (Chris Male)
+
+* LUCENE-3396: ReusableAnalyzerBase has been renamed to Analyzer. All Analyzer
+ implementations must now use Analyzer.TokenStreamComponents, rather than
+ overriding .tokenStream() and .reusableTokenStream() (which are now final).
+ (Chris Male)
-* LUCENE-3396: ReusableAnalyzerBase.TokenStreamComponents.reset(Reader) now returns void instead
- of boolean. If a Component cannot be reset, it should throw an Exception. (Chris Male)
+* LUCENE-3346: Analyzer.reusableTokenStream() has been renamed to tokenStream()
+ with the old tokenStream() method removed. Consequently it is now mandatory
+ for all Analyzers to support reusability. (Chris Male)
Changes in Runtime Behavior
* LUCENE-2846: omitNorms now behaves like omitTermFrequencyAndPositions, if you
omitNorms(true) for field "a" for 1000 documents, but then add a document with
- omitNorms(false) for field "a", all documents for field "a" will have no norms.
- Previously, Lucene would fill the first 1000 documents with "fake norms" from
- Similarity.getDefault(). (Robert Muir, Mike Mccandless)
+ omitNorms(false) for field "a", all documents for field "a" will have no
+ norms. Previously, Lucene would fill the first 1000 documents with
+ "fake norms" from Similarity.getDefault(). (Robert Muir, Mike Mccandless)
* LUCENE-2846: When some documents contain field "a", and others do not, the
- documents that don't have the field get a norm byte value of 0. Previously, Lucene
- would populate "fake norms" with Similarity.getDefault() for these documents.
- (Robert Muir, Mike Mccandless)
+ documents that don't have the field get a norm byte value of 0. Previously,
+ Lucene would populate "fake norms" with Similarity.getDefault() for these
+ documents. (Robert Muir, Mike Mccandless)
* LUCENE-2720: IndexWriter throws IndexFormatTooOldException on open, rather
- than later when e.g. a merge starts. (Shai Erera, Mike McCandless, Uwe Schindler)
+ than later when e.g. a merge starts.
+ (Shai Erera, Mike McCandless, Uwe Schindler)
* LUCENE-2881: FieldInfos is now tracked per segment. Before it was tracked
per IndexWriter session, which resulted in FieldInfos that had the FieldInfo
@@ -225,7 +236,7 @@ Changes in Runtime Behavior
up to 2048 MB memory such that the ramBufferSize is now bounded by the max
number of DWPT avaliable in the used DocumentsWriterPerThreadPool.
IndexWriters net memory consumption can grow far beyond the 2048 MB limit if
- the applicatoin can use all available DWPTs. To prevent a DWPT from
+ the application can use all available DWPTs. To prevent a DWPT from
exhausting its address space IndexWriter will forcefully flush a DWPT if its
hard memory limit is exceeded. The RAMPerThreadHardLimitMB can be controlled
via IndexWriterConfig and defaults to 1945 MB.
@@ -304,9 +315,9 @@ API Changes
for building top-level norms. If you really need a top-level norms, use
MultiNorms or SlowMultiReaderWrapper. (Robert Muir, Mike Mccandless)
-* LUCENE-2892: Add QueryParser.newFieldQuery (called by getFieldQuery by default)
- which takes Analyzer as a parameter, for easier customization by subclasses.
- (Robert Muir)
+* LUCENE-2892: Add QueryParser.newFieldQuery (called by getFieldQuery by
+ default) which takes Analyzer as a parameter, for easier customization by
+ subclasses. (Robert Muir)
* LUCENE-2953: In addition to changes in 3.x, PriorityQueue#initialize(int)
function was moved into the ctor. (Uwe Schindler, Yonik Seeley)
@@ -467,8 +478,8 @@ New features
- IndexDocValues provides implementations for primitive datatypes like int,
long, float, double and arrays of byte. Byte based implementations further
provide storage variants like straight or dereferenced stored bytes, fixed
- and variable length bytes as well as index time sorted based on user-provided
- comparators.
+ and variable length bytes as well as index time sorted based on
+ user-provided comparators.
(Mike McCandless, Simon Willnauer)
@@ -504,11 +515,12 @@ New features
Information-Based Models. The models are pluggable, support all of lucene's
features (boosts, slops, explanations, etc) and queries (spans, etc).
- - All models default to the same index-time norm encoding as DefaultSimilarity:
- so you can easily try these out/switch back and forth/run experiments and
- comparisons without reindexing. Note: most of the models do rely upon index
- statistics that are new in Lucene 4.0, so for existing 3.x indexes its a good
- idea to upgrade your index to the new format with IndexUpgrader first.
+ - All models default to the same index-time norm encoding as
+ DefaultSimilarity, so you can easily try these out/switch back and
+ forth/run experiments and comparisons without reindexing. Note: most of
+ the models do rely upon index statistics that are new in Lucene 4.0, so
+ for existing 3.x indexes its a good idea to upgrade your index to the
+ new format with IndexUpgrader first.
- Added a new subclass SimilarityBase which provides a simplified API
for plugging in new ranking algorithms without dealing with all of the
@@ -518,26 +530,24 @@ New features
scoring algorithm to all fields, with queryNorm() and coord() returning 1.
In general, it is recommended to disable coord() when using the new models.
For example, to use BM25 for all fields:
- searcher.setSimilarityProvider(new BasicSimilarityProvider(new BM25Similarity()));
+ searcher.setSimilarityProvider(
+ new BasicSimilarityProvider(new BM25Similarity()));
- If you instead want to apply different similarities (e.g. ones with different
- parameter values or different algorithms entirely) to different fields, implement
- SimilarityProvider with your per-field logic.
+ If you instead want to apply different similarities (e.g. ones with
+ different parameter values or different algorithms entirely) to different
+ fields, implement SimilarityProvider with your per-field logic.
(David Mark Nemeskey via Robert Muir)
-* LUCENE-3396: ReusableAnalyzerBase now provides a ReuseStrategy abstraction which
- controls how TokenStreamComponents are reused per request. Two implementations are
- provided - GlobalReuseStrategy which implements the current behavior of sharing
- components between all fields, and PerFieldReuseStrategy which shares per field.
- (Chris Male)
-
-* LUCENE-2215: Added IndexSearcher.searchAfter which returns results after a specified
- ScoreDoc (e.g. last document on the previous page) to support deep paging use cases.
- (Aaron McCurry, Grant Ingersoll, Robert Muir)
-
-* LUCENE-2309: Added IndexableField.tokenStream(Analyzer) which is now responsible for
- creating the TokenStreams for Fields when they are to be indexed. (Chris Male)
+* LUCENE-3396: ReusableAnalyzerBase now provides a ReuseStrategy abstraction
+ which controls how TokenStreamComponents are reused per request. Two
+ implementations are provided - GlobalReuseStrategy which implements the
+ current behavior of sharing components between all fields, and
+ PerFieldReuseStrategy which shares per field. (Chris Male)
+
+* LUCENE-2309: Added IndexableField.tokenStream(Analyzer) which is now
+ responsible for creating the TokenStreams for Fields when they are to
+ be indexed. (Chris Male)
Optimizations
@@ -632,11 +642,15 @@ New Features
* LUCENE-3448: Added FixedBitSet.and(other/DISI), andNot(other/DISI).
(Uwe Schindler)
+* LUCENE-2215: Added IndexSearcher.searchAfter which returns results after a
+ specified ScoreDoc (e.g. last document on the previous page) to support deep
+ paging use cases. (Aaron McCurry, Grant Ingersoll, Robert Muir)
+
Optimizations
-* LUCENE-3426: Add NGramPhraseQuery which extends PhraseQuery and tries to reduce
- the number of terms of the query when rewrite(), in order to improve performance.
- (Robert Muir, Koji Sekiguchi)
+* LUCENE-3426: Add NGramPhraseQuery which extends PhraseQuery and tries to
+ reduce the number of terms of the query when rewrite(), in order to improve
+ performance. (Robert Muir, Koji Sekiguchi)
Test Cases
Modified: lucene/dev/branches/lucene2621/lucene/MIGRATE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/MIGRATE.txt?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/MIGRATE.txt (original)
+++ lucene/dev/branches/lucene2621/lucene/MIGRATE.txt Sat Oct 1 03:04:53 2011
@@ -437,7 +437,7 @@ If your usage fits one of those common c
instantiate the above class. To use the TYPE_STORED variant, do this
instead:
- Field f = new Field("field", StringField.TYPE_STORED, "value");
+ Field f = new Field("field", "value", StringField.TYPE_STORED);
Alternatively, if an existing type is close to what you want but you
need to make a few changes, you can copy that type and make changes:
@@ -472,7 +472,7 @@ If instead the value was stored:
you can now do this:
- new Field("field", StringField.TYPE_STORED, "value")
+ new Field("field", "value", StringField.TYPE_STORED)
If you didn't omit norms:
@@ -482,7 +482,7 @@ you can now do this:
FieldType ft = new FieldType(StringField.TYPE_STORED);
ft.setOmitNorms(false);
- new Field("field", ft, "value")
+ new Field("field", "value", ft)
If you did this before (value can be String or Reader):
@@ -498,7 +498,7 @@ If instead the value was stored:
you can now do this:
- new Field("field", TextField.TYPE_STORED, value)
+ new Field("field", value, TextField.TYPE_STORED)
If in addition you omit norms:
@@ -508,7 +508,7 @@ you can now do this:
FieldType ft = new FieldType(TextField.TYPE_STORED);
ft.setOmitNorms(true);
- new Field("field", ft, value)
+ new Field("field", value, ft)
If you did this before (bytes is a byte[]):
@@ -517,3 +517,8 @@ If you did this before (bytes is a byte[
you can now do this:
new BinaryField("field", bytes)
+
+* LUCENE-3396: Analyzer.tokenStream() and .reusableTokenStream() have been made final.
+ It is now necessary to use Analyzer.TokenStreamComponents to define an analysis process.
+ Analyzer also has its own way of managing the reuse of TokenStreamComponents (either
+ globally, or per-field). To define another Strategy, implement Analyzer.ReuseStrategy.
\ No newline at end of file
Modified: lucene/dev/branches/lucene2621/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/common-build.xml?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/common-build.xml (original)
+++ lucene/dev/branches/lucene2621/lucene/common-build.xml Sat Oct 1 03:04:53 2011
@@ -824,9 +824,8 @@
<attribute name="title" default="${Name} ${version} API"/>
<attribute name="overview" default="${src.dir}/overview.html"/>
<sequential>
- <copy todir="@{destdir}/../prettify" overwrite="false">
- <fileset dir="${prettify.dir}"/>
- </copy>
+ <copy todir="@{destdir}" file="${prettify.dir}/prettify.js" overwrite="false" />
+ <copy todir="@{destdir}" file="${prettify.dir}/prettify.css" overwrite="false" />
<record name="@{destdir}/log_javadoc.txt" action="start" append="no"/>
<javadoc
overview="@{overview}"
@@ -844,7 +843,7 @@
link="${javadoc.link}"
windowtitle="${Name} ${version} API"
doctitle="@{title}"
- stylesheetfile="@{destdir}/../prettify/stylesheet+prettify.css"
+ stylesheetfile="${prettify.dir}/stylesheet+prettify.css"
maxmemory="${javadoc.maxmemory}"
bottom="Copyright &copy; ${year} Apache Software Foundation. All Rights Reserved.">
<tag name="lucene.experimental"
@@ -853,7 +852,7 @@
description="NOTE: This API is for internal purposes only and might change in incompatible ways in the next release."/>
<link offline="true" packagelistLoc="${javadoc.dir}"/>
<header><![CDATA[
- <script src="{@docRoot}/../prettify/prettify.js" type="text/javascript"></script>
+ <script src="{@docRoot}/prettify.js" type="text/javascript"></script>
<script language="JavaScript">window.onload=function(){windowTitle();prettyPrint();}</script>
]]></header>
Modified: lucene/dev/branches/lucene2621/lucene/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/contrib/CHANGES.txt?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/contrib/CHANGES.txt (original)
+++ lucene/dev/branches/lucene2621/lucene/contrib/CHANGES.txt Sat Oct 1 03:04:53 2011
@@ -90,6 +90,16 @@ New Features
* LUCENE-1889: Add MultiTermQuery support for FVH. (Mike Sokolov via Koji Sekiguchi)
+ * LUCENE-3458: Change BooleanFilter to have only a single clauses ArrayList
+ (so toString() works in order). It now behaves more like BooleanQuery,
+ implements Iterable<FilterClause>, and allows adding Filters without
+ creating FilterClause. (Uwe Schindler)
+
+ * LUCENE-3445: Added SearcherManager, to manage sharing and reopening
+ IndexSearchers across multiple search threads. IndexReader's
+ refCount is used to safely close the reader only once all threads are done
+ using it. (Michael McCandless)
+
Bug Fixes
* LUCENE-3417: DictionaryCompoundWordFilter did not properly add tokens from the
Modified: lucene/dev/branches/lucene2621/lucene/contrib/demo/src/java/org/apache/lucene/demo/IndexFiles.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/contrib/demo/src/java/org/apache/lucene/demo/IndexFiles.java?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/contrib/demo/src/java/org/apache/lucene/demo/IndexFiles.java (original)
+++ lucene/dev/branches/lucene2621/lucene/contrib/demo/src/java/org/apache/lucene/demo/IndexFiles.java Sat Oct 1 03:04:53 2011
@@ -174,7 +174,7 @@ public class IndexFiles {
// field that is indexed (i.e. searchable), but don't tokenize
// the field into separate words and don't index term frequency
// or positional information:
- Field pathField = new Field("path", StringField.TYPE_STORED, file.getPath());
+ Field pathField = new Field("path", file.getPath(), StringField.TYPE_STORED);
doc.add(pathField);
// Add the last modified date of the file a field named "modified".
Modified: lucene/dev/branches/lucene2621/lucene/contrib/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/contrib/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/contrib/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java (original)
+++ lucene/dev/branches/lucene2621/lucene/contrib/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java Sat Oct 1 03:04:53 2011
@@ -134,10 +134,10 @@ public class FormBasedXmlQueryDemo exten
//parse row and create a document
StringTokenizer st = new StringTokenizer(line, "\t");
Document doc = new Document();
- doc.add(new Field("location", textNoNorms, st.nextToken()));
- doc.add(new Field("salary", textNoNorms, st.nextToken()));
- doc.add(new Field("type", textNoNorms, st.nextToken()));
- doc.add(new Field("description", textNoNorms, st.nextToken()));
+ doc.add(new Field("location", st.nextToken(), textNoNorms));
+ doc.add(new Field("salary", st.nextToken(), textNoNorms));
+ doc.add(new Field("type", st.nextToken(), textNoNorms));
+ doc.add(new Field("description", st.nextToken(), textNoNorms));
writer.addDocument(doc);
}
line = br.readLine();
Modified: lucene/dev/branches/lucene2621/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/Highlighter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/Highlighter.java?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/Highlighter.java (original)
+++ lucene/dev/branches/lucene2621/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/Highlighter.java Sat Oct 1 03:04:53 2011
@@ -78,7 +78,7 @@ public class Highlighter
public final String getBestFragment(Analyzer analyzer, String fieldName,String text)
throws IOException, InvalidTokenOffsetsException
{
- TokenStream tokenStream = analyzer.reusableTokenStream(fieldName, new StringReader(text));
+ TokenStream tokenStream = analyzer.tokenStream(fieldName, new StringReader(text));
return getBestFragment(tokenStream, text);
}
@@ -130,7 +130,7 @@ public class Highlighter
int maxNumFragments)
throws IOException, InvalidTokenOffsetsException
{
- TokenStream tokenStream = analyzer.reusableTokenStream(fieldName, new StringReader(text));
+ TokenStream tokenStream = analyzer.tokenStream(fieldName, new StringReader(text));
return getBestFragments(tokenStream, text, maxNumFragments);
}
Modified: lucene/dev/branches/lucene2621/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java (original)
+++ lucene/dev/branches/lucene2621/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java Sat Oct 1 03:04:53 2011
@@ -288,7 +288,7 @@ public class TokenSources {
public static TokenStream getTokenStream(String field, String contents,
Analyzer analyzer) {
try {
- return analyzer.reusableTokenStream(field, new StringReader(contents));
+ return analyzer.tokenStream(field, new StringReader(contents));
} catch (IOException ex) {
throw new RuntimeException(ex);
}
Modified: lucene/dev/branches/lucene2621/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java (original)
+++ lucene/dev/branches/lucene2621/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java Sat Oct 1 03:04:53 2011
@@ -41,6 +41,7 @@ import org.apache.lucene.search.spans.Sp
import org.apache.lucene.search.spans.SpanQuery;
import org.apache.lucene.search.spans.SpanTermQuery;
import org.apache.lucene.search.spans.Spans;
+import org.apache.lucene.util.Bits;
/**
* Class used to extract {@link WeightedSpanTerm}s from a {@link Query} based on whether
@@ -248,11 +249,12 @@ public class WeightedSpanTermExtractor {
for (final String field : fieldNames) {
AtomicReaderContext context = getLeafContextForField(field);
+ Bits acceptDocs = context.reader.getLiveDocs();
final Spans spans;
if (mustRewriteQuery) {
- spans = queries.get(field).getSpans(context);
+ spans = queries.get(field).getSpans(context, acceptDocs);
} else {
- spans = spanQuery.getSpans(context);
+ spans = spanQuery.getSpans(context, acceptDocs);
}
Modified: lucene/dev/branches/lucene2621/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java (original)
+++ lucene/dev/branches/lucene2621/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java Sat Oct 1 03:04:53 2011
@@ -133,7 +133,7 @@ public abstract class BaseFragmentsBuild
ft.setStoreTermVectors(fieldInfo.storeTermVector);
ft.setStoreTermVectorOffsets(fieldInfo.storeOffsetWithTermVector);
ft.setStoreTermVectorPositions(fieldInfo.storePositionWithTermVector);
- fields.add(new Field(fieldInfo.name, ft, new String(b, "UTF-8")));
+ fields.add(new Field(fieldInfo.name, new String(b, "UTF-8"), ft));
} else {
in.seek(in.getFilePointer() + numUTF8Bytes);
}
Modified: lucene/dev/branches/lucene2621/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java?rev=1177888&r1=1177887&r2=1177888&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java (original)
+++ lucene/dev/branches/lucene2621/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java Sat Oct 1 03:04:53 2011
@@ -64,7 +64,7 @@ public class HighlighterPhraseTest exten
customType.setStoreTermVectorOffsets(true);
customType.setStoreTermVectorPositions(true);
customType.setStoreTermVectors(true);
- document.add(new Field(FIELD, customType, new TokenStreamConcurrent()));
+ document.add(new Field(FIELD, new TokenStreamConcurrent(), customType));
indexWriter.addDocument(document);
} finally {
indexWriter.close();
@@ -112,7 +112,7 @@ public class HighlighterPhraseTest exten
customType.setStoreTermVectorOffsets(true);
customType.setStoreTermVectorPositions(true);
customType.setStoreTermVectors(true);
- document.add(new Field(FIELD, customType, new TokenStreamConcurrent()));
+ document.add(new Field(FIELD, new TokenStreamConcurrent(), customType));
indexWriter.addDocument(document);
} finally {
indexWriter.close();
@@ -187,7 +187,7 @@ public class HighlighterPhraseTest exten
customType.setStoreTermVectorOffsets(true);
customType.setStoreTermVectorPositions(true);
customType.setStoreTermVectors(true);
- document.add(new Field(FIELD, customType, new TokenStreamSparse()));
+ document.add(new Field(FIELD, new TokenStreamSparse(), customType));
indexWriter.addDocument(document);
} finally {
indexWriter.close();
@@ -233,7 +233,7 @@ public class HighlighterPhraseTest exten
FieldType customType = new FieldType(TextField.TYPE_STORED);
customType.setStoreTermVectorOffsets(true);
customType.setStoreTermVectors(true);
- document.add(new Field(FIELD, customType, TEXT));
+ document.add(new Field(FIELD, TEXT, customType));
indexWriter.addDocument(document);
} finally {
indexWriter.close();
@@ -277,7 +277,7 @@ public class HighlighterPhraseTest exten
customType.setStoreTermVectorOffsets(true);
customType.setStoreTermVectorPositions(true);
customType.setStoreTermVectors(true);
- document.add(new Field(FIELD, customType, new TokenStreamSparse()));
+ document.add(new Field(FIELD, new TokenStreamSparse(), customType));
indexWriter.addDocument(document);
} finally {
indexWriter.close();