You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2012/07/20 03:01:52 UTC
svn commit: r1363608 [1/10] - in /lucene/dev/branches/LUCENE-2878: ./
dev-tools/ dev-tools/eclipse/ dev-tools/idea/.idea/copyright/
dev-tools/idea/.idea/libraries/ dev-tools/idea/lucene/ dev-tools/maven/
dev-tools/maven/lucene/benchmark/ dev-tools/mave...
Author: simonw
Date: Fri Jul 20 01:01:39 2012
New Revision: 1363608
URL: http://svn.apache.org/viewvc?rev=1363608&view=rev
Log:
LUCENE-2878: catch up with trunk and align interval iterators with scorers since LUCENE-3505 fixed BS2
Added:
lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/Lucene_tools_library.xml
- copied unchanged from r1363278, lucene/dev/trunk/dev-tools/idea/.idea/libraries/Lucene_tools_library.xml
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilter.java
- copied unchanged from r1363278, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilter.java
lucene/dev/branches/LUCENE-2878/lucene/benchmark/lib/nekohtml-1.9.15.jar.sha1
- copied unchanged from r1363278, lucene/dev/trunk/lucene/benchmark/lib/nekohtml-1.9.15.jar.sha1
lucene/dev/branches/LUCENE-2878/lucene/benchmark/lib/nekohtml-LICENSE-ASL.txt
- copied unchanged from r1363278, lucene/dev/trunk/lucene/benchmark/lib/nekohtml-LICENSE-ASL.txt
lucene/dev/branches/LUCENE-2878/lucene/benchmark/lib/nekohtml-NOTICE.txt
- copied unchanged from r1363278, lucene/dev/trunk/lucene/benchmark/lib/nekohtml-NOTICE.txt
lucene/dev/branches/LUCENE-2878/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestHtmlParser.java
- copied unchanged from r1363278, lucene/dev/trunk/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestHtmlParser.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/analysis/CharFilter.java
- copied unchanged from r1363278, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/analysis/CharFilter.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/DisjunctionScorer.java
- copied unchanged from r1363278, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DisjunctionScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/analysis/TestCharFilter.java
- copied unchanged from r1363278, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/analysis/TestCharFilter.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java
- copied unchanged from r1363278, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestConjunctions.java
- copied unchanged from r1363278, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestConjunctions.java
lucene/dev/branches/LUCENE-2878/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/
- copied from r1363278, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/
lucene/dev/branches/LUCENE-2878/lucene/test-framework/src/java/org/apache/lucene/index/AssertingAtomicReader.java
- copied unchanged from r1363278, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/AssertingAtomicReader.java
lucene/dev/branches/LUCENE-2878/lucene/test-framework/src/java/org/apache/lucene/index/AssertingDirectoryReader.java
- copied unchanged from r1363278, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/AssertingDirectoryReader.java
lucene/dev/branches/LUCENE-2878/lucene/tools/clover/
- copied from r1363278, lucene/dev/trunk/lucene/tools/clover/
lucene/dev/branches/LUCENE-2878/lucene/tools/forbiddenApis/system-out.txt
- copied unchanged from r1363278, lucene/dev/trunk/lucene/tools/forbiddenApis/system-out.txt
lucene/dev/branches/LUCENE-2878/lucene/tools/forbiddenApis/tests.txt
- copied unchanged from r1363278, lucene/dev/trunk/lucene/tools/forbiddenApis/tests.txt
lucene/dev/branches/LUCENE-2878/solr/cloud-dev/cli-test-solrcloud-start.sh
- copied unchanged from r1363278, lucene/dev/trunk/solr/cloud-dev/cli-test-solrcloud-start.sh
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/cloud/ZkCLI.java
- copied unchanged from r1363278, lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkCLI.java
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/update/processor/ScriptEngineCustomizer.java
- copied unchanged from r1363278, lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/ScriptEngineCustomizer.java
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/update/processor/StatelessScriptUpdateProcessorFactory.java
- copied unchanged from r1363278, lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/StatelessScriptUpdateProcessorFactory.java
lucene/dev/branches/LUCENE-2878/solr/core/src/test-files/solr/collection1/conf/addfields.updateprocessor.js
- copied unchanged from r1363278, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/addfields.updateprocessor.js
lucene/dev/branches/LUCENE-2878/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-bogus-scriptengine-name.xml
- copied unchanged from r1363278, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-bogus-scriptengine-name.xml
lucene/dev/branches/LUCENE-2878/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-invalid-scriptfile.xml
- copied unchanged from r1363278, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-invalid-scriptfile.xml
lucene/dev/branches/LUCENE-2878/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-missing-scriptfile.xml
- copied unchanged from r1363278, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-missing-scriptfile.xml
lucene/dev/branches/LUCENE-2878/solr/core/src/test-files/solr/collection1/conf/conditional.updateprocessor.js
- copied unchanged from r1363278, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/conditional.updateprocessor.js
lucene/dev/branches/LUCENE-2878/solr/core/src/test-files/solr/collection1/conf/missing.functions.updateprocessor.js
- copied unchanged from r1363278, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/missing.functions.updateprocessor.js
lucene/dev/branches/LUCENE-2878/solr/core/src/test-files/solr/collection1/conf/missleading.extension.updateprocessor.js.txt
- copied unchanged from r1363278, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/missleading.extension.updateprocessor.js.txt
lucene/dev/branches/LUCENE-2878/solr/core/src/test-files/solr/collection1/conf/solrconfig-script-updateprocessor.xml
- copied unchanged from r1363278, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-script-updateprocessor.xml
lucene/dev/branches/LUCENE-2878/solr/core/src/test-files/solr/collection1/conf/throw.error.on.add.updateprocessor.js
- copied unchanged from r1363278, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/throw.error.on.add.updateprocessor.js
lucene/dev/branches/LUCENE-2878/solr/core/src/test-files/solr/collection1/conf/trivial.updateprocessor0.js
- copied unchanged from r1363278, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/trivial.updateprocessor0.js
lucene/dev/branches/LUCENE-2878/solr/core/src/test-files/solr/collection1/conf/trivial.updateprocessor1.js
- copied unchanged from r1363278, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/trivial.updateprocessor1.js
lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/TestDocumentBuilder.java
- copied unchanged from r1363278, lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDocumentBuilder.java
lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java
- copied unchanged from r1363278, lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java
lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/core/AbstractBadConfigTestBase.java
- copied unchanged from r1363278, lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/AbstractBadConfigTestBase.java
lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/search/TestReload.java
- copied unchanged from r1363278, lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestReload.java
lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/update/processor/ScriptEngineTest.java
- copied unchanged from r1363278, lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/processor/ScriptEngineTest.java
lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/update/processor/StatelessScriptUpdateProcessorFactoryTest.java
- copied unchanged from r1363278, lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/processor/StatelessScriptUpdateProcessorFactoryTest.java
lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/update/processor/UpdateProcessorTestBase.java
- copied unchanged from r1363278, lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/processor/UpdateProcessorTestBase.java
lucene/dev/branches/LUCENE-2878/solr/example/cloud-scripts/
- copied from r1363278, lucene/dev/trunk/solr/example/cloud-scripts/
lucene/dev/branches/LUCENE-2878/solr/example/contexts/
- copied from r1363278, lucene/dev/trunk/solr/example/contexts/
lucene/dev/branches/LUCENE-2878/solr/example/solr-webapp/ (props changed)
- copied from r1363278, lucene/dev/trunk/solr/example/solr-webapp/
lucene/dev/branches/LUCENE-2878/solr/lib/commons-cli-1.2.jar.sha1
- copied unchanged from r1363278, lucene/dev/trunk/solr/lib/commons-cli-1.2.jar.sha1
lucene/dev/branches/LUCENE-2878/solr/lib/commons-cli-LICENSE-ASL.txt
- copied unchanged from r1363278, lucene/dev/trunk/solr/lib/commons-cli-LICENSE-ASL.txt
lucene/dev/branches/LUCENE-2878/solr/lib/commons-cli-NOTICE.txt
- copied unchanged from r1363278, lucene/dev/trunk/solr/lib/commons-cli-NOTICE.txt
lucene/dev/branches/LUCENE-2878/solr/lib/zookeeper-3.3.5.jar.sha1
- copied unchanged from r1363278, lucene/dev/trunk/solr/lib/zookeeper-3.3.5.jar.sha1
Removed:
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/CharFilter.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestCharFilter.java
lucene/dev/branches/LUCENE-2878/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/
lucene/dev/branches/LUCENE-2878/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/StringBuilderReader.java
lucene/dev/branches/LUCENE-2878/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/demohtml/
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/analysis/CharReader.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/analysis/CharStream.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/MatchOnlyConjunctionTermsScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/util/ScorerDocQueue.java
lucene/dev/branches/LUCENE-2878/lucene/spatial/src/java/org/apache/lucene/spatial/util/NumericFieldInfo.java
lucene/dev/branches/LUCENE-2878/lucene/spatial/src/java/org/apache/lucene/spatial/util/StringListTokenizer.java
lucene/dev/branches/LUCENE-2878/lucene/spatial/src/java/org/apache/lucene/spatial/util/TruncateFilter.java
lucene/dev/branches/LUCENE-2878/solr/example/work/
lucene/dev/branches/LUCENE-2878/solr/lib/zookeeper-3.3.4.jar.sha1
Modified:
lucene/dev/branches/LUCENE-2878/ (props changed)
lucene/dev/branches/LUCENE-2878/build.xml
lucene/dev/branches/LUCENE-2878/dev-tools/ (props changed)
lucene/dev/branches/LUCENE-2878/dev-tools/eclipse/dot.classpath
lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/copyright/profiles_settings.xml
lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/Ant.xml
lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/HSQLDB.xml
lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/JUnit.xml
lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/Solr_extraction_library.xml
lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/Solr_velocity_library.xml
lucene/dev/branches/LUCENE-2878/dev-tools/idea/lucene/lucene.iml
lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/benchmark/pom.xml.template
lucene/dev/branches/LUCENE-2878/dev-tools/maven/pom.xml.template
lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/core/pom.xml.template
lucene/dev/branches/LUCENE-2878/dev-tools/scripts/smokeTestRelease.py
lucene/dev/branches/LUCENE-2878/lucene/ (props changed)
lucene/dev/branches/LUCENE-2878/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/ (props changed)
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/BaseCharFilter.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilter.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/HyphenationTree.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternParser.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordTokenizer.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemmer.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemmer.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianAnalyzer.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianCharFilter.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellDictionary.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellStemmer.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceCharFilter.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizer.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/RSLPStemmerBase.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicAnalyzer.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizer.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardAnalyzer.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailAnalyzer.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizer.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharFilterFactory.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharTokenizer.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizer.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/tartarus/snowball/SnowballProgram.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/overview.html
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/HTMLStripCharFilterTest.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKAnalyzer.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/CommonGramsFilterTest.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAnalyzers.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilter.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilter.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilter.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilter.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilter.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilter.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilter.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/HunspellDictionaryTest.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPerFieldAnalyzerWrapper.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilterTest.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerTest.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenFilterTest.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/nl/TestDutchStemmer.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianLightStemFilter.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianMinimalStemFilter.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/path/TestPathHierarchyTokenizer.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceCharFilter.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTokenizer.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseLightStemFilter.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseMinimalStemFilter.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseStemFilter.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianLightStemFilter.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleFilterTest.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishLightStemFilter.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymMapFilter.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishLowerCaseFilter.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizer.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizer.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilter.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseTokenizer.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseBaseFormFilter.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseIterationMarkCharFilter.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseKatakanaStemFilter.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/AnalyzerProfile.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SentenceTokenizer.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/AbstractDictionary.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/BigramDictionary.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/WordDictionary.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/stempel/src/java/org/egothor/stemmer/Compile.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/stempel/src/java/org/egothor/stemmer/DiffIt.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/stempel/src/java/org/egothor/stemmer/MultiTrie.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/stempel/src/java/org/egothor/stemmer/Row.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/stempel/src/java/org/egothor/stemmer/Trie.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/BaseUIMATokenizer.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java
lucene/dev/branches/LUCENE-2878/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMATypeAwareAnalyzerTest.java
lucene/dev/branches/LUCENE-2878/lucene/benchmark/ (props changed)
lucene/dev/branches/LUCENE-2878/lucene/benchmark/build.xml
lucene/dev/branches/LUCENE-2878/lucene/benchmark/ivy.xml
lucene/dev/branches/LUCENE-2878/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DemoHTMLParser.java
lucene/dev/branches/LUCENE-2878/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/HTMLParser.java
lucene/dev/branches/LUCENE-2878/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecContentSource.java
lucene/dev/branches/LUCENE-2878/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecDocParser.java
lucene/dev/branches/LUCENE-2878/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecFBISParser.java
lucene/dev/branches/LUCENE-2878/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecFR94Parser.java
lucene/dev/branches/LUCENE-2878/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecFTParser.java
lucene/dev/branches/LUCENE-2878/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecGov2Parser.java
lucene/dev/branches/LUCENE-2878/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecLATimesParser.java
lucene/dev/branches/LUCENE-2878/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecParserByPath.java
lucene/dev/branches/LUCENE-2878/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TrecContentSourceTest.java
lucene/dev/branches/LUCENE-2878/lucene/build.xml (contents, props changed)
lucene/dev/branches/LUCENE-2878/lucene/common-build.xml (contents, props changed)
lucene/dev/branches/LUCENE-2878/lucene/core/ (props changed)
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/analysis/Analyzer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/analysis/Tokenizer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/codecs/pulsing/PulsingPostingsWriter.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/index/MultiDocsAndPositionsEnum.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/index/MultiDocsEnum.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/BooleanQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/BooleanScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/BooleanScorer2.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/CachingCollector.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/Collector.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ConjunctionScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ConjunctionTermScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/DisjunctionSumScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ExactPhraseScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/FilteredQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/MatchAllDocsQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/MatchOnlyTermScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/NumericRangeQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/PhraseQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/PhraseScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/QueryWrapperFilter.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ReqExclScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ReqOptSumScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ScoreCachingWrappingScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/Scorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/SloppyPhraseScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/TermQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/TermScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/Weight.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BlockIntervalIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BooleanIntervalIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BrouwerianIntervalIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/BrouwerianQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/ConjunctionIntervalIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/DisjunctionIntervalIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalFilterQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/OrderedConjunctionIntervalIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/RangeIntervalIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/SloppyIntervalIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/TermIntervalIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/WithinIntervalIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/spans/SpanScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/spans/SpanWeight.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/spans/SpansScorerWrapper.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/util/Constants.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/util/fst/FST.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/util/fst/NodeHash.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/util/fst/PositiveIntOutputs.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/analysis/TestMockCharFilter.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/index/TestCheckIndex.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/JustCompileSearch.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestCachingCollector.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestTermQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestBasicIntervals.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestBlockIntervalIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestBrouwerianQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestConjunctionIntervalIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestDisjunctionIntervalIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestOrderedConjunctionIntervalIterator.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestPositionsAndOffsets.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/spans/TestSpans.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/util/packed/TestPackedInts.java
lucene/dev/branches/LUCENE-2878/lucene/facet/ (props changed)
lucene/dev/branches/LUCENE-2878/lucene/facet/src/java/org/apache/lucene/util/collections/ArrayHashMap.java
lucene/dev/branches/LUCENE-2878/lucene/facet/src/java/org/apache/lucene/util/collections/FloatToObjectMap.java
lucene/dev/branches/LUCENE-2878/lucene/facet/src/java/org/apache/lucene/util/collections/IntHashSet.java
lucene/dev/branches/LUCENE-2878/lucene/facet/src/java/org/apache/lucene/util/collections/IntToDoubleMap.java
lucene/dev/branches/LUCENE-2878/lucene/facet/src/java/org/apache/lucene/util/collections/IntToIntMap.java
lucene/dev/branches/LUCENE-2878/lucene/facet/src/java/org/apache/lucene/util/collections/IntToObjectMap.java
lucene/dev/branches/LUCENE-2878/lucene/facet/src/java/org/apache/lucene/util/collections/ObjectToFloatMap.java
lucene/dev/branches/LUCENE-2878/lucene/facet/src/java/org/apache/lucene/util/collections/ObjectToIntMap.java
lucene/dev/branches/LUCENE-2878/lucene/grouping/ (props changed)
lucene/dev/branches/LUCENE-2878/lucene/grouping/build.xml
lucene/dev/branches/LUCENE-2878/lucene/grouping/src/java/org/apache/lucene/search/grouping/BlockGroupingCollector.java
lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java
lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/ArrayIntervalIterator.java
lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/HighlightingIntervalCollector.java
lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java
lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldFragList.java
lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/test/org/apache/lucene/search/highlight/positions/IntervalHighlighterTest.java
lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java
lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java
lucene/dev/branches/LUCENE-2878/lucene/join/ (props changed)
lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java
lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java
lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java
lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java
lucene/dev/branches/LUCENE-2878/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
lucene/dev/branches/LUCENE-2878/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java
lucene/dev/branches/LUCENE-2878/lucene/queries/ (props changed)
lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java
lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java
lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java
lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSourceScorer.java
lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java
lucene/dev/branches/LUCENE-2878/lucene/queryparser/ (props changed)
lucene/dev/branches/LUCENE-2878/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/NLS.java
lucene/dev/branches/LUCENE-2878/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/FieldsQuery.java
lucene/dev/branches/LUCENE-2878/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiPhraseQueryParsing.java
lucene/dev/branches/LUCENE-2878/lucene/spatial/ (props changed)
lucene/dev/branches/LUCENE-2878/lucene/spatial/src/java/org/apache/lucene/spatial/SpatialStrategy.java
lucene/dev/branches/LUCENE-2878/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxStrategy.java
lucene/dev/branches/LUCENE-2878/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixCellsTokenizer.java
lucene/dev/branches/LUCENE-2878/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeStrategy.java
lucene/dev/branches/LUCENE-2878/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/QuadPrefixTree.java
lucene/dev/branches/LUCENE-2878/lucene/spatial/src/java/org/apache/lucene/spatial/vector/TwoDoublesStrategy.java
lucene/dev/branches/LUCENE-2878/lucene/spatial/src/test/org/apache/lucene/spatial/PortedSolr3Test.java
lucene/dev/branches/LUCENE-2878/lucene/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java
lucene/dev/branches/LUCENE-2878/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/TestRecursivePrefixTreeStrategy.java
lucene/dev/branches/LUCENE-2878/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/TestTermQueryPrefixGridStrategy.java
lucene/dev/branches/LUCENE-2878/lucene/test-framework/ (props changed)
lucene/dev/branches/LUCENE-2878/lucene/test-framework/src/java/org/apache/lucene/analysis/MockCharFilter.java
lucene/dev/branches/LUCENE-2878/lucene/test-framework/src/java/org/apache/lucene/analysis/MockTokenizer.java
lucene/dev/branches/LUCENE-2878/lucene/test-framework/src/java/org/apache/lucene/codecs/mockrandom/MockRandomPostingsFormat.java
lucene/dev/branches/LUCENE-2878/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java
lucene/dev/branches/LUCENE-2878/lucene/test-framework/src/java/org/apache/lucene/search/AssertingIndexSearcher.java
lucene/dev/branches/LUCENE-2878/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java
lucene/dev/branches/LUCENE-2878/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
lucene/dev/branches/LUCENE-2878/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java
lucene/dev/branches/LUCENE-2878/lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java
lucene/dev/branches/LUCENE-2878/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.Codec
lucene/dev/branches/LUCENE-2878/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat
lucene/dev/branches/LUCENE-2878/lucene/tools/ (props changed)
lucene/dev/branches/LUCENE-2878/lucene/tools/src/java/org/apache/lucene/validation/ForbiddenApisCheckTask.java
lucene/dev/branches/LUCENE-2878/solr/ (props changed)
lucene/dev/branches/LUCENE-2878/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/LUCENE-2878/solr/build.xml (contents, props changed)
lucene/dev/branches/LUCENE-2878/solr/cloud-dev/ (props changed)
lucene/dev/branches/LUCENE-2878/solr/cloud-dev/solrcloud-multi-start.sh
lucene/dev/branches/LUCENE-2878/solr/cloud-dev/solrcloud-start.sh
lucene/dev/branches/LUCENE-2878/solr/common-build.xml (contents, props changed)
lucene/dev/branches/LUCENE-2878/solr/contrib/ (props changed)
lucene/dev/branches/LUCENE-2878/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2TokenizerFactory.java
lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/HTMLStripTransformer.java
lucene/dev/branches/LUCENE-2878/solr/core/ (props changed)
lucene/dev/branches/LUCENE-2878/solr/core/ivy.xml
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/analysis/HTMLStripCharFilterFactory.java
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/analysis/HunspellStemFilterFactory.java
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/analysis/JapaneseIterationMarkCharFilterFactory.java
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/analysis/JapaneseTokenizerFactory.java
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/analysis/LegacyHTMLStripCharFilter.java
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/analysis/LegacyHTMLStripCharFilterFactory.java
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/analysis/MappingCharFilterFactory.java
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/analysis/PatternReplaceCharFilterFactory.java
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/analysis/PersianCharFilterFactory.java
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/analysis/TokenizerChain.java
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/analysis/TrieTokenizerFactory.java
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/cloud/ZkController.java
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/core/CoreContainer.java
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/core/DirectoryFactory.java
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/core/SolrCore.java
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/schema/BoolField.java
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/schema/LatLonType.java
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/search/SolrConstantScoreQuery.java
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/update/SolrCoreState.java
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/update/processor/HTMLStripFieldUpdateProcessorFactory.java
lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/analysis/LegacyHTMLStripCharFilterTest.java
lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/analysis/TestArabicFilters.java
lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/analysis/TestHTMLStripCharFilterFactory.java
lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/analysis/TestJapaneseIterationMarkCharFilterFactory.java
lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/analysis/TestJapaneseTokenizerFactory.java
lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/analysis/TestPatternReplaceCharFilterFactory.java
lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/cloud/AbstractDistributedZkTestCase.java
lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java
lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/cloud/ChaosMonkey.java
lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java
lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/core/TestBadConfig.java
lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/core/TestConfig.java
lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/core/TestPropInject.java
lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/core/TestPropInjectDefaults.java
lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/schema/BadIndexSchemaTest.java
lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/schema/CurrencyFieldTest.java
lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/schema/PreAnalyzedFieldTest.java
lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/update/TestUpdate.java
lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/update/processor/FieldMutatingUpdateProcessorTest.java
lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/util/CircularListTest.java
lucene/dev/branches/LUCENE-2878/solr/example/ (props changed)
lucene/dev/branches/LUCENE-2878/solr/example/README.txt
lucene/dev/branches/LUCENE-2878/solr/example/etc/jetty.xml
lucene/dev/branches/LUCENE-2878/solr/example/solr/collection1/conf/schema.xml
lucene/dev/branches/LUCENE-2878/solr/example/solr/collection1/conf/solrconfig.xml
lucene/dev/branches/LUCENE-2878/solr/example/solr/solr.xml
lucene/dev/branches/LUCENE-2878/solr/lib/ (props changed)
lucene/dev/branches/LUCENE-2878/solr/solrj/ (props changed)
lucene/dev/branches/LUCENE-2878/solr/solrj/ivy.xml
lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/SolrInputDocument.java
lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/SolrInputField.java
lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/params/CollectionParams.java
lucene/dev/branches/LUCENE-2878/solr/test-framework/ (props changed)
lucene/dev/branches/LUCENE-2878/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
lucene/dev/branches/LUCENE-2878/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
lucene/dev/branches/LUCENE-2878/solr/test-framework/src/java/org/apache/solr/analysis/MockCharFilterFactory.java
Modified: lucene/dev/branches/LUCENE-2878/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/build.xml?rev=1363608&r1=1363607&r2=1363608&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/build.xml (original)
+++ lucene/dev/branches/LUCENE-2878/build.xml Fri Jul 20 01:01:39 2012
@@ -176,7 +176,7 @@
</subant>
</target>
- <target name="jar-checksums" description="Recompute SHA1 checksums for all JAR files.">
+ <target name="jar-checksums" depends="resolve" description="Recompute SHA1 checksums for all JAR files.">
<delete>
<fileset dir="${basedir}">
<include name="**/*.jar.sha1"/>
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/eclipse/dot.classpath?rev=1363608&r1=1363607&r2=1363608&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/eclipse/dot.classpath Fri Jul 20 01:01:39 2012
@@ -102,7 +102,9 @@
<classpathentry kind="lib" path="lucene/analysis/morfologik/lib/morfologik-stemming-1.5.3.jar"/>
<classpathentry kind="lib" path="lucene/benchmark/lib/commons-compress-1.2.jar"/>
<classpathentry kind="lib" path="lucene/benchmark/lib/xercesImpl-2.9.1.jar"/>
+ <classpathentry kind="lib" path="lucene/benchmark/lib/nekohtml-1.9.15.jar"/>
<classpathentry kind="lib" path="solr/lib/commons-fileupload-1.2.1.jar"/>
+ <classpathentry kind="lib" path="solr/lib/commons-cli-1.2.jar"/>
<classpathentry kind="lib" path="solr/lib/httpclient-4.1.3.jar"/>
<classpathentry kind="lib" path="solr/lib/httpcore-4.1.4.jar"/>
<classpathentry kind="lib" path="solr/lib/httpmime-4.1.3.jar"/>
@@ -115,7 +117,7 @@
<classpathentry kind="lib" path="solr/lib/slf4j-api-1.6.4.jar"/>
<classpathentry kind="lib" path="solr/lib/slf4j-jdk14-1.6.4.jar"/>
<classpathentry kind="lib" path="solr/lib/wstx-asl-3.2.7.jar"/>
- <classpathentry kind="lib" path="solr/lib/zookeeper-3.3.4.jar"/>
+ <classpathentry kind="lib" path="solr/lib/zookeeper-3.3.5.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jetty-continuation-8.1.2.v20120308.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jetty-deploy-8.1.2.v20120308.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jetty-http-8.1.2.v20120308.jar"/>
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/copyright/profiles_settings.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/copyright/profiles_settings.xml?rev=1363608&r1=1363607&r2=1363608&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/copyright/profiles_settings.xml (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/copyright/profiles_settings.xml Fri Jul 20 01:01:39 2012
@@ -24,4 +24,4 @@
<option name="prefixLines" value="false" />
</LanguageOptions>
</settings>
-</component>
+</component>
\ No newline at end of file
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/Ant.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/Ant.xml?rev=1363608&r1=1363607&r2=1363608&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/Ant.xml (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/Ant.xml Fri Jul 20 01:01:39 2012
@@ -7,4 +7,4 @@
<JAVADOC />
<SOURCES />
</library>
-</component>
+</component>
\ No newline at end of file
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/HSQLDB.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/HSQLDB.xml?rev=1363608&r1=1363607&r2=1363608&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/HSQLDB.xml (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/HSQLDB.xml Fri Jul 20 01:01:39 2012
@@ -6,4 +6,4 @@
<JAVADOC />
<SOURCES />
</library>
-</component>
+</component>
\ No newline at end of file
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/JUnit.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/JUnit.xml?rev=1363608&r1=1363607&r2=1363608&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/JUnit.xml (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/JUnit.xml Fri Jul 20 01:01:39 2012
@@ -7,4 +7,4 @@
<JAVADOC />
<SOURCES />
</library>
-</component>
+</component>
\ No newline at end of file
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/Solr_extraction_library.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/Solr_extraction_library.xml?rev=1363608&r1=1363607&r2=1363608&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/Solr_extraction_library.xml (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/Solr_extraction_library.xml Fri Jul 20 01:01:39 2012
@@ -7,4 +7,4 @@
<SOURCES />
<jarDirectory url="file://$PROJECT_DIR$/solr/contrib/extraction/lib" recursive="false" />
</library>
-</component>
+</component>
\ No newline at end of file
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/Solr_velocity_library.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/Solr_velocity_library.xml?rev=1363608&r1=1363607&r2=1363608&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/Solr_velocity_library.xml (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/Solr_velocity_library.xml Fri Jul 20 01:01:39 2012
@@ -7,4 +7,4 @@
<SOURCES />
<jarDirectory url="file://$PROJECT_DIR$/solr/contrib/velocity/lib" recursive="false" />
</library>
-</component>
+</component>
\ No newline at end of file
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/idea/lucene/lucene.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/idea/lucene/lucene.iml?rev=1363608&r1=1363607&r2=1363608&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/idea/lucene/lucene.iml (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/idea/lucene/lucene.iml Fri Jul 20 01:01:39 2012
@@ -17,6 +17,7 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="library" name="Lucene tools library" level="project" />
<orderEntry type="library" name="Ant" level="project"/>
</component>
</module>
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/benchmark/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/benchmark/pom.xml.template?rev=1363608&r1=1363607&r2=1363608&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/benchmark/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/lucene/benchmark/pom.xml.template Fri Jul 20 01:01:39 2012
@@ -90,6 +90,11 @@
<artifactId>icu4j</artifactId>
</dependency>
<dependency>
+ <groupId>net.sourceforge.nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ <version>1.9.15</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</dependency>
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/pom.xml.template?rev=1363608&r1=1363607&r2=1363608&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/pom.xml.template Fri Jul 20 01:01:39 2012
@@ -156,6 +156,11 @@
<version>1.6</version>
</dependency>
<dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<version>1.7</version>
@@ -293,7 +298,7 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.3.4</version>
+ <version>3.3.5</version>
</dependency>
<dependency>
<groupId>org.carrot2</groupId>
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/core/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/core/pom.xml.template?rev=1363608&r1=1363607&r2=1363608&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/core/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/core/pom.xml.template Fri Jul 20 01:01:39 2012
@@ -139,6 +139,10 @@
<artifactId>commons-codec</artifactId>
</dependency>
<dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </dependency>
+ <dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
</dependency>
Modified: lucene/dev/branches/LUCENE-2878/dev-tools/scripts/smokeTestRelease.py
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/scripts/smokeTestRelease.py?rev=1363608&r1=1363607&r2=1363608&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/scripts/smokeTestRelease.py (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/scripts/smokeTestRelease.py Fri Jul 20 01:01:39 2012
@@ -210,16 +210,6 @@ def checkSigs(project, urlString, versio
if keysURL is None:
raise RuntimeError('%s is missing KEYS' % project)
- if not os.path.exists('%s/apache-rat-0.8.jar' % tmpDir):
- print ' downloading Apache RAT...'
- download('apache-rat-incubating-0.8-bin.tar.bz2',
- 'http://archive.apache.org/dist/incubator/rat/binaries/apache-rat-incubating-0.8-bin.tar.bz2',
- tmpDir)
- t = tarfile.open('%s/apache-rat-incubating-0.8-bin.tar.bz2' % tmpDir)
- t.extract('apache-rat-0.8/apache-rat-0.8.jar', '%s/apache-rat-0.8.jar' % tmpDir)
- else:
- print ' apache RAT already downloaded...'
-
print ' get KEYS'
download('%s.KEYS' % project, keysURL, tmpDir)
@@ -480,9 +470,6 @@ def verifyUnpacked(project, artifact, un
print ' run "ant validate"'
run('%s; ant validate' % javaExe('1.7'), '%s/validate.log' % unpackPath)
- print ' run "ant rat-sources"'
- run('%s; ant -lib "%s/apache-rat-0.8.jar/apache-rat-0.8" rat-sources' % (javaExe('1.7'), tmpDir), '%s/rat-sources.log' % unpackPath)
-
if project == 'lucene':
print ' run tests w/ Java 6...'
run('%s; ant test' % javaExe('1.6'), '%s/test.log' % unpackPath)
Modified: lucene/dev/branches/LUCENE-2878/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/CHANGES.txt?rev=1363608&r1=1363607&r2=1363608&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/CHANGES.txt Fri Jul 20 01:01:39 2012
@@ -18,6 +18,10 @@ New features
create automata from a fixed collection of UTF-8 encoded BytesRef
(Dawid Weiss, Robert Muir)
+* LUCENE-4153: Added option to fast vector highlighting via BaseFragmentsBuilder to
+ respect field boundaries in the case of highlighting for multivalued fields.
+ (Martijn van Groningen)
+
API Changes
* LUCENE-4138: update of morfologik (Polish morphological analyzer) to 1.5.3.
@@ -29,6 +33,19 @@ API Changes
make a custom FieldType and set indexed = true, its analyzed by the analyzer.
(Robert Muir)
+* LUCENE-4220: Removed the buggy JavaCC-based HTML parser in the benchmark
+ module and replaced by NekoHTML. HTMLParser interface was cleaned up while
+ changing method signatures. (Uwe Schindler, Robert Muir)
+
+* LUCENE-2191: Rename Tokenizer.reset(Reader) to Tokenizer.setReader(Reader).
+ The purpose of this method was always to set a new Reader on the Tokenizer,
+ reusing the object. But the name was often confused with TokenStream.reset().
+ (Robert Muir)
+
+* LUCENE-4228: Refactored CharFilter to extend java.io.FilterReader. CharFilters
+ filter another reader and you override correct() for offset correction.
+ (Robert Muir)
+
Optimizations
* LUCENE-4171: Performance improvements to Packed64.
@@ -37,6 +54,9 @@ Optimizations
* LUCENE-4184: Performance improvements to the aligned packed bits impl.
(Toke Eskildsen, Adrien Grand)
+* LUCENE-4235: Remove enforcing of Filter rewrite for NRQ queries.
+ (Uwe Schindler)
+
Bug Fixes
* LUCENE-4176: Fix AnalyzingQueryParser to analyze range endpoints as bytes,
@@ -48,6 +68,22 @@ Bug Fixes
leave temp files behind in /tmp on Windows. Fix Sort to not leave
temp files behind when /tmp is a separate volume. (Uwe Schindler, Robert Muir)
+* LUCENE-4221: Fix overeager CheckIndex validation for term vector offsets.
+ (Robert Muir)
+
+* LUCENE-4222: TieredMergePolicy.getFloorSegmentMB was returning the
+ size in bytes not MB (Chris Fuller via Mike McCandless)
+
+* LUCENE-3505: Fix bug (Lucene 4.0alpha only) where boolean conjunctions
+ were sometimes scored incorrectly. Conjunctions of only termqueries where
+ at least one term omitted term frequencies (IndexOptions.DOCS_ONLY) would
+ be scored as if all terms omitted term frequencies. (Robert Muir)
+
+* LUCENE-2686, LUCENE-3505: Fixed BooleanQuery scorers to return correct
+ freq(). Added support for scorer navigation API (Scorer.getChildren) to
+ all queries. Made Scorer.freq() abstract.
+ (Koji Sekiguchi, Mike McCandless, Robert Muir)
+
Build
* LUCENE-4094: Support overriding file.encoding on forked test JVMs
@@ -75,6 +111,10 @@ Build
charset, default locale, or default timezone and fail build if violations
found. This ensures, that Lucene / Solr is independent on local configuration
options. (Uwe Schindler, Robert Muir, Dawid Weiss)
+
+* LUCENE-4217: Add the possibility to run tests with Atlassian Clover
+ loaded from IVY. A development License solely for Apache code was added in
+ the tools/ folder, but is not included in releases. (Uwe Schindler)
Documentation
@@ -1149,6 +1189,10 @@ Bug fixes
* LUCENE-4147: Fixed thread safety issues when rollback() and commit()
are called simultaneously. (Simon Willnauer, Mike McCandless)
+* LUCENE-4165: Removed closing of the Reader used to read the affix file in
+ HunspellDictionary. Consumers are now responsible for closing all InputStreams
+ once the Dictionary has been instantiated. (Torsten Krah, Uwe Schindler, Chris Male)
+
Documentation
* LUCENE-3958: Javadocs corrections for IndexWriter.
Modified: lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/BaseCharFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/BaseCharFilter.java?rev=1363608&r1=1363607&r2=1363608&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/BaseCharFilter.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/BaseCharFilter.java Fri Jul 20 01:01:39 2012
@@ -17,9 +17,10 @@
package org.apache.lucene.analysis.charfilter;
-import org.apache.lucene.analysis.CharStream;
+import org.apache.lucene.analysis.CharFilter;
import org.apache.lucene.util.ArrayUtil;
+import java.io.Reader;
import java.util.Arrays;
/**
@@ -34,7 +35,7 @@ public abstract class BaseCharFilter ext
private int diffs[];
private int size = 0;
- public BaseCharFilter(CharStream in) {
+ public BaseCharFilter(Reader in) {
super(in);
}
Modified: lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java?rev=1363608&r1=1363607&r2=1363608&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java Fri Jul 20 01:01:39 2012
@@ -1,4 +1,4 @@
-/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 5/18/12 12:24 PM */
+/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 7/16/12 4:05 PM */
package org.apache.lucene.analysis.charfilter;
@@ -20,13 +20,13 @@ package org.apache.lucene.analysis.charf
*/
import java.io.IOException;
+import java.io.Reader;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import org.apache.lucene.util.Version;
-import org.apache.lucene.analysis.CharStream;
import org.apache.lucene.analysis.util.CharArrayMap;
import org.apache.lucene.analysis.util.CharArraySet;
import org.apache.lucene.analysis.util.OpenStringBuilder;
@@ -40,8 +40,8 @@ import org.apache.lucene.analysis.util.O
/**
* This class is a scanner generated by
* <a href="http://www.jflex.de/">JFlex</a> 1.5.0-SNAPSHOT
- * on 5/18/12 12:24 PM from the specification file
- * <tt>C:/svn/lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex</tt>
+ * on 7/16/12 4:05 PM from the specification file
+ * <tt>/home/rmuir/workspace/lucene-trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex</tt>
*/
public final class HTMLStripCharFilter extends BaseCharFilter {
@@ -30647,7 +30647,7 @@ public final class HTMLStripCharFilter e
/**
* @param source
*/
- public HTMLStripCharFilter(CharStream source) {
+ public HTMLStripCharFilter(Reader source) {
super(source);
this.zzReader = source;
}
@@ -30657,7 +30657,7 @@ public final class HTMLStripCharFilter e
* @param escapedTags Tags in this set (both start and end tags)
* will not be filtered out.
*/
- public HTMLStripCharFilter(CharStream source, Set<String> escapedTags) {
+ public HTMLStripCharFilter(Reader source, Set<String> escapedTags) {
super(source);
this.zzReader = source;
if (null != escapedTags) {
Modified: lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex?rev=1363608&r1=1363607&r2=1363608&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex Fri Jul 20 01:01:39 2012
@@ -18,13 +18,13 @@ package org.apache.lucene.analysis.charf
*/
import java.io.IOException;
+import java.io.Reader;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import org.apache.lucene.util.Version;
-import org.apache.lucene.analysis.CharStream;
import org.apache.lucene.analysis.util.CharArrayMap;
import org.apache.lucene.analysis.util.CharArraySet;
import org.apache.lucene.analysis.util.OpenStringBuilder;
@@ -173,7 +173,7 @@ InlineElment = ( [aAbBiIqQsSuU]
/**
* @param source
*/
- public HTMLStripCharFilter(CharStream source) {
+ public HTMLStripCharFilter(Reader source) {
super(source);
this.zzReader = source;
}
@@ -183,7 +183,7 @@ InlineElment = ( [aAbBiIqQsSuU]
* @param escapedTags Tags in this set (both start and end tags)
* will not be filtered out.
*/
- public HTMLStripCharFilter(CharStream source, Set<String> escapedTags) {
+ public HTMLStripCharFilter(Reader source, Set<String> escapedTags) {
super(source);
this.zzReader = source;
if (null != escapedTags) {
Modified: lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilter.java?rev=1363608&r1=1363607&r2=1363608&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilter.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilter.java Fri Jul 20 01:01:39 2012
@@ -21,8 +21,7 @@ import java.io.IOException;
import java.io.Reader;
import java.util.Map;
-import org.apache.lucene.analysis.CharReader;
-import org.apache.lucene.analysis.CharStream;
+import org.apache.lucene.analysis.CharFilter; // javadocs
import org.apache.lucene.util.CharsRef;
import org.apache.lucene.util.RollingCharBuffer;
import org.apache.lucene.util.fst.CharSequenceOutputs;
@@ -51,8 +50,8 @@ public class MappingCharFilter extends B
private int replacementPointer;
private int inputOff;
- /** Default constructor that takes a {@link CharStream}. */
- public MappingCharFilter(NormalizeCharMap normMap, CharStream in) {
+ /** Default constructor that takes a {@link Reader}. */
+ public MappingCharFilter(NormalizeCharMap normMap, Reader in) {
super(in);
buffer.reset(in);
@@ -66,15 +65,10 @@ public class MappingCharFilter extends B
}
}
- /** Easy-use constructor that takes a {@link Reader}. */
- public MappingCharFilter(NormalizeCharMap normMap, Reader in) {
- this(normMap, CharReader.get(in));
- }
-
@Override
public void reset() throws IOException {
super.reset();
- buffer.reset(input);
+ buffer.reset(in);
replacement = null;
inputOff = 0;
}
Modified: lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/HyphenationTree.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/HyphenationTree.java?rev=1363608&r1=1363607&r2=1363608&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/HyphenationTree.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/HyphenationTree.java Fri Jul 20 01:01:39 2012
@@ -18,6 +18,7 @@
package org.apache.lucene.analysis.compound.hyphenation;
import java.io.File;
+import java.io.PrintStream;
import java.net.MalformedURLException;
import java.util.ArrayList;
import java.util.HashMap;
@@ -463,10 +464,10 @@ public class HyphenationTree extends Ter
}
@Override
- public void printStats() {
- System.out.println("Value space size = "
+ public void printStats(PrintStream out) {
+ out.println("Value space size = "
+ Integer.toString(vspace.length()));
- super.printStats();
+ super.printStats(out);
}
}
Modified: lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternParser.java?rev=1363608&r1=1363607&r2=1363608&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternParser.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternParser.java Fri Jul 20 01:01:39 2012
@@ -40,7 +40,7 @@ import javax.xml.parsers.SAXParserFactor
*
* This class has been taken from the Apache FOP project (http://xmlgraphics.apache.org/fop/). They have been slightly modified.
*/
-public class PatternParser extends DefaultHandler implements PatternConsumer {
+public class PatternParser extends DefaultHandler {
XMLReader parser;
@@ -402,25 +402,4 @@ public class PatternParser extends Defau
return str.toString();
} // getLocationString(SAXParseException):String
-
- // PatternConsumer implementation for testing purposes
- public void addClass(String c) {
- System.out.println("class: " + c);
- }
-
- public void addException(String w, ArrayList<Object> e) {
- System.out.println("exception: " + w + " : " + e.toString());
- }
-
- public void addPattern(String p, String v) {
- System.out.println("pattern: " + p + " : " + v);
- }
-
- public static void main(String[] args) throws Exception {
- if (args.length > 0) {
- PatternParser pp = new PatternParser();
- pp.setConsumer(pp);
- pp.parse(args[0]);
- }
- }
}
Modified: lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java?rev=1363608&r1=1363607&r2=1363608&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java Fri Jul 20 01:01:39 2012
@@ -17,6 +17,7 @@
package org.apache.lucene.analysis.compound.hyphenation;
+import java.io.PrintStream;
import java.util.Enumeration;
import java.util.Stack;
@@ -633,11 +634,11 @@ public class TernaryTree implements Clon
}
- public void printStats() {
- System.out.println("Number of keys = " + Integer.toString(length));
- System.out.println("Node count = " + Integer.toString(freenode));
+ public void printStats(PrintStream out) {
+ out.println("Number of keys = " + Integer.toString(length));
+ out.println("Node count = " + Integer.toString(freenode));
// System.out.println("Array length = " + Integer.toString(eq.length));
- System.out.println("Key Array length = " + Integer.toString(kv.length()));
+ out.println("Key Array length = " + Integer.toString(kv.length()));
/*
* for(int i=0; i<kv.length(); i++) if ( kv.get(i) != 0 )
@@ -647,7 +648,7 @@ public class TernaryTree implements Clon
*/
}
-
+/*
public static void main(String[] args) {
TernaryTree tt = new TernaryTree();
tt.insert("Carlos", 'C');
@@ -658,7 +659,8 @@ public class TernaryTree implements Clon
System.out.println((char) tt.find("Car"));
System.out.println((char) tt.find("Carlos"));
System.out.println((char) tt.find("alto"));
- tt.printStats();
+ tt.printStats(System.out);
}
+ */
}
Modified: lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordTokenizer.java?rev=1363608&r1=1363607&r2=1363608&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordTokenizer.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordTokenizer.java Fri Jul 20 01:01:39 2012
@@ -94,8 +94,8 @@ public final class KeywordTokenizer exte
}
@Override
- public void reset(Reader input) throws IOException {
- super.reset(input);
+ public void setReader(Reader input) throws IOException {
+ super.setReader(input);
this.done = false;
}
}
Modified: lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemmer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemmer.java?rev=1363608&r1=1363607&r2=1363608&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemmer.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemmer.java Fri Jul 20 01:01:39 2012
@@ -289,7 +289,7 @@ public class KStemmer {
entry = new DictEntry(exceptionWords[i], true);
d.put(exceptionWords[i], entry);
} else {
- System.out.println("Warning: Entry [" + exceptionWords[i]
+ throw new RuntimeException("Warning: Entry [" + exceptionWords[i]
+ "] already in dictionary 1");
}
}
@@ -299,7 +299,7 @@ public class KStemmer {
entry = new DictEntry(directConflations[i][1], false);
d.put(directConflations[i][0], entry);
} else {
- System.out.println("Warning: Entry [" + directConflations[i][0]
+ throw new RuntimeException("Warning: Entry [" + directConflations[i][0]
+ "] already in dictionary 2");
}
}
@@ -309,7 +309,7 @@ public class KStemmer {
entry = new DictEntry(countryNationality[i][1], false);
d.put(countryNationality[i][0], entry);
} else {
- System.out.println("Warning: Entry [" + countryNationality[i][0]
+ throw new RuntimeException("Warning: Entry [" + countryNationality[i][0]
+ "] already in dictionary 3");
}
}
@@ -323,7 +323,7 @@ public class KStemmer {
if (!d.containsKey(array[i])) {
d.put(array[i], defaultEntry);
} else {
- System.out.println("Warning: Entry [" + array[i]
+ throw new RuntimeException("Warning: Entry [" + array[i]
+ "] already in dictionary 4");
}
}
@@ -333,7 +333,7 @@ public class KStemmer {
if (!d.containsKey(array[i])) {
d.put(array[i], defaultEntry);
} else {
- System.out.println("Warning: Entry [" + array[i]
+ throw new RuntimeException("Warning: Entry [" + array[i]
+ "] already in dictionary 4");
}
}
@@ -343,7 +343,7 @@ public class KStemmer {
if (!d.containsKey(array[i])) {
d.put(array[i], defaultEntry);
} else {
- System.out.println("Warning: Entry [" + array[i]
+ throw new RuntimeException("Warning: Entry [" + array[i]
+ "] already in dictionary 4");
}
}
@@ -353,7 +353,7 @@ public class KStemmer {
if (!d.containsKey(array[i])) {
d.put(array[i], defaultEntry);
} else {
- System.out.println("Warning: Entry [" + array[i]
+ throw new RuntimeException("Warning: Entry [" + array[i]
+ "] already in dictionary 4");
}
}
@@ -363,7 +363,7 @@ public class KStemmer {
if (!d.containsKey(array[i])) {
d.put(array[i], defaultEntry);
} else {
- System.out.println("Warning: Entry [" + array[i]
+ throw new RuntimeException("Warning: Entry [" + array[i]
+ "] already in dictionary 4");
}
}
@@ -373,7 +373,7 @@ public class KStemmer {
if (!d.containsKey(array[i])) {
d.put(array[i], defaultEntry);
} else {
- System.out.println("Warning: Entry [" + array[i]
+ throw new RuntimeException("Warning: Entry [" + array[i]
+ "] already in dictionary 4");
}
}
@@ -383,7 +383,7 @@ public class KStemmer {
if (!d.containsKey(array[i])) {
d.put(array[i], defaultEntry);
} else {
- System.out.println("Warning: Entry [" + array[i]
+ throw new RuntimeException("Warning: Entry [" + array[i]
+ "] already in dictionary 4");
}
}
@@ -392,7 +392,7 @@ public class KStemmer {
if (!d.containsKey(KStemData8.data[i])) {
d.put(KStemData8.data[i], defaultEntry);
} else {
- System.out.println("Warning: Entry [" + KStemData8.data[i]
+ throw new RuntimeException("Warning: Entry [" + KStemData8.data[i]
+ "] already in dictionary 4");
}
}
@@ -401,7 +401,7 @@ public class KStemmer {
if (!d.containsKey(supplementDict[i])) {
d.put(supplementDict[i], defaultEntry);
} else {
- System.out.println("Warning: Entry [" + supplementDict[i]
+ throw new RuntimeException("Warning: Entry [" + supplementDict[i]
+ "] already in dictionary 5");
}
}
@@ -410,7 +410,7 @@ public class KStemmer {
if (!d.containsKey(properNouns[i])) {
d.put(properNouns[i], defaultEntry);
} else {
- System.out.println("Warning: Entry [" + properNouns[i]
+ throw new RuntimeException("Warning: Entry [" + properNouns[i]
+ "] already in dictionary 6");
}
}
Modified: lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemmer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemmer.java?rev=1363608&r1=1363607&r2=1363608&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemmer.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemmer.java Fri Jul 20 01:01:39 2012
@@ -492,10 +492,9 @@ class PorterStemmer
return dirty;
}
- /** Test program for demonstrating the Stemmer. It reads a file and
+ /* Test program for demonstrating the Stemmer. It reads a file and
* stems each word, writing the result to standard out.
* Usage: Stemmer file-name
- */
public static void main(String[] args) {
PorterStemmer s = new PorterStemmer();
@@ -542,6 +541,6 @@ class PorterStemmer
System.out.println("error reading " + args[i]);
}
}
- }
+ }*/
}
Modified: lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianAnalyzer.java?rev=1363608&r1=1363607&r2=1363608&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianAnalyzer.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianAnalyzer.java Fri Jul 20 01:01:39 2012
@@ -21,7 +21,6 @@ import java.io.IOException;
import java.io.Reader;
import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.CharReader;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.ar.ArabicNormalizationFilter;
@@ -134,6 +133,6 @@ public final class PersianAnalyzer exten
*/
@Override
protected Reader initReader(String fieldName, Reader reader) {
- return new PersianCharFilter(CharReader.get(reader));
+ return new PersianCharFilter(reader);
}
}
Modified: lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianCharFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianCharFilter.java?rev=1363608&r1=1363607&r2=1363608&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianCharFilter.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianCharFilter.java Fri Jul 20 01:01:39 2012
@@ -18,9 +18,9 @@ package org.apache.lucene.analysis.fa;
*/
import java.io.IOException;
+import java.io.Reader;
-import org.apache.lucene.analysis.CharStream;
-import org.apache.lucene.analysis.charfilter.CharFilter;
+import org.apache.lucene.analysis.CharFilter;
/**
* CharFilter that replaces instances of Zero-width non-joiner with an
@@ -28,7 +28,7 @@ import org.apache.lucene.analysis.charfi
*/
public class PersianCharFilter extends CharFilter {
- public PersianCharFilter(CharStream in) {
+ public PersianCharFilter(Reader in) {
super(in);
}
@@ -45,4 +45,9 @@ public class PersianCharFilter extends C
}
return charsRead;
}
+
+ @Override
+ protected int correct(int currentOff) {
+ return currentOff; // we don't change the length of the string
+ }
}