You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@lucene.apache.org by ma...@apache.org on 2009/12/11 17:22:46 UTC

svn commit: r889683 [1/6] - in /lucene/java/branches/flex_1458: ./ contrib/ contrib/analyzers/common/src/java/org/apache/lucene/analysis/cjk/ contrib/analyzers/common/src/java/org/apache/lucene/analysis/cn/ contrib/analyzers/common/src/java/org/apache/...

Author: markrmiller
Date: Fri Dec 11 16:22:30 2009
New Revision: 889683

URL: http://svn.apache.org/viewvc?rev=889683&view=rev
Log:
LUCENE-1458: (flex) merge up to r889614

Added:
    lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/tr/
      - copied from r889614, lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/tr/
    lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/tr/TurkishLowerCaseFilter.java
      - copied unchanged from r889614, lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/tr/TurkishLowerCaseFilter.java
    lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/tr/package.html
      - copied unchanged from r889614, lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/tr/package.html
    lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/tr/
      - copied from r889614, lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/tr/
    lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/tr/TestTurkishLowerCaseFilter.java
      - copied unchanged from r889614, lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/tr/TestTurkishLowerCaseFilter.java
    lucene/java/branches/flex_1458/contrib/fast-vector-highlighter/pom.xml.template
      - copied unchanged from r889614, lucene/java/trunk/contrib/fast-vector-highlighter/pom.xml.template
    lucene/java/branches/flex_1458/contrib/icu/
      - copied from r889614, lucene/java/trunk/contrib/icu/
    lucene/java/branches/flex_1458/contrib/icu/build.xml
      - copied unchanged from r889614, lucene/java/trunk/contrib/icu/build.xml
    lucene/java/branches/flex_1458/contrib/icu/lib/
      - copied from r889614, lucene/java/trunk/contrib/icu/lib/
    lucene/java/branches/flex_1458/contrib/icu/lib/ICU-LICENSE.txt
      - copied unchanged from r889614, lucene/java/trunk/contrib/icu/lib/ICU-LICENSE.txt
    lucene/java/branches/flex_1458/contrib/icu/lib/icu4j-collation-4.0.jar
      - copied unchanged from r889614, lucene/java/trunk/contrib/icu/lib/icu4j-collation-4.0.jar
    lucene/java/branches/flex_1458/contrib/icu/pom.xml.template
      - copied unchanged from r889614, lucene/java/trunk/contrib/icu/pom.xml.template
    lucene/java/branches/flex_1458/contrib/icu/src/
      - copied from r889614, lucene/java/trunk/contrib/icu/src/
    lucene/java/branches/flex_1458/contrib/icu/src/java/
      - copied from r889614, lucene/java/trunk/contrib/icu/src/java/
    lucene/java/branches/flex_1458/contrib/icu/src/java/org/
      - copied from r889614, lucene/java/trunk/contrib/icu/src/java/org/
    lucene/java/branches/flex_1458/contrib/icu/src/java/org/apache/
      - copied from r889614, lucene/java/trunk/contrib/icu/src/java/org/apache/
    lucene/java/branches/flex_1458/contrib/icu/src/java/org/apache/lucene/
      - copied from r889614, lucene/java/trunk/contrib/icu/src/java/org/apache/lucene/
    lucene/java/branches/flex_1458/contrib/icu/src/java/org/apache/lucene/collation/
      - copied from r889614, lucene/java/trunk/contrib/icu/src/java/org/apache/lucene/collation/
    lucene/java/branches/flex_1458/contrib/icu/src/java/org/apache/lucene/collation/ICUCollationKeyAnalyzer.java
      - copied unchanged from r889614, lucene/java/trunk/contrib/icu/src/java/org/apache/lucene/collation/ICUCollationKeyAnalyzer.java
    lucene/java/branches/flex_1458/contrib/icu/src/java/org/apache/lucene/collation/ICUCollationKeyFilter.java
      - copied unchanged from r889614, lucene/java/trunk/contrib/icu/src/java/org/apache/lucene/collation/ICUCollationKeyFilter.java
    lucene/java/branches/flex_1458/contrib/icu/src/java/overview.html
      - copied unchanged from r889614, lucene/java/trunk/contrib/icu/src/java/overview.html
    lucene/java/branches/flex_1458/contrib/icu/src/test/
      - copied from r889614, lucene/java/trunk/contrib/icu/src/test/
    lucene/java/branches/flex_1458/contrib/icu/src/test/org/
      - copied from r889614, lucene/java/trunk/contrib/icu/src/test/org/
    lucene/java/branches/flex_1458/contrib/icu/src/test/org/apache/
      - copied from r889614, lucene/java/trunk/contrib/icu/src/test/org/apache/
    lucene/java/branches/flex_1458/contrib/icu/src/test/org/apache/lucene/
      - copied from r889614, lucene/java/trunk/contrib/icu/src/test/org/apache/lucene/
    lucene/java/branches/flex_1458/contrib/icu/src/test/org/apache/lucene/collation/
      - copied from r889614, lucene/java/trunk/contrib/icu/src/test/org/apache/lucene/collation/
    lucene/java/branches/flex_1458/contrib/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyAnalyzer.java
      - copied unchanged from r889614, lucene/java/trunk/contrib/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyAnalyzer.java
    lucene/java/branches/flex_1458/contrib/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyFilter.java
      - copied unchanged from r889614, lucene/java/trunk/contrib/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyFilter.java
    lucene/java/branches/flex_1458/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedAllTermDocs.java
      - copied unchanged from r889614, lucene/java/trunk/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedAllTermDocs.java
    lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/queryParser/ext/
      - copied from r889614, lucene/java/trunk/contrib/misc/src/java/org/apache/lucene/queryParser/ext/
    lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/queryParser/ext/ExtendableQueryParser.java
      - copied unchanged from r889614, lucene/java/trunk/contrib/misc/src/java/org/apache/lucene/queryParser/ext/ExtendableQueryParser.java
    lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/queryParser/ext/ExtensionQuery.java
      - copied unchanged from r889614, lucene/java/trunk/contrib/misc/src/java/org/apache/lucene/queryParser/ext/ExtensionQuery.java
    lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/queryParser/ext/Extensions.java
      - copied unchanged from r889614, lucene/java/trunk/contrib/misc/src/java/org/apache/lucene/queryParser/ext/Extensions.java
    lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/queryParser/ext/ParserExtension.java
      - copied unchanged from r889614, lucene/java/trunk/contrib/misc/src/java/org/apache/lucene/queryParser/ext/ParserExtension.java
    lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/queryParser/ext/package.html
      - copied unchanged from r889614, lucene/java/trunk/contrib/misc/src/java/org/apache/lucene/queryParser/ext/package.html
    lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/queryParser/ext/
      - copied from r889614, lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/queryParser/ext/
    lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/queryParser/ext/ExtensionStub.java
      - copied unchanged from r889614, lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/queryParser/ext/ExtensionStub.java
    lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/queryParser/ext/TestExtendableQueryParser.java
      - copied unchanged from r889614, lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/queryParser/ext/TestExtendableQueryParser.java
    lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/queryParser/ext/TestExtensions.java
      - copied unchanged from r889614, lucene/java/trunk/contrib/misc/src/test/org/apache/lucene/queryParser/ext/TestExtensions.java
    lucene/java/branches/flex_1458/lib/junit-4.7.jar
      - copied unchanged from r889614, lucene/java/trunk/lib/junit-4.7.jar
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/collation/
      - copied from r889614, lucene/java/trunk/src/java/org/apache/lucene/collation/
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/collation/CollationKeyAnalyzer.java
      - copied unchanged from r889614, lucene/java/trunk/src/java/org/apache/lucene/collation/CollationKeyAnalyzer.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/collation/CollationKeyFilter.java
      - copied unchanged from r889614, lucene/java/trunk/src/java/org/apache/lucene/collation/CollationKeyFilter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/collation/package.html
      - copied unchanged from r889614, lucene/java/trunk/src/java/org/apache/lucene/collation/package.html
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/AbstractAllTermDocs.java
      - copied unchanged from r889614, lucene/java/trunk/src/java/org/apache/lucene/index/AbstractAllTermDocs.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/collation/
      - copied from r889614, lucene/java/trunk/src/test/org/apache/lucene/collation/
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/collation/CollationTestBase.java
      - copied unchanged from r889614, lucene/java/trunk/src/test/org/apache/lucene/collation/CollationTestBase.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/collation/TestCollationKeyAnalyzer.java
      - copied unchanged from r889614, lucene/java/trunk/src/test/org/apache/lucene/collation/TestCollationKeyAnalyzer.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/collation/TestCollationKeyFilter.java
      - copied unchanged from r889614, lucene/java/trunk/src/test/org/apache/lucene/collation/TestCollationKeyFilter.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/InterceptTestCaseEvents.java
      - copied unchanged from r889614, lucene/java/trunk/src/test/org/apache/lucene/util/InterceptTestCaseEvents.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/LuceneTestCaseJ4.java
      - copied unchanged from r889614, lucene/java/trunk/src/test/org/apache/lucene/util/LuceneTestCaseJ4.java
Removed:
    lucene/java/branches/flex_1458/contrib/collation/
    lucene/java/branches/flex_1458/lib/junit-3.8.2.jar
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/SorterTemplate.java
Modified:
    lucene/java/branches/flex_1458/CHANGES.txt
    lucene/java/branches/flex_1458/NOTICE.txt
    lucene/java/branches/flex_1458/build.xml
    lucene/java/branches/flex_1458/common-build.xml
    lucene/java/branches/flex_1458/contrib/CHANGES.txt
    lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cjk/CJKAnalyzer.java
    lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cn/ChineseAnalyzer.java
    lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/CompoundWordTokenFilterBase.java
    lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java
    lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/PatternAnalyzer.java
    lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java
    lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java
    lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapper.java
    lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java
    lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java
    lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/nl/TestDutchStemmer.java
    lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java
    lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java
    lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java
    lucene/java/branches/flex_1458/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseAnalyzer.java
    lucene/java/branches/flex_1458/contrib/benchmark/CHANGES.txt
    lucene/java/branches/flex_1458/contrib/benchmark/conf/extractWikipedia.alg
    lucene/java/branches/flex_1458/contrib/benchmark/conf/indexLineFile.alg
    lucene/java/branches/flex_1458/contrib/benchmark/conf/wikipediaOneRound.alg
    lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java
    lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
    lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksParse.java
    lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
    lucene/java/branches/flex_1458/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndex.java
    lucene/java/branches/flex_1458/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexReader.java
    lucene/java/branches/flex_1458/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexWriter.java
    lucene/java/branches/flex_1458/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTermDocs.java
    lucene/java/branches/flex_1458/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java
    lucene/java/branches/flex_1458/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
    lucene/java/branches/flex_1458/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java
    lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java
    lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/queryParser/precedence/TestPrecedenceQueryParser.java
    lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java
    lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/lucene/search/FuzzyLikeThisQueryTest.java
    lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java
    lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/lucene/search/similar/TestMoreLikeThis.java
    lucene/java/branches/flex_1458/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQPHelper.java
    lucene/java/branches/flex_1458/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQueryParserWrapper.java
    lucene/java/branches/flex_1458/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQPHelper.java
    lucene/java/branches/flex_1458/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQueryParserWrapper.java
    lucene/java/branches/flex_1458/contrib/snowball/build.xml
    lucene/java/branches/flex_1458/contrib/snowball/pom.xml.template
    lucene/java/branches/flex_1458/contrib/snowball/src/java/org/apache/lucene/analysis/snowball/SnowballAnalyzer.java
    lucene/java/branches/flex_1458/contrib/snowball/src/java/org/apache/lucene/analysis/snowball/SnowballFilter.java
    lucene/java/branches/flex_1458/contrib/snowball/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java
    lucene/java/branches/flex_1458/contrib/spellchecker/src/java/org/apache/lucene/search/spell/SpellChecker.java
    lucene/java/branches/flex_1458/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestSpellChecker.java
    lucene/java/branches/flex_1458/docs/contributions.html
    lucene/java/branches/flex_1458/docs/demo.html
    lucene/java/branches/flex_1458/docs/demo2.html
    lucene/java/branches/flex_1458/docs/demo3.html
    lucene/java/branches/flex_1458/docs/demo4.html
    lucene/java/branches/flex_1458/docs/fileformats.html
    lucene/java/branches/flex_1458/docs/gettingstarted.html
    lucene/java/branches/flex_1458/docs/index.html
    lucene/java/branches/flex_1458/docs/linkmap.html
    lucene/java/branches/flex_1458/docs/linkmap.pdf
    lucene/java/branches/flex_1458/docs/lucene-contrib/index.html
    lucene/java/branches/flex_1458/docs/lucene-contrib/index.pdf
    lucene/java/branches/flex_1458/docs/queryparsersyntax.html
    lucene/java/branches/flex_1458/docs/scoring.html
    lucene/java/branches/flex_1458/docs/systemrequirements.html
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/AllTermDocs.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/DirectoryReader.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/IndexWriter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/MultiReader.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/PositionBasedTermVectorMapper.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/SegmentReader.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/CachingWrapperFilter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FieldCache.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/FieldCacheImpl.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/Filter.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/IndexSearcher.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/MultiSearcher.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/ParallelMultiSearcher.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/NoLockFactory.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/RAMDirectory.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/RAMFile.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/AttributeImpl.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/FieldCacheSanityChecker.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/PriorityQueue.java
    lucene/java/branches/flex_1458/src/jsp/configuration.jsp
    lucene/java/branches/flex_1458/src/jsp/footer.jsp
    lucene/java/branches/flex_1458/src/jsp/header.jsp
    lucene/java/branches/flex_1458/src/jsp/index.jsp
    lucene/java/branches/flex_1458/src/jsp/results.jsp
    lucene/java/branches/flex_1458/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml
    lucene/java/branches/flex_1458/src/site/src/documentation/content/xdocs/site.xml
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/TestDemo.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/TestSearchForDuplicates.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/TestSnapshotDeletionPolicy.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/BaseTokenStreamTestCase.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/TestASCIIFoldingFilter.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/TestMappingCharFilter.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/TestStandardAnalyzer.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/TestStopAnalyzer.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/TestStopFilter.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/TestTeeSinkTokenFilter.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/tokenattributes/TestSimpleAttributeImpls.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/document/TestNumberTools.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/DocHelper.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestAtomicUpdate.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestByteSlices.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestCheckIndex.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestDeletionPolicy.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestDoc.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestFieldsReader.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestIndexFileDeleter.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestIndexReader.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestIndexReaderClone.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestIndexReaderCloneNorms.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestIndexReaderReopen.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestIndexWriter.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestIndexWriterReader.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestLazyBug.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestNorms.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestParallelReader.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestPayloads.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestPositionBasedTermVectorMapper.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestSegmentMerger.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestSegmentReader.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestStressIndexing.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestStressIndexing2.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestTermVectorsReader.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestTransactionRollback.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestTransactions.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestWordlistLoader.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/queryParser/TestMultiAnalyzer.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/queryParser/TestMultiFieldQueryParser.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/queryParser/TestQueryParser.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/CachingWrapperFilterHelper.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/CheckHits.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/JustCompileSearch.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/QueryUtils.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestComplexExplanationsOfNonMatches.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestCustomSearcherSort.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestDocIdSet.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestElevationComparator.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestFilteredSearch.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestMultiSearcher.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestSimpleExplanationsOfNonMatches.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestSort.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestSpanQueryFilter.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestTermScorer.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestTermVectors.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestThreadSafe.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestTopDocsCollector.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestTopScoreDocCollector.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestWildcard.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/function/FunctionTestSetup.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/function/JustCompileSearchSpans.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/function/TestCustomScoreQuery.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/function/TestDocValues.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/function/TestFieldScoreQuery.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/function/TestOrdValues.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/spans/JustCompileSearchSpans.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/spans/TestSpanExplanations.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/store/MockRAMDirectory.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/store/MockRAMInputStream.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/store/TestBufferedIndexInput.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/store/TestHugeRamFile.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/store/TestLockFactory.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/store/TestRAMDirectory.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/LocalizedTestCase.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/LuceneTestCase.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/TestCloseableThreadLocal.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/TestNumericUtils.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/cache/BaseTestLRU.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/cache/TestDoubleBarrelLRUCache.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/cache/TestSimpleLRUCache.java

Modified: lucene/java/branches/flex_1458/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/CHANGES.txt?rev=889683&r1=889682&r2=889683&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/CHANGES.txt (original)
+++ lucene/java/branches/flex_1458/CHANGES.txt Fri Dec 11 16:22:30 2009
@@ -4,6 +4,10 @@
 ======================= Trunk (not yet released) =======================
 Changes in backwards compatibility policy
 
+* LUCENE-1483: Removed utility class oal.util.SorterTemplate; this
+  class is no longer used by Lucene.  (Gunnar Wagenknecht via Mike
+  McCandless)
+
 * LUCENE-2123: Removed the protected inner class ScoreTerm from
   FuzzyQuery. The class was never intended to be public.
   (Uwe Schindler, Mike McCandless)
@@ -20,6 +24,10 @@
   custom Similarity can alter how norms are encoded, though they must
   still be encoded as a single byte (Johan Kindgren via Mike
   McCandless)
+  
+* LUCENE-2103: NoLockFactory should have a private constructor;
+  until Lucene 4.0 the default one will be deprecated.
+  (Shai Erera via Uwe Schindler) 
 
 Bug fixes
 
@@ -27,8 +35,26 @@
   and equals methods, cause bad things to happen when caching
   BooleanQueries.  (Chris Hostetter, Mike McCandless)
 
+* LUCENE-2095: Fixes: when two threads call IndexWriter.commit() at
+  the same time, it's possible for commit to return control back to
+  one of the threads before all changes are actually committed.
+  (Sanne Grinovero via Mike McCandless)
+
+* LUCENE-2119: Don't throw NegativeArraySizeException if you pass
+  Integer.MAX_VALUE as nDocs to IndexSearcher search methods.  (Paul
+  Taylor via Mike McCandless)
+
+* LUCENE-2132: Fix the demo result.jsp to use QueryParser with a 
+  Version argument.  (Brian Li via Robert Muir)
+
+* LUCENE-2142: FieldCacheImpl.getStringIndex no longer throws an
+  exception when term count exceeds doc count.  (Mike McCandless)
+  
 New features
 
+* LUCENE-2128: Parallelized fetching document frequencies during weight
+  creation. (Israel Tsadok, Simon Willnauer via Uwe Schindler) 
+
 * LUCENE-2069: Added Unicode 4 support to CharArraySet. Due to the switch
   to Java 5, supplementary characters are now lowercased correctly if the
   set is created as case insensitive.
@@ -59,17 +85,34 @@
   This avoid the overhead of using a PQ unecessarily.  (Mike
   McCandless)
 
+* LUCENE-2137: Switch to AtomicInteger for some ref counting (Earwin
+  Burrfoot via Mike McCandless)
+
 * LUCENE-2123: Move FuzzyQuery rewrite as separate RewriteMode into
   MTQ. This also fixes a slowdown / memory issue added by LUCENE-504.
   (Uwe Schindler, Robert Muir, Mike McCandless)
 
 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)
+
 Test Cases
 
+* LUCENE-2037 Allow Junit4 tests in our envrionment (Erick Erickson
+  via Mike McCandless)
+
 * LUCENE-1844: Speed up the unit tests (Mark Miller, Erick Erickson,
   Mike McCandless)
 
+* LUCENE-2065: Use Java 5 generics throughout our unit tests.  (Kay
+  Kay via Mike McCandless)
+
+* LUCENE-2114: Change TestFilteredSearch to test on multi-segment
+  index as well; improve javadocs of Filter to call out that the
+  provided reader is per-segment (Simon Willnauer via Mike McCandless)
+
 ======================= Release 3.0.0 2009-11-25 =======================
 
 Changes in backwards compatibility policy

Modified: lucene/java/branches/flex_1458/NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/NOTICE.txt?rev=889683&r1=889682&r2=889683&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/NOTICE.txt (original)
+++ lucene/java/branches/flex_1458/NOTICE.txt Fri Dec 11 16:22:30 2009
@@ -30,8 +30,8 @@
 The SmartChineseAnalyzer source code (under contrib/analyzers) was
 provided by Xiaoping Gao and copyright 2009 by www.imdict.net.
 
-ICU4J, (under contrib/collation) is licensed under an MIT styles license
-(contrib/collation/lib/ICU-LICENSE.txt) and Copyright (c) 1995-2008 
+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 

Modified: lucene/java/branches/flex_1458/build.xml
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/build.xml?rev=889683&r1=889682&r2=889683&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/build.xml (original)
+++ lucene/java/branches/flex_1458/build.xml Fri Dec 11 16:22:30 2009
@@ -28,9 +28,6 @@
   <property name="demo.name" value="lucene-demos-${version}"/>
   <property name="demo.war.name" value="luceneweb"/>
 
-  <!-- Type of checksum to compute for distribution files -->
-  <property name="checksum.algorithm" value="md5" />
-	
   <!-- Build classpath -->
   <path id="classpath">
     <pathelement location="${build.dir}/classes/java"/>
@@ -303,7 +300,7 @@
           <packageset dir="contrib/analyzers/smartcn/src/java"/>
           <packageset dir="contrib/ant/src/java"/>
           <packageset dir="contrib/benchmark/src/java"/>
-          <packageset dir="contrib/collation/src/java"/>
+          <packageset dir="contrib/icu/src/java"/>
           <packageset dir="contrib/db/bdb-je/src/java"/>
           <packageset dir="contrib/db/bdb/src/java"/>
           <packageset dir="contrib/fast-vector-highlighter/src/java"/>
@@ -337,7 +334,7 @@
           <group title="contrib: Analysis" packages="org.apache.lucene.analysis.*"/>
           <group title="contrib: Ant" packages="org.apache.lucene.ant*"/>
           <group title="contrib: Benchmark" packages="org.apache.lucene.benchmark*"/>
-          <group title="contrib: Collation" packages="org.apache.lucene.collation*"/>
+          <group title="contrib: ICU" packages="org.apache.lucene.collation*"/>
           <group title="contrib: DB" packages="org.apache.lucene.store.db*:org.apache.lucene.store.je*:com.sleepycat*"/>
           <group title="contrib: Fast Vector Highlighter" packages="org.apache.lucene.search.vectorhighlight*"/>
           <group title="contrib: Highlighter" packages="org.apache.lucene.search.highlight*"/>
@@ -686,31 +683,12 @@
     <fail if="contribs.failed">Contrib tests failed!</fail>
   </target>
 
-  <!-- Macro for building checksum files
-       This is only needed until the "format" option is supported
-       by ant's built in checksum task
-   -->
+  <!-- Macro for building checksum files -->
   <macrodef name="lucene-checksum">
     <attribute name="file"/>
-    <!-- NOTE: we use the value of @{file} in the names any properties
-         set because macro's don't have variables, and otherwise we
-         wouldn't be able to checksum more then one file per build
-      -->
     <sequential>
-      <checksum file="@{file}"
-                property="@{file}.sum"
-                algorithm="${checksum.algorithm}" />
-      <basename file="@{file}" property="@{file}.base" />
-      <concat destfile="@{file}.${checksum.algorithm}"
-              force="yes"
-              append="false"
-              fixlastline="yes">
-        <header trimleading="yes">${@{file}.sum}  </header>
-        <!-- empty fileset to trick concat -->
-        <fileset dir="." excludes="**" />
-        <footer trimleading="yes">${@{file}.base}
-        </footer>
-      </concat>
+      <checksum file="@{file}" algorithm="md5" format="MD5SUM" forceoverwrite="yes" readbuffersize="65536"/>
+      <checksum file="@{file}" algorithm="sha1" format="MD5SUM" forceoverwrite="yes" readbuffersize="65536"/>
     </sequential>
   </macrodef>
 

Modified: lucene/java/branches/flex_1458/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/common-build.xml?rev=889683&r1=889682&r2=889683&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/common-build.xml (original)
+++ lucene/java/branches/flex_1458/common-build.xml Fri Dec 11 16:22:30 2009
@@ -42,12 +42,12 @@
   <property name="Name" value="Lucene"/>
   <property name="dev.version" value="3.1-dev"/>
   <property name="version" value="${dev.version}"/>
-  <property name="compatibility.tag" value="flex_1458_3_0_back_compat_tests_20091207"/>
+  <property name="compatibility.tag" value="flex_1458_3_0_back_compat_tests_20091211"/>
   <property name="spec.version" value="${version}"/>	
   <property name="year" value="2000-${current.year}"/>
   <property name="final.name" value="lucene-${name}-${version}"/>
 
-  <property name="junit.jar" value="junit-3.8.2.jar"/>
+  <property name="junit.jar" value="junit-4.7.jar"/>
   <property name="junit-location.jar" value="${common.dir}/lib/${junit.jar}"/>
   <path id="junit-path">
     <pathelement location="${junit-location.jar}"/>
@@ -67,6 +67,7 @@
   <property name="javadoc.access" value="protected"/>
   <property name="javadoc.charset" value="utf-8"/>
   <property name="javadoc.dir" value="${common.dir}/build/docs/api"/>
+  <property name="javadoc.maxmemory" value="512m" />
   <!-- Javadoc classpath -->
   <path id="javadoc.classpath">
     <path refid="classpath"/>

Modified: lucene/java/branches/flex_1458/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/CHANGES.txt?rev=889683&r1=889682&r2=889683&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/CHANGES.txt (original)
+++ lucene/java/branches/flex_1458/contrib/CHANGES.txt Fri Dec 11 16:22:30 2009
@@ -2,6 +2,20 @@
 
 ======================= Trunk (not yet released) =======================
 
+Changes in backwards compatibility policy
+
+ * LUCENE-2100: All Analyzers in Lucene-contrib have been marked as final.
+   Analyzers should be only act as a composition of TokenStreams, users should
+   compose their own analyzers instead of subclassing existing ones.
+   (Simon Willnauer) 
+
+Changes in runtime behavior
+
+ * LUCENE-2117: SnowballAnalyzer uses TurkishLowerCaseFilter instead of
+   LowercaseFilter to correctly handle the unique Turkish casing behavior if
+   used with Version > 3.0 and the TurkishStemmer.
+   (Robert Muir via Simon Willnauer)  
+
 Bug fixes
 
  * LUCENE-2068: Fixed ReverseStringFilter which was not aware of supplementary
@@ -9,14 +23,52 @@
    will be replaced by U+FFFD by the indexer, but not at query time. The filter
    now reverses supplementary characters correctly if used with Version > 3.0.
    (Simon Willnauer, Robert Muir)
+
+ * LUCENE-2144: Fix InstantiatedIndex to handle termDocs(null)
+   correctly (enumerate all non-deleted docs).  (Karl Wettin via Mike
+   McCandless)
    
+API Changes
+
+ * LUCENE-2108: Add SpellChecker.close, to close the underlying
+   reader.  (Eirik Bjørsnøs via Mike McCandless)
+
 New features
 
+ * LUCENE-2102: Add a Turkish LowerCase Filter. TurkishLowerCaseFilter handles
+   Turkish and Azeri unique casing behavior correctly.
+   (Ahmet Arslan, Robert Muir via Simon Willnauer)
+ 
+ * LUCENE-2039: Add a extensible query parser to contrib/misc.
+   ExtendableQueryParser enables arbitrary parser extensions based on a
+   customizable field naming scheme.
+   (Simon Willnauer)
+
+ * LUCENE-2108: Spellchecker now safely supports concurrent modifications to
+   the spell-index. Threads can safely obtain term suggestions while the spell-
+   index is rebuild, cleared or reset. Internal IndexSearcher instances remain
+   open until the last thread accessing them releases the reference.
+   (Simon Willnauer)
+
  * LUCENE-2067: Add a Czech light stemmer. CzechAnalyzer will now stem words
    when Version is set to 3.1 or higher.  (Robert Muir)
    
  * LUCENE-2062: Add a Bulgarian analyzer.  (Robert Muir, Simon Willnauer)
-   
+
+Build
+
+ * LUCENE-2117: SnowballAnalyzer now holds a runtime-dependency on
+   contrib-analyzers to correctly handle the unique Turkish casing behavior.
+   (Robert Muir via Simon Willnauer)  
+
+ * 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)
+
+Test Cases
+
+ * LUCENE-2115: Cutover contrib tests to use Java5 generics.  (Kay Kay
+   via Mike McCandless)
 
 ======================= Release 3.0.0 2009-11-25 =======================
 

Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cjk/CJKAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cjk/CJKAnalyzer.java?rev=889683&r1=889682&r2=889683&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cjk/CJKAnalyzer.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cjk/CJKAnalyzer.java Fri Dec 11 16:22:30 2009
@@ -35,7 +35,7 @@
  * filters with {@link StopFilter}
  *
  */
-public class CJKAnalyzer extends Analyzer {
+public final class CJKAnalyzer extends Analyzer {
   //~ Static fields/initializers ---------------------------------------------
 
   /**

Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cn/ChineseAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cn/ChineseAnalyzer.java?rev=889683&r1=889682&r2=889683&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cn/ChineseAnalyzer.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cn/ChineseAnalyzer.java Fri Dec 11 16:22:30 2009
@@ -29,7 +29,7 @@
  *
  */
 
-public class ChineseAnalyzer extends Analyzer {
+public final class ChineseAnalyzer extends Analyzer {
 
     public ChineseAnalyzer() {
     }

Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/CompoundWordTokenFilterBase.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/CompoundWordTokenFilterBase.java?rev=889683&r1=889682&r2=889683&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/CompoundWordTokenFilterBase.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/CompoundWordTokenFilterBase.java Fri Dec 11 16:22:30 2009
@@ -78,42 +78,42 @@
   
   private final Token wrapper = new Token();
   /**
-   * @deprecated use {@link #CompoundWordTokenFilterBase(Version, TokenStream, String[], int, int, int, boolean) instead
+   * @deprecated use {@link #CompoundWordTokenFilterBase(Version, TokenStream, String[], int, int, int, boolean)} instead
    */
   protected CompoundWordTokenFilterBase(TokenStream input, String[] dictionary, int minWordSize, int minSubwordSize, int maxSubwordSize, boolean onlyLongestMatch) {
     this(Version.LUCENE_30, input, makeDictionary(dictionary),minWordSize,minSubwordSize,maxSubwordSize, onlyLongestMatch);
   }
   
   /**
-   * @deprecated use {@link #CompoundWordTokenFilterBase(Version, TokenStream, String[], boolean) instead
+   * @deprecated use {@link #CompoundWordTokenFilterBase(Version, TokenStream, String[], boolean)} instead
    */
   protected CompoundWordTokenFilterBase(TokenStream input, String[] dictionary, boolean onlyLongestMatch) {
     this(Version.LUCENE_30, input, makeDictionary(dictionary),DEFAULT_MIN_WORD_SIZE,DEFAULT_MIN_SUBWORD_SIZE,DEFAULT_MAX_SUBWORD_SIZE, onlyLongestMatch);
   }
   
   /**
-   * @deprecated use {@link #CompoundWordTokenFilterBase(Version, TokenStream, Set, boolean) instead
+   * @deprecated use {@link #CompoundWordTokenFilterBase(Version, TokenStream, Set, boolean)} instead
    */
   protected CompoundWordTokenFilterBase(TokenStream input, Set<?> dictionary, boolean onlyLongestMatch) {
     this(Version.LUCENE_30, input, dictionary,DEFAULT_MIN_WORD_SIZE,DEFAULT_MIN_SUBWORD_SIZE,DEFAULT_MAX_SUBWORD_SIZE, onlyLongestMatch);
   }
   
   /**
-   * @deprecated use {@link #CompoundWordTokenFilterBase(Version, TokenStream, String[]) instead
+   * @deprecated use {@link #CompoundWordTokenFilterBase(Version, TokenStream, String[])} instead
    */
   protected CompoundWordTokenFilterBase(TokenStream input, String[] dictionary) {
     this(Version.LUCENE_30, input, makeDictionary(dictionary),DEFAULT_MIN_WORD_SIZE,DEFAULT_MIN_SUBWORD_SIZE,DEFAULT_MAX_SUBWORD_SIZE, false);
   }
   
   /**
-   * @deprecated use {@link #CompoundWordTokenFilterBase(Version, TokenStream, Set) instead
+   * @deprecated use {@link #CompoundWordTokenFilterBase(Version, TokenStream, Set)} instead
    */
   protected CompoundWordTokenFilterBase(TokenStream input, Set<?> dictionary) {
     this(Version.LUCENE_30, input, dictionary,DEFAULT_MIN_WORD_SIZE,DEFAULT_MIN_SUBWORD_SIZE,DEFAULT_MAX_SUBWORD_SIZE, false);
   }
 
   /**
-   * @deprecated use {@link #CompoundWordTokenFilterBase(Version, TokenStream, Set[], int, int, int, boolean) instead
+   * @deprecated use {@link #CompoundWordTokenFilterBase(Version, TokenStream, Set, int, int, int, boolean)} instead
    */
   protected CompoundWordTokenFilterBase(TokenStream input, Set<?> dictionary, int minWordSize, int minSubwordSize, int maxSubwordSize, boolean onlyLongestMatch) {
     this(Version.LUCENE_30, input, dictionary, minWordSize, minSubwordSize, maxSubwordSize, onlyLongestMatch);

Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java?rev=889683&r1=889682&r2=889683&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java Fri Dec 11 16:22:30 2009
@@ -51,7 +51,7 @@
  * <p><b>NOTE</b>: This class uses the same {@link Version}
  * dependent settings as {@link StandardAnalyzer}.</p>
  */
-public class GermanAnalyzer extends Analyzer {
+public final class GermanAnalyzer extends Analyzer {
   
   /**
    * List of typical german stopwords.
@@ -133,7 +133,6 @@
   public GermanAnalyzer(Version matchVersion, Set<?> stopwords, Set<?> stemExclusionSet) {
     stopSet = CharArraySet.unmodifiableSet(CharArraySet.copy(matchVersion, stopwords));
     exclusionSet = CharArraySet.unmodifiableSet(CharArraySet.copy(matchVersion, stemExclusionSet));
-    setOverridesTokenStreamMethod(GermanAnalyzer.class);
     this.matchVersion = matchVersion;
   }
 
@@ -221,13 +220,6 @@
    */
   @Override
   public TokenStream reusableTokenStream(String fieldName, Reader reader) throws IOException {
-    if (overridesTokenStreamMethod) {
-      // LUCENE-1678: force fallback to tokenStream() if we
-      // have been subclassed and that subclass overrides
-      // tokenStream but not reusableTokenStream
-      return tokenStream(fieldName, reader);
-    }
-    
     SavedStreams streams = (SavedStreams) getPreviousTokenStream();
     if (streams == null) {
       streams = new SavedStreams();

Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/PatternAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/PatternAnalyzer.java?rev=889683&r1=889682&r2=889683&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/PatternAnalyzer.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/PatternAnalyzer.java Fri Dec 11 16:22:30 2009
@@ -64,7 +64,7 @@
  * </pre>
  *
  */
-public class PatternAnalyzer extends Analyzer {
+public final class PatternAnalyzer extends Analyzer {
   
   /** <code>"\\W+"</code>; Divides text at non-letters (NOT Character.isLetter(c)) */
   public static final Pattern NON_WORD_PATTERN = Pattern.compile("\\W+");

Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java?rev=889683&r1=889682&r2=889683&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java Fri Dec 11 16:22:30 2009
@@ -52,7 +52,7 @@
  * <p><b>NOTE</b>: This class uses the same {@link Version}
  * dependent settings as {@link StandardAnalyzer}.</p>
  */
-public class DutchAnalyzer extends Analyzer {
+public final class DutchAnalyzer extends Analyzer {
   /**
    * List of typical Dutch stopwords.
    * @deprecated use {@link #getDefaultStopSet()} instead
@@ -119,7 +119,6 @@
     stoptable = CharArraySet.unmodifiableSet(CharArraySet.copy(matchVersion, stopwords));
     excltable = CharArraySet.unmodifiableSet(CharArraySet.copy(matchVersion, stemExclusionTable));
     this.matchVersion = matchVersion;
-    setOverridesTokenStreamMethod(DutchAnalyzer.class);
   }
 
   /**
@@ -151,7 +150,6 @@
    */
   public DutchAnalyzer(Version matchVersion, File stopwords) {
     // this is completely broken!
-    setOverridesTokenStreamMethod(DutchAnalyzer.class);
     try {
       stoptable = org.apache.lucene.analysis.WordlistLoader.getWordSet(stopwords);
     } catch (IOException e) {
@@ -243,13 +241,6 @@
   @Override
   public TokenStream reusableTokenStream(String fieldName, Reader reader)
       throws IOException {
-    if (overridesTokenStreamMethod) {
-      // LUCENE-1678: force fallback to tokenStream() if we
-      // have been subclassed and that subclass overrides
-      // tokenStream but not reusableTokenStream
-      return tokenStream(fieldName, reader);
-    }
-    
     SavedStreams streams = (SavedStreams) getPreviousTokenStream();
     if (streams == null) {
       streams = new SavedStreams();

Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java?rev=889683&r1=889682&r2=889683&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java Fri Dec 11 16:22:30 2009
@@ -43,7 +43,7 @@
  * stop words found in an already existing index.
  * </p>
  */
-public class QueryAutoStopWordAnalyzer extends Analyzer {
+public final class QueryAutoStopWordAnalyzer extends Analyzer {
   Analyzer delegate;
   HashMap<String,HashSet<String>> stopWordsPerField = new HashMap<String,HashSet<String>>();
   //The default maximum percentage (40%) of index documents which
@@ -58,7 +58,6 @@
    */
   public QueryAutoStopWordAnalyzer(Version matchVersion, Analyzer delegate) {
     this.delegate = delegate;
-    setOverridesTokenStreamMethod(QueryAutoStopWordAnalyzer.class);
     this.matchVersion = matchVersion;
   }
 
@@ -198,13 +197,6 @@
   @Override
   public TokenStream reusableTokenStream(String fieldName, Reader reader)
       throws IOException {
-    if (overridesTokenStreamMethod) {
-      // LUCENE-1678: force fallback to tokenStream() if we
-      // have been subclassed and that subclass overrides
-      // tokenStream but not reusableTokenStream
-      return tokenStream(fieldName, reader);
-    }
-
     /* map of SavedStreams for each field */
     Map<String,SavedStreams> streamMap = (Map<String,SavedStreams>) getPreviousTokenStream();
     if (streamMap == null) {

Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapper.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapper.java?rev=889683&r1=889682&r2=889683&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapper.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapper.java Fri Dec 11 16:22:30 2009
@@ -31,7 +31,7 @@
  * A shingle is another name for a token based n-gram.
  * </p>
  */
-public class ShingleAnalyzerWrapper extends Analyzer {
+public final class ShingleAnalyzerWrapper extends Analyzer {
 
   protected Analyzer defaultAnalyzer;
   protected int maxShingleSize = 2;
@@ -40,7 +40,6 @@
   public ShingleAnalyzerWrapper(Analyzer defaultAnalyzer) {
     super();
     this.defaultAnalyzer = defaultAnalyzer;
-    setOverridesTokenStreamMethod(ShingleAnalyzerWrapper.class);
   }
 
   public ShingleAnalyzerWrapper(Analyzer defaultAnalyzer, int maxShingleSize) {
@@ -54,7 +53,6 @@
   public ShingleAnalyzerWrapper(Version matchVersion) {
     super();
     this.defaultAnalyzer = new StandardAnalyzer(matchVersion);
-    setOverridesTokenStreamMethod(ShingleAnalyzerWrapper.class);
   }
 
   /**
@@ -119,13 +117,6 @@
   
   @Override
   public TokenStream reusableTokenStream(String fieldName, Reader reader) throws IOException {
-    if (overridesTokenStreamMethod) {
-      // LUCENE-1678: force fallback to tokenStream() if we
-      // have been subclassed and that subclass overrides
-      // tokenStream but not reusableTokenStream
-      return tokenStream(fieldName, reader);
-    }
-    
     SavedStreams streams = (SavedStreams) getPreviousTokenStream();
     if (streams == null) {
       streams = new SavedStreams();

Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java?rev=889683&r1=889682&r2=889683&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java Fri Dec 11 16:22:30 2009
@@ -35,11 +35,10 @@
  * <p><b>NOTE</b>: This class uses the same {@link Version}
  * dependent settings as {@link StandardAnalyzer}.</p>
  */
-public class ThaiAnalyzer extends Analyzer {
+public final class ThaiAnalyzer extends Analyzer {
   private final Version matchVersion;
 
   public ThaiAnalyzer(Version matchVersion) {
-    setOverridesTokenStreamMethod(ThaiAnalyzer.class);
     this.matchVersion = matchVersion;
   }
   
@@ -59,13 +58,6 @@
   
   @Override
   public TokenStream reusableTokenStream(String fieldName, Reader reader) throws IOException {
-    if (overridesTokenStreamMethod) {
-      // LUCENE-1678: force fallback to tokenStream() if we
-      // have been subclassed and that subclass overrides
-      // tokenStream but not reusableTokenStream
-      return tokenStream(fieldName, reader);
-    }
-    
     SavedStreams streams = (SavedStreams) getPreviousTokenStream();
     if (streams == null) {
       streams = new SavedStreams();

Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java?rev=889683&r1=889682&r2=889683&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java Fri Dec 11 16:22:30 2009
@@ -21,13 +21,9 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStreamReader;
-import java.io.Reader;
 
 import org.apache.lucene.analysis.BaseTokenStreamTestCase;
 import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.WhitespaceTokenizer;
-import org.apache.lucene.analysis.standard.StandardTokenizer;
 import org.apache.lucene.util.Version;
 
 /**
@@ -68,24 +64,6 @@
     checkReuse(a, "Tischen", "tisch");
   }
   
-  /**
-   * subclass that acts just like whitespace analyzer for testing
-   */
-  private class GermanSubclassAnalyzer extends GermanAnalyzer {
-    public GermanSubclassAnalyzer(Version matchVersion) {
-      super(matchVersion);
-    }
-
-    @Override
-    public TokenStream tokenStream(String fieldName, Reader reader) {
-      return new WhitespaceTokenizer(reader);
-    }
-  }
-  
-  public void testLUCENE1678BWComp() throws Exception {
-    checkReuse(new GermanSubclassAnalyzer(Version.LUCENE_CURRENT), "Tischen", "Tischen");
-  }
-
   /* 
    * Test that changes to the exclusion table are applied immediately
    * when using reusable token streams.

Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/nl/TestDutchStemmer.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/nl/TestDutchStemmer.java?rev=889683&r1=889682&r2=889683&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/nl/TestDutchStemmer.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/nl/TestDutchStemmer.java Fri Dec 11 16:22:30 2009
@@ -18,12 +18,9 @@
  */
 
 import java.io.File;
-import java.io.Reader;
 
 import org.apache.lucene.analysis.BaseTokenStreamTestCase;
 import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.WhitespaceTokenizer;
 import org.apache.lucene.util.Version;
 
 /**
@@ -127,27 +124,6 @@
     checkOneTermReuse(a, "lichamelijkheden", "licham");
   }
   
-  /**
-   * subclass that acts just like whitespace analyzer for testing
-   */
-  private class DutchSubclassAnalyzer extends DutchAnalyzer {
-    public DutchSubclassAnalyzer(Version matchVersion) {
-      super(matchVersion);
-    }
-    @Override
-    public TokenStream tokenStream(String fieldName, Reader reader) {
-      return new WhitespaceTokenizer(reader);
-    }
-  }
-  
-  public void testLUCENE1678BWComp() throws Exception {
-    Analyzer a = new DutchSubclassAnalyzer(Version.LUCENE_CURRENT);
-    checkOneTermReuse(a, "lichaamsziek", "lichaamsziek");
-    checkOneTermReuse(a, "lichamelijk", "lichamelijk");
-    checkOneTermReuse(a, "lichamelijke", "lichamelijke");
-    checkOneTermReuse(a, "lichamelijkheden", "lichamelijkheden");
-  }
- 
   /* 
    * Test that changes to the exclusion table are applied immediately
    * when using reusable token streams.

Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java?rev=889683&r1=889682&r2=889683&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java Fri Dec 11 16:22:30 2009
@@ -148,27 +148,6 @@
 
   }
   
-  /**
-   * subclass that acts just like whitespace analyzer for testing
-   */
-  private class QueryAutoStopWordSubclassAnalyzer extends QueryAutoStopWordAnalyzer {
-    public QueryAutoStopWordSubclassAnalyzer(Version matchVersion) {
-      super(matchVersion, new WhitespaceAnalyzer());
-    }
-    
-    @Override
-    public TokenStream tokenStream(String fieldName, Reader reader) {
-      return new WhitespaceTokenizer(reader);
-    }    
-  }
-  
-  public void testLUCENE1678BWComp() throws Exception {
-    QueryAutoStopWordAnalyzer a = new QueryAutoStopWordSubclassAnalyzer(Version.LUCENE_CURRENT);
-    a.addStopWords(reader, "repetitiveField", 10);
-    int numHits = search(a, "repetitiveField:boring");
-    assertFalse(numHits == 0);
-  }
-  
   /*
    * analyzer that does not support reuse
    * it is LetterTokenizer on odd invocations, WhitespaceTokenizer on even.

Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java?rev=889683&r1=889682&r2=889683&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java Fri Dec 11 16:22:30 2009
@@ -213,28 +213,6 @@
         new int[] { 1, 0, 1, 0, 1, 0, 1 });
   }
   
-  /**
-   * subclass that acts just like whitespace analyzer for testing
-   */
-  private class ShingleWrapperSubclassAnalyzer extends ShingleAnalyzerWrapper {
-    public ShingleWrapperSubclassAnalyzer() {
-      super(org.apache.lucene.util.Version.LUCENE_CURRENT);
-    }
-  
-    @Override
-    public TokenStream tokenStream(String fieldName, Reader reader) {
-      return new WhitespaceTokenizer(reader);
-    }  
-  };
-  
-  public void testLUCENE1678BWComp() throws Exception {
-    Analyzer a = new ShingleWrapperSubclassAnalyzer();
-    assertAnalyzesToReuse(a, "this is a test",
-        new String[] { "this", "is", "a", "test" },
-        new int[] { 0, 5, 8, 10 },
-        new int[] { 4, 7, 9, 14 });
-  }
-  
   /*
    * analyzer that does not support reuse
    * it is LetterTokenizer on odd invocations, WhitespaceTokenizer on even.

Modified: lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java?rev=889683&r1=889682&r2=889683&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java Fri Dec 11 16:22:30 2009
@@ -17,12 +17,7 @@
  * limitations under the License.
  */
 
-import java.io.Reader;
-
 import org.apache.lucene.analysis.BaseTokenStreamTestCase;
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.WhitespaceTokenizer;
 import org.apache.lucene.util.Version;
 
 /**
@@ -124,22 +119,4 @@
           "บริษัทชื่อ XY&Z - คุยกับ xyz@demo.com",
           new String[] { "บริษัท", "ชื่อ", "xy&z", "คุย", "กับ", "xyz@demo.com" });
 	}
-	
-	/**
-	 * subclass that acts just like whitespace analyzer for testing
-	 */
-	private class ThaiSubclassAnalyzer extends ThaiAnalyzer {
-          public ThaiSubclassAnalyzer(Version matchVersion) {
-            super(matchVersion);
-          }
-	  @Override
-	  public TokenStream tokenStream(String fieldName, Reader reader) {
-	    return new WhitespaceTokenizer(reader);
-	  }
-	}
-	
-	public void testLUCENE1678BWComp() throws Exception {
-	  ThaiSubclassAnalyzer a = new ThaiSubclassAnalyzer(Version.LUCENE_CURRENT);
-	  assertAnalyzesToReuse(a, "การที่ได้ต้องแสดงว่างานดี", new String[] { "การที่ได้ต้องแสดงว่างานดี" });
-	}
 }

Modified: lucene/java/branches/flex_1458/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseAnalyzer.java?rev=889683&r1=889682&r2=889683&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseAnalyzer.java (original)
+++ lucene/java/branches/flex_1458/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseAnalyzer.java Fri Dec 11 16:22:30 2009
@@ -58,7 +58,7 @@
  * supported anymore in such a case.</font>
  * </p>
  */
-public class SmartChineseAnalyzer extends Analyzer {
+public final class SmartChineseAnalyzer extends Analyzer {
 
   private final Set<?> stopWords;
   

Modified: lucene/java/branches/flex_1458/contrib/benchmark/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/benchmark/CHANGES.txt?rev=889683&r1=889682&r2=889683&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/benchmark/CHANGES.txt (original)
+++ lucene/java/branches/flex_1458/contrib/benchmark/CHANGES.txt Fri Dec 11 16:22:30 2009
@@ -3,6 +3,11 @@
 The Benchmark contrib package contains code for benchmarking Lucene in a variety of ways.
 
 $Id:$
+
+12/07/2009
+  LUCENE-2106: ReadTask does not close its Reader when 
+  OpenReader/CloseReader are not used. (Mark Miller)
+
 11/17/2009
   LUCENE-2079: Allow specifying delta thread priority after the "&";
   added log.time.step.msec to print per-time-period counts; fixed

Modified: lucene/java/branches/flex_1458/contrib/benchmark/conf/extractWikipedia.alg
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/benchmark/conf/extractWikipedia.alg?rev=889683&r1=889682&r2=889683&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/benchmark/conf/extractWikipedia.alg (original)
+++ lucene/java/branches/flex_1458/contrib/benchmark/conf/extractWikipedia.alg Fri Dec 11 16:22:30 2009
@@ -29,7 +29,7 @@
 #
 
 # Where to get documents from:
-doc.maker=org.apache.lucene.benchmark.byTask.feeds.EnwikiDocMaker
+content.source=org.apache.lucene.benchmark.byTask.feeds.EnwikiContentSource
 docs.file=temp/enwiki-20070527-pages-articles.xml
 
 # Where to write the line file output:

Modified: lucene/java/branches/flex_1458/contrib/benchmark/conf/indexLineFile.alg
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/benchmark/conf/indexLineFile.alg?rev=889683&r1=889682&r2=889683&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/benchmark/conf/indexLineFile.alg (original)
+++ lucene/java/branches/flex_1458/contrib/benchmark/conf/indexLineFile.alg Fri Dec 11 16:22:30 2009
@@ -32,7 +32,7 @@
 analyzer=org.apache.lucene.analysis.SimpleAnalyzer
 
 # Feed that knows how to process the line file format:
-doc.maker=org.apache.lucene.benchmark.byTask.feeds.LineDocMaker
+content.source=org.apache.lucene.benchmark.byTask.feeds.LineDocSource
 
 # File that contains one document per line:
 docs.file=work/reuters.lines.txt

Modified: lucene/java/branches/flex_1458/contrib/benchmark/conf/wikipediaOneRound.alg
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/benchmark/conf/wikipediaOneRound.alg?rev=889683&r1=889682&r2=889683&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/benchmark/conf/wikipediaOneRound.alg (original)
+++ lucene/java/branches/flex_1458/contrib/benchmark/conf/wikipediaOneRound.alg Fri Dec 11 16:22:30 2009
@@ -37,7 +37,7 @@
 
 docs.file=temp/enwiki-20070527-pages-articles.xml
 
-doc.maker=org.apache.lucene.benchmark.byTask.feeds.EnwikiDocMaker
+content.source=org.apache.lucene.benchmark.byTask.feeds.EnwikiContentSource
 
 query.maker=org.apache.lucene.benchmark.byTask.feeds.ReutersQueryMaker
 

Modified: lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java?rev=889683&r1=889682&r2=889683&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java (original)
+++ lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java Fri Dec 11 16:22:30 2009
@@ -169,6 +169,7 @@
 
     if (closeSearcher) {
       searcher.close();
+      reader.close();
     } else {
       // Release our +1 ref from above
       reader.decRef();

Modified: lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java?rev=889683&r1=889682&r2=889683&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java (original)
+++ lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java Fri Dec 11 16:22:30 2009
@@ -445,12 +445,11 @@
     // Run algo
     Benchmark benchmark = execBenchmark(algLines1);
 
-    List stats = benchmark.getRunData().getPoints().taskStats();
+    List<TaskStats> stats = benchmark.getRunData().getPoints().taskStats();
 
     // Count how many tokens all ReadTokens saw
     int totalTokenCount1 = 0;
-    for (Iterator it = stats.iterator(); it.hasNext();) {
-      TaskStats stat = (TaskStats) it.next();
+    for (final TaskStats stat : stats) {
       if (stat.getTask().getName().equals("ReadTokens")) {
         totalTokenCount1 += stat.getCount();
       }
@@ -814,8 +813,7 @@
     // 3. test counters
     int n = disable ? 0 : 1;
     int nChecked = 0;
-    for (Iterator ts = benchmark.getRunData().getPoints().taskStats().iterator(); ts.hasNext();) {
-      TaskStats stats = (TaskStats) ts.next();
+    for (final TaskStats stats : benchmark.getRunData().getPoints().taskStats()) {
       String taskName = stats.getTask().getName();
       if (taskName.equals("Rounds")) {
         assertEquals("Wrong total count!",20+2*n,stats.getCount());

Modified: lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksParse.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksParse.java?rev=889683&r1=889682&r2=889683&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksParse.java (original)
+++ lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksParse.java Fri Dec 11 16:22:30 2009
@@ -49,10 +49,9 @@
     String parsedTasks = "[ "+taskStr+" ] : 1000";
     Benchmark benchmark = new Benchmark(new StringReader(propPart+parsedTasks));
     Algorithm alg = benchmark.getAlgorithm();
-    ArrayList algTasks = alg.extractTasks();
+    ArrayList<PerfTask> algTasks = alg.extractTasks();
     boolean foundAdd = false;
-    for (Iterator iter = algTasks.iterator(); iter.hasNext();) {
-       PerfTask task = (PerfTask) iter.next();
+    for (final PerfTask task : algTasks) {
        if (task.toString().indexOf(taskStr)>=0) {
           foundAdd = true;
        }
@@ -70,10 +69,9 @@
     String parsedTasks = "{ "+taskStr+" } : 1000";
     Benchmark benchmark = new Benchmark(new StringReader(propPart+parsedTasks));
     Algorithm alg = benchmark.getAlgorithm();
-    ArrayList algTasks = alg.extractTasks();
+    ArrayList<PerfTask> algTasks = alg.extractTasks();
     boolean foundAdd = false;
-    for (Iterator iter = algTasks.iterator(); iter.hasNext();) {
-       PerfTask task = (PerfTask) iter.next();
+    for (final PerfTask task : algTasks) {
        if (task.toString().indexOf(taskStr)>=0) {
           foundAdd = true;
        }

Modified: lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java?rev=889683&r1=889682&r2=889683&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java (original)
+++ lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java Fri Dec 11 16:22:30 2009
@@ -978,12 +978,12 @@
         WeightedSpanTerm[] wTerms = new WeightedSpanTerm[2];
         wTerms[0] = new WeightedSpanTerm(10f, "hello");
 
-        List positionSpans = new ArrayList();
+        List<PositionSpan> positionSpans = new ArrayList<PositionSpan>();
         positionSpans.add(new PositionSpan(0, 0));
         wTerms[0].addPositionSpans(positionSpans);
 
         wTerms[1] = new WeightedSpanTerm(1f, "kennedy");
-        positionSpans = new ArrayList();
+        positionSpans = new ArrayList<PositionSpan>();
         positionSpans.add(new PositionSpan(14, 14));
         wTerms[1].addPositionSpans(positionSpans);
 
@@ -1021,7 +1021,7 @@
 
       @Override
       public void run() throws Exception {
-        HashMap synonyms = new HashMap();
+        HashMap<String,String> synonyms = new HashMap<String,String>();
         synonyms.put("football", "soccer,footie");
         Analyzer analyzer = new SynonymAnalyzer(synonyms);
         String srchkey = "football";
@@ -1139,7 +1139,7 @@
       @Override
       public void run() throws Exception {
         String goodWord = "goodtoken";
-        Set stopWords = new HashSet(1);
+        Set<String> stopWords = new HashSet<String>(1);
         stopWords.add("stoppedtoken");
 
         TermQuery query = new TermQuery(new Term("data", goodWord));
@@ -1184,7 +1184,7 @@
     TestHighlightRunner helper = new TestHighlightRunner() {
       @Override
       public void run() throws Exception {
-        Set stopWords = new HashSet();
+        Set<String> stopWords = new HashSet<String>();
         stopWords.add("in");
         stopWords.add("it");
         TermQuery query = new TermQuery(new Term("text", "searchterm"));
@@ -1425,8 +1425,8 @@
   protected TokenStream getTS2() {
     // String s = "Hi-Speed10 foo";
     return new TokenStream() {
-      Iterator iter;
-      List lst;
+      Iterator<Token> iter;
+      List<Token> lst;
       private TermAttribute termAtt;
       private PositionIncrementAttribute posIncrAtt;
       private OffsetAttribute offsetAtt;
@@ -1434,7 +1434,7 @@
         termAtt = addAttribute(TermAttribute.class);
         posIncrAtt = addAttribute(PositionIncrementAttribute.class);
         offsetAtt = addAttribute(OffsetAttribute.class);
-        lst = new ArrayList();
+        lst = new ArrayList<Token>();
         Token t;
         t = createToken("hi", 0, 2);
         t.setPositionIncrement(1);
@@ -1457,7 +1457,7 @@
       @Override
       public boolean incrementToken() throws IOException {
         if(iter.hasNext()) {
-          Token token = (Token) iter.next();
+          Token token =  iter.next();
           termAtt.setTermBuffer(token.term());
           posIncrAtt.setPositionIncrement(token.getPositionIncrement());
           offsetAtt.setOffset(token.startOffset(), token.endOffset());
@@ -1473,8 +1473,8 @@
   protected TokenStream getTS2a() {
     // String s = "Hi-Speed10 foo";
     return new TokenStream() {
-      Iterator iter;
-      List lst;
+      Iterator<Token> iter;
+      List<Token> lst;
       private TermAttribute termAtt;
       private PositionIncrementAttribute posIncrAtt;
       private OffsetAttribute offsetAtt;
@@ -1482,7 +1482,7 @@
         termAtt = addAttribute(TermAttribute.class);
         posIncrAtt = addAttribute(PositionIncrementAttribute.class);
         offsetAtt = addAttribute(OffsetAttribute.class);
-        lst = new ArrayList();
+        lst = new ArrayList<Token>();
         Token t;
         t = createToken("hispeed", 0, 8);
         t.setPositionIncrement(1);
@@ -1505,7 +1505,7 @@
       @Override
       public boolean incrementToken() throws IOException {
         if(iter.hasNext()) {
-          Token token = (Token) iter.next();
+          Token token = iter.next();
           termAtt.setTermBuffer(token.term());
           posIncrAtt.setPositionIncrement(token.getPositionIncrement());
           offsetAtt.setOffset(token.startOffset(), token.endOffset());
@@ -1785,9 +1785,9 @@
 // ===================================================================
 
 class SynonymAnalyzer extends Analyzer {
-  private Map synonyms;
+  private Map<String,String> synonyms;
 
-  public SynonymAnalyzer(Map synonyms) {
+  public SynonymAnalyzer(Map<String,String> synonyms) {
     this.synonyms = synonyms;
   }
 
@@ -1815,7 +1815,7 @@
   private TokenStream realStream;
   private Token currentRealToken = null;
   private org.apache.lucene.analysis.Token cRealToken = null;
-  private Map synonyms;
+  private Map<String,String> synonyms;
   StringTokenizer st = null;
   private TermAttribute realTermAtt;
   private PositionIncrementAttribute realPosIncrAtt;
@@ -1824,7 +1824,7 @@
   private PositionIncrementAttribute posIncrAtt;
   private OffsetAttribute offsetAtt;
 
-  public SynonymTokenizer(TokenStream realStream, Map synonyms) {
+  public SynonymTokenizer(TokenStream realStream, Map<String,String> synonyms) {
     this.realStream = realStream;
     this.synonyms = synonyms;
     realTermAtt = realStream.addAttribute(TermAttribute.class);
@@ -1849,7 +1849,7 @@
       offsetAtt.setOffset(realOffsetAtt.startOffset(), realOffsetAtt.endOffset());
       posIncrAtt.setPositionIncrement(realPosIncrAtt.getPositionIncrement());
 
-      String expansions = (String) synonyms.get(realTermAtt.term());
+      String expansions =  synonyms.get(realTermAtt.term());
       if (expansions == null) {
         return true;
       }

Modified: lucene/java/branches/flex_1458/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndex.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndex.java?rev=889683&r1=889682&r2=889683&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndex.java (original)
+++ lucene/java/branches/flex_1458/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndex.java Fri Dec 11 16:22:30 2009
@@ -35,6 +35,7 @@
 import org.apache.lucene.index.TermEnum;
 import org.apache.lucene.index.TermPositionVector;
 import org.apache.lucene.index.TermPositions;
+import org.apache.lucene.util.BitVector;
 
 /**
  * Represented as a coupled graph of class instances, this
@@ -61,8 +62,7 @@
 
   private InstantiatedDocument[] documentsByNumber;
 
-  /** todo: should this be a BitSet? */
-  private Set<Integer> deletedDocuments;
+  private BitVector deletedDocuments;
 
   private Map<String, Map<String, InstantiatedTerm>> termsByFieldAndText;
   private InstantiatedTerm[] orderedTerms;
@@ -85,7 +85,6 @@
     orderedTerms = new InstantiatedTerm[0];
     documentsByNumber = new InstantiatedDocument[0];
     normsByFieldNameAndDocumentNumber = new HashMap<String, byte[]>();
-    deletedDocuments = new HashSet<Integer>();
   }
 
   
@@ -174,11 +173,14 @@
 
     documentsByNumber = new InstantiatedDocument[sourceIndexReader.maxDoc()];
 
+    if (sourceIndexReader.hasDeletions()) {
+      deletedDocuments = new BitVector(sourceIndexReader.maxDoc());
+    }
 
     // create documents
     for (int i = 0; i < sourceIndexReader.maxDoc(); i++) {
-      if (sourceIndexReader.isDeleted(i)) {
-        deletedDocuments.add(i);
+      if (sourceIndexReader.hasDeletions() && sourceIndexReader.isDeleted(i)) {
+        deletedDocuments.set(i);
       } else {
         InstantiatedDocument document = new InstantiatedDocument();
         // copy stored fields from source reader
@@ -329,10 +331,13 @@
     this.normsByFieldNameAndDocumentNumber = normsByFieldNameAndDocumentNumber;
   }
 
-  public Set<Integer> getDeletedDocuments() {
+  public BitVector getDeletedDocuments() {
     return deletedDocuments;
   }
 
+  void setDeletedDocuments(BitVector deletedDocuments) {
+    this.deletedDocuments = deletedDocuments;
+  }
 
   void setOrderedTerms(InstantiatedTerm[] orderedTerms) {
     this.orderedTerms = orderedTerms;