You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2010/05/25 22:16:51 UTC
svn commit: r948195 [1/4] - in /lucene/dev/trunk: lucene/ lucene/contrib/
lucene/contrib/ant/ lucene/contrib/ant/src/java/org/apache/lucene/ant/
lucene/contrib/ant/src/test/org/apache/lucene/ant/
lucene/contrib/benchmark/ lucene/contrib/demo/ lucene/co...
Author: rmuir
Date: Tue May 25 20:16:44 2010
New Revision: 948195
URL: http://svn.apache.org/viewvc?rev=948195&view=rev
Log:
LUCENE-2413: consolidate remaining concrete core analyzers to modules/analysis
Added:
lucene/dev/trunk/lucene/contrib/demo/
lucene/dev/trunk/lucene/contrib/demo/build.xml (with props)
lucene/dev/trunk/lucene/contrib/demo/lib/
lucene/dev/trunk/lucene/contrib/demo/lib/servlet-api-2.4.jar
- copied unchanged from r947868, lucene/dev/trunk/lucene/lib/servlet-api-2.4.jar
lucene/dev/trunk/lucene/contrib/demo/src/
lucene/dev/trunk/lucene/contrib/demo/src/java/
lucene/dev/trunk/lucene/contrib/demo/src/java/demo-build.template
- copied unchanged from r947868, lucene/dev/trunk/lucene/src/demo/demo-build.template
lucene/dev/trunk/lucene/contrib/demo/src/java/org/
- copied from r947868, lucene/dev/trunk/lucene/src/demo/org/
lucene/dev/trunk/lucene/contrib/demo/src/jsp/
- copied from r947868, lucene/dev/trunk/lucene/src/jsp/
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/core/
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordAnalyzer.java
- copied, changed from r947868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/KeywordAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordTokenizer.java
- copied, changed from r947868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/KeywordTokenizer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/core/LetterTokenizer.java
- copied, changed from r947868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/LetterTokenizer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseFilter.java
- copied, changed from r947868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/LowerCaseFilter.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseTokenizer.java
- copied, changed from r947868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/LowerCaseTokenizer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/core/SimpleAnalyzer.java
- copied, changed from r947868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/SimpleAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/core/StopAnalyzer.java
- copied, changed from r947868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/StopAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/core/StopFilter.java
- copied, changed from r947868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/StopFilter.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/core/WhitespaceAnalyzer.java
- copied, changed from r947868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/WhitespaceAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/core/WhitespaceTokenizer.java
- copied, changed from r947868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/WhitespaceTokenizer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/
- copied from r947868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/standard/
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/util/
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/util/ReusableAnalyzerBase.java
- copied, changed from r947868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/ReusableAnalyzerBase.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/util/StopwordAnalyzerBase.java
- copied, changed from r947868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/StopwordAnalyzerBase.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/util/WordlistLoader.java
- copied, changed from r947868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/WordlistLoader.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/collation/
- copied from r947868, lucene/dev/trunk/lucene/src/java/org/apache/lucene/collation/
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/core/
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestAnalyzers.java
- copied, changed from r947868, lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestAnalyzers.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java
- copied, changed from r947868, lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestKeywordAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestStandardAnalyzer.java
- copied, changed from r947868, lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestStandardAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopAnalyzer.java
- copied, changed from r947868, lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestStopAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilter.java
- copied, changed from r947868, lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestStopFilter.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/util/
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/util/TestWordlistLoader.java
- copied, changed from r947868, lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestWordlistLoader.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/collation/
- copied from r947868, lucene/dev/trunk/lucene/src/test/org/apache/lucene/collation/
Removed:
lucene/dev/trunk/lucene/lib/servlet-api-2.4.jar
lucene/dev/trunk/lucene/src/demo/
lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/KeywordAnalyzer.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/KeywordTokenizer.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/LetterTokenizer.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/LowerCaseFilter.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/LowerCaseTokenizer.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/ReusableAnalyzerBase.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/SimpleAnalyzer.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/StopAnalyzer.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/StopFilter.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/StopwordAnalyzerBase.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/WhitespaceAnalyzer.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/WhitespaceTokenizer.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/WordlistLoader.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/standard/
lucene/dev/trunk/lucene/src/java/org/apache/lucene/collation/
lucene/dev/trunk/lucene/src/jsp/
lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestAnalyzers.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestKeywordAnalyzer.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestStandardAnalyzer.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestStopAnalyzer.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestStopFilter.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/collation/
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestWordlistLoader.java
Modified:
lucene/dev/trunk/lucene/build.xml
lucene/dev/trunk/lucene/contrib/CHANGES.txt
lucene/dev/trunk/lucene/contrib/ant/build.xml
lucene/dev/trunk/lucene/contrib/ant/src/java/org/apache/lucene/ant/IndexTask.java
lucene/dev/trunk/lucene/contrib/ant/src/test/org/apache/lucene/ant/IndexTaskTest.java
lucene/dev/trunk/lucene/contrib/benchmark/build.xml
lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java
lucene/dev/trunk/lucene/contrib/lucli/build.xml
lucene/dev/trunk/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java
lucene/dev/trunk/lucene/contrib/misc/build.xml
lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java
lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/misc/IndexMergeTool.java
lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/similar/MoreLikeThis.java
lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java
lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/similar/TestMoreLikeThis.java
lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.java
lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.jj
lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiAnalyzerQPHelper.java
lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQPHelper.java
lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQueryParserWrapper.java
lucene/dev/trunk/lucene/contrib/spellchecker/build.xml
lucene/dev/trunk/lucene/contrib/spellchecker/src/java/org/apache/lucene/search/spell/SpellChecker.java
lucene/dev/trunk/lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java
lucene/dev/trunk/lucene/contrib/swing/build.xml
lucene/dev/trunk/lucene/contrib/swing/src/java/org/apache/lucene/swing/models/ListSearcher.java
lucene/dev/trunk/lucene/contrib/swing/src/java/org/apache/lucene/swing/models/TableSearcher.java
lucene/dev/trunk/lucene/contrib/wordnet/build.xml
lucene/dev/trunk/lucene/contrib/wordnet/src/test/org/apache/lucene/wordnet/TestSynonymTokenFilter.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/TokenStream.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/QueryParser.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/QueryParser.jj
lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/MockTokenizer.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestCharTokenizers.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestToken.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDocumentWriter.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestPayloads.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/queryParser/TestQueryParser.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPositionIncrement.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestRegexpRandom2.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermVectors.java
lucene/dev/trunk/modules/analysis/CHANGES.txt
lucene/dev/trunk/modules/analysis/common/build.xml
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicLetterTokenizer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/cn/ChineseAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/cn/ChineseFilter.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/da/DanishAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/el/GreekAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/id/IndonesianAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PatternAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/ro/RomanianAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianLetterTokenizer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianLowerCaseFilter.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianStemFilter.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballFilter.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiWordFilter.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/collation/CollationKeyAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemmer.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemmer.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/cn/TestChineseTokenizer.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/commongrams/CommonGramsFilterTest.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiNormalizer.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiStemmer.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianStemmer.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/in/TestIndicNormalizer.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/PatternAnalyzerTest.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestASCIIFoldingFilter.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestHyphenatedWordsFilter.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestISOLatin1AccentFilter.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeepWordFilter.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilter.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLengthFilter.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPerFieldAnalzyerWrapper.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPrefixAndSuffixAwareTokenFilter.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPrefixAwareTokenFilter.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilter.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilterTest.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenFilterTest.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceCharFilter.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceFilter.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterTest.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterTest.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/reverse/TestReverseStringFilter.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleFilterTest.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/shingle/TestShingleMatrixFilter.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/DateRecognizerSinkTokenizerTest.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TokenRangeSinkTokenizerTest.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TokenTypeSinkTokenizerTest.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymFilter.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishLowerCaseFilter.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/collation/TestCollationKeyFilter.java
lucene/dev/trunk/modules/analysis/icu/build.xml
lucene/dev/trunk/modules/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyAnalyzer.java
lucene/dev/trunk/modules/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUFoldingFilter.java
lucene/dev/trunk/modules/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2Filter.java
lucene/dev/trunk/modules/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUTransformFilter.java
lucene/dev/trunk/modules/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizer.java
lucene/dev/trunk/modules/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyFilter.java
lucene/dev/trunk/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseAnalyzer.java
lucene/dev/trunk/modules/analysis/stempel/src/java/org/apache/lucene/analysis/pl/PolishAnalyzer.java
lucene/dev/trunk/solr/contrib/extraction/src/test/resources/solr/conf/schema.xml
lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java
lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/CommonGramsFilterFactory.java
lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/CommonGramsQueryFilterFactory.java
lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/KeywordTokenizerFactory.java
lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/LetterTokenizerFactory.java
lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/LowerCaseFilterFactory.java
lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/LowerCaseTokenizerFactory.java
lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/RussianLowerCaseFilterFactory.java
lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/StopFilterFactory.java
lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/WhitespaceTokenizerFactory.java
lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/SpellCheckComponent.java
lucene/dev/trunk/solr/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/CommonGramsFilterFactoryTest.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/CommonGramsQueryFilterFactoryTest.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/DoubleMetaphoneFilterFactoryTest.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/DoubleMetaphoneFilterTest.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/EnglishPorterFilterFactoryTest.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/LengthFilterTest.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/SnowballPorterFilterFactoryTest.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestBrazilianStemFilterFactory.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestBufferedTokenStream.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestBulgarianStemFilterFactory.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestCapitalizationFilter.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestChineseFilterFactory.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestCollationKeyFilterFactory.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestCzechStemFilterFactory.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestDelimitedPayloadTokenFilterFactory.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestDictionaryCompoundWordTokenFilterFactory.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestDutchStemFilterFactory.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestElisionFilterFactory.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestFrenchStemFilterFactory.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestGermanStemFilterFactory.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestGreekLowerCaseFilterFactory.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestGreekStemFilterFactory.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestIndonesianStemFilterFactory.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestKeywordMarkerFilterFactory.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestMultiWordSynonyms.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestNGramFilters.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestPatternReplaceCharFilterFactory.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestPatternReplaceFilterFactory.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestPersianNormalizationFilterFactory.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestPhoneticFilter.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestPorterStemFilterFactory.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestReverseStringFilterFactory.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestReversedWildcardFilterFactory.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestShingleFilterFactory.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestStandardFactories.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestStemmerOverrideFilterFactory.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestThaiWordFilterFactory.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestTrimFilterFactory.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestTurkishLowerCaseFilterFactory.java
lucene/dev/trunk/solr/src/test/org/apache/solr/handler/DocumentAnalysisRequestHandlerTest.java
lucene/dev/trunk/solr/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java
lucene/dev/trunk/solr/src/test/org/apache/solr/highlight/HighlighterTest.java
lucene/dev/trunk/solr/src/test/org/apache/solr/search/TestSort.java
lucene/dev/trunk/solr/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java
lucene/dev/trunk/solr/src/test/org/apache/solr/spelling/SimpleQueryConverter.java
lucene/dev/trunk/solr/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java
lucene/dev/trunk/solr/src/test/test-files/solr/conf/schema-copyfield-test.xml
lucene/dev/trunk/solr/src/test/test-files/solr/conf/schema-required-fields.xml
lucene/dev/trunk/solr/src/test/test-files/solr/conf/schema.xml
lucene/dev/trunk/solr/src/test/test-files/solr/conf/schema12.xml
Modified: lucene/dev/trunk/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/build.xml?rev=948195&r1=948194&r2=948195&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/build.xml (original)
+++ lucene/dev/trunk/lucene/build.xml Tue May 25 20:16:44 2010
@@ -23,21 +23,11 @@
<import file="common-build.xml"/>
- <property name="build.demo.template" value="src/demo/demo-build.template"/>
-
- <property name="demo.name" value="lucene-demos-${version}"/>
- <property name="demo.war.name" value="luceneweb"/>
-
<!-- Build classpath -->
<path id="classpath">
<pathelement location="${build.dir}/classes/java"/>
</path>
- <path id="demo.classpath">
- <path refid="classpath"/>
- <pathelement location="${build.dir}/classes/demo"/>
- </path>
-
<path id="test.classpath">
<path refid="classpath"/>
<path refid="junit-path"/>
@@ -57,10 +47,10 @@
excludes="contrib/db/*/lib/,contrib/*/ext-libs/,src/site/build/,contrib/benchmark/temp/,contrib/benchmark/work/"
/>
<patternset id="binary.build.dist.patterns"
- includes="${final.name}.jar,${demo.war.name}.war,${demo.name}.jar,docs/,contrib/*/*.jar,contrib/*/*.war, contrib/*/*/*.jar"
+ includes="${final.name}.jar,docs/,contrib/*/*.jar,contrib/*/*.war, contrib/*/*/*.jar"
/>
<patternset id="binary.root.dist.patterns"
- includes="src/demo/,src/jsp/,docs/,*.txt,contrib/*/README*,**/CHANGES.txt,lib/servlet-api-*.jar"
+ includes="docs/,*.txt,contrib/*/README*,**/CHANGES.txt"
excludes="${build.demo.template}"
/>
@@ -177,70 +167,7 @@ The source distribution does not contain
<!-- -->
<!-- ================================================================== -->
- <target name="jar-demo" depends="compile-demo">
- <sequential>
- <build-manifest title="Lucene Search Engine: demos"/>
- <jar
- destfile="${build.dir}/${demo.name}.jar"
- basedir="${build.dir}/classes/demo"
- excludes="**/*.java"
- manifest="${manifest.file}">
- <metainf dir="${common.dir}">
- <include name="LICENSE.txt"/>
- <include name="NOTICE.txt"/>
- </metainf>
- </jar>
- </sequential>
- </target>
-
- <target name="jar-demo-src" depends="compile-demo">
- <sequential>
- <build-manifest title="Lucene Search Engine: demos"/>
- <jar
- destfile="${build.dir}/${demo.name}-src.jar"
- basedir="src/demo"
- manifest="${manifest.file}">
- <metainf dir="${common.dir}">
- <include name="LICENSE.txt"/>
- <include name="NOTICE.txt"/>
- </metainf>
- </jar>
- </sequential>
- </target>
-
- <target name="war-demo" depends="jar-core,jar-demo">
- <sequential>
- <build-manifest title="Lucene Search Engine: demos"/>
- <war destfile="${build.dir}/${demo.war.name}.war"
- webxml="src/jsp/WEB-INF/web.xml"
- manifest="${manifest.file}">
- <fileset dir="src/jsp" excludes="WEB-INF/web.xml"/>
- <lib dir="${build.dir}" includes="${demo.name}.jar"/>
- <lib dir="${build.dir}" includes="${final.name}.jar"/>
- <metainf dir="${common.dir}">
- <include name="LICENSE.txt"/>
- <include name="NOTICE.txt"/>
- </metainf>
- </war>
- </sequential>
- </target>
-
<target name="compile-core" depends="jflex-notice, javacc-notice, common.compile-core"/>
-
- <!-- ================================================================== -->
- <!-- B U I L D D E M O -->
- <!-- ================================================================== -->
- <!-- -->
- <!-- ================================================================== -->
- <target name="compile-demo" depends="compile-core">
- <mkdir dir="${build.dir}/classes/demo"/>
-
- <compile
- srcdir="src/demo"
- destdir="${build.dir}/classes/demo">
- <classpath refid="demo.classpath"/>
- </compile>
- </target>
<!-- ================================================================== -->
<!-- D O C U M E N T A T I O N -->
@@ -252,7 +179,7 @@ The source distribution does not contain
</target>
<target name="javadocs" description="Generate javadoc"
- depends="javadocs-all, javadocs-core, javadocs-demo, javadocs-contrib">
+ depends="javadocs-all, javadocs-core, javadocs-contrib">
<echo file="${javadoc.dir}/index.html" append="false">
<![CDATA[<html><head><title>${Name} ${version} Javadoc Index</title></head>
<body>
@@ -266,7 +193,6 @@ The source distribution does not contain
<contrib-crawl target="javadocs-index.html" failonerror="false"/>
<echo file="${javadoc.dir}/index.html" append="true"><![CDATA[
</ul>
- <li><a href="demo/index.html">Demo</a></li>
</ul></body>]]></echo>
</target>
@@ -285,27 +211,12 @@ The source distribution does not contain
</sequential>
</target>
- <target name="javadocs-demo" description="Generate javadoc for demo classes">
- <sequential>
- <mkdir dir="${javadoc.dir}/demo"/>
- <invoke-javadoc
- destdir="${javadoc.dir}/demo"
- title="${Name} ${version} demo API">
- <sources>
- <packageset dir="src/demo"/>
- <link href=""/>
- </sources>
- </invoke-javadoc>
- <jarify basedir="${javadoc.dir}/demo" destfile="${build.dir}/${demo.name}-javadoc.jar"/>
- </sequential>
- </target>
-
<target name="javadocs-contrib" description="Generate javadoc for contrib classes">
<contrib-crawl target="javadocs"
failonerror="false"/>
</target>
- <target name="javadocs-all" description="Generate javadoc for core, demo and contrib classes" depends="build-contrib">
+ <target name="javadocs-all" description="Generate javadoc for core and contrib classes" depends="build-contrib">
<sequential>
<mkdir dir="${javadoc.dir}/all"/>
<invoke-javadoc
@@ -314,8 +225,6 @@ The source distribution does not contain
<!-- TODO: find a dynamic way to do include multiple source roots -->
<packageset dir="src/java"/>
- <packageset dir="src/demo"/>
-
<!-- please keep this list up to date, and in alpha order... -->
<!-- ie: `find contrib/* -path \*src/java | sort` -->
@@ -348,11 +257,10 @@ The source distribution does not contain
<!-- packages are not being matched by any of these rules -->
<group title="Core" packages="org.apache.*:org.apache.lucene.analysis:org.apache.lucene.analysis.standard*:org.apache.lucene.analysis.tokenattributes*"/>
-
- <group title="Demo" packages="org.apache.lucene.demo*"/>
-
+
<group title="contrib: Ant" packages="org.apache.lucene.ant*"/>
<group title="contrib: Benchmark" packages="org.apache.lucene.benchmark*"/>
+ <group title="contrib: Demo" packages="org.apache.lucene.demo*"/>
<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: Highlighter" packages="org.apache.lucene.search.highlight:*org.apache.lucene.search.vectorhighlight*"/>
@@ -379,7 +287,7 @@ The source distribution does not contain
<!-- ================================================================== -->
<!-- -->
<!-- ================================================================== -->
- <target name="package" depends="jar-core, javadocs, war-demo, build-contrib, init-dist, changes-to-html">
+ <target name="package" depends="jar-core, javadocs, build-contrib, init-dist, changes-to-html">
<copy file="${build.demo.template}" tofile="${build.dir}/build-demo.xml">
<filterset begintoken="@PLACEHOLDER_" endtoken="@">
<filter token="version" value="${version}"/>
@@ -518,7 +426,7 @@ The source distribution does not contain
<target name="dist-all" depends="dist, dist-src"/>
- <target name="generate-maven-artifacts" depends="maven.ant.tasks-check, package, jar-src, jar-demo-src, javadocs">
+ <target name="generate-maven-artifacts" depends="maven.ant.tasks-check, package, jar-src, javadocs">
<sequential>
<m2-deploy pom.xml="lucene-parent-pom.xml.template"/>
<m2-deploy pom.xml="lucene-core-pom.xml.template">
@@ -529,16 +437,7 @@ The source distribution does not contain
classifier="javadoc"/>
</artifact-attachments>
</m2-deploy>
-
- <m2-deploy pom.xml="lucene-demos-pom.xml.template">
- <artifact-attachments>
- <attach file="${build.dir}/${demo.name}-src.jar"
- classifier="sources"/>
- <attach file="${build.dir}/${demo.name}-javadoc.jar"
- classifier="javadoc"/>
- </artifact-attachments>
- </m2-deploy>
-
+
<m2-deploy pom.xml="lucene-contrib-pom.xml.template"/>
<contrib-crawl target="dist-maven"/>
</sequential>
@@ -604,13 +503,10 @@ The source distribution does not contain
<fileset dir="contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser" includes="*.java">
<containsregexp expression="Generated.*By.*JavaCC"/>
</fileset>
- <fileset dir="src/demo/org/apache/lucene/demo/html" includes="*.java">
- <containsregexp expression="Generated.*By.*JavaCC"/>
- </fileset>
</delete>
</target>
- <target name="javacc" depends="init,javacc-check,clean-javacc,javacc-QueryParser,javacc-HTMLParser,javacc-contrib-queryparser"/>
+ <target name="javacc" depends="init,javacc-check,clean-javacc,javacc-QueryParser,javacc-contrib-queryparser"/>
<target name="javacc-QueryParser" depends="init,javacc-check" if="javacc.present">
<sequential>
@@ -629,12 +525,6 @@ The source distribution does not contain
</sequential>
</target>
-
- <target name="javacc-HTMLParser" depends="init,javacc-check" if="javacc.present">
- <invoke-javacc target="src/demo/org/apache/lucene/demo/html/HTMLParser.jj"
- outputDir="src/demo/org/apache/lucene/demo/html"
- />
- </target>
<target name="javacc-contrib-queryparser" depends="init,javacc-check" if="javacc.present">
<ant target="javacc"
@@ -642,33 +532,6 @@ The source distribution does not contain
antfile="build.xml"
/>
</target>
-
- <!-- ================================================================== -->
- <!-- Build the JFlex files into the source tree -->
- <!-- ================================================================== -->
-
- <target name="jflex" depends="jflex-check, clean-jflex,jflex-StandardAnalyzer" />
-
- <target name="jflex-StandardAnalyzer" depends="init,jflex-check" if="jflex.present">
- <taskdef classname="jflex.anttask.JFlexTask" name="jflex">
- <classpath refid="jflex.classpath"/>
- </taskdef>
-
- <jflex file="src/java/org/apache/lucene/analysis/standard/StandardTokenizerImplOrig.jflex"
- outdir="src/java/org/apache/lucene/analysis/standard"
- nobak="on" />
- <jflex file="src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl31.jflex"
- outdir="src/java/org/apache/lucene/analysis/standard"
- nobak="on" />
- </target>
-
- <target name="clean-jflex">
- <delete>
- <fileset dir="src/java/org/apache/lucene/analysis/standard" includes="*.java">
- <containsregexp expression="generated.*by.*JFlex"/>
- </fileset>
- </delete>
- </target>
<macrodef name="createLevAutomaton">
<attribute name="n"/>
Modified: lucene/dev/trunk/lucene/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/CHANGES.txt?rev=948195&r1=948194&r2=948195&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/contrib/CHANGES.txt Tue May 25 20:16:44 2010
@@ -2,6 +2,11 @@ Lucene contrib change Log
======================= Trunk (not yet released) =======================
+Build
+
+ * LUCENE-2413: Moved the demo out of lucene core and into contrib/demo.
+ (Robert Muir)
+
======================= Lucene 3.x (not yet released) =======================
Changes in backwards compatibility policy
Modified: lucene/dev/trunk/lucene/contrib/ant/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/ant/build.xml?rev=948195&r1=948194&r2=948195&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/ant/build.xml (original)
+++ lucene/dev/trunk/lucene/contrib/ant/build.xml Tue May 25 20:16:44 2010
@@ -34,4 +34,21 @@
/>
<import file="../contrib-build.xml"/>
+
+ <module-uptodate name="analysis/common" jarfile="${common.dir}/../modules/analysis/build/common/lucene-analyzers-common-${version}.jar"
+ property="analyzers-common.uptodate" classpath.property="analyzers-common.jar"/>
+
+ <path id="classpath">
+ <pathelement path="${analyzers-common.jar}"/>
+ <path refid="base.classpath"/>
+ </path>
+
+ <target name="compile-core" depends="compile-analyzers-common, common.compile-core" />
+
+ <target name="compile-analyzers-common" unless="analyzers-common.uptodate">
+ <subant target="default">
+ <fileset dir="${common.dir}/../modules/analysis/common" includes="build.xml"/>
+ </subant>
+ </target>
+
</project>
Modified: lucene/dev/trunk/lucene/contrib/ant/src/java/org/apache/lucene/ant/IndexTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/ant/src/java/org/apache/lucene/ant/IndexTask.java?rev=948195&r1=948194&r2=948195&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/ant/src/java/org/apache/lucene/ant/IndexTask.java (original)
+++ lucene/dev/trunk/lucene/contrib/ant/src/java/org/apache/lucene/ant/IndexTask.java Tue May 25 20:16:44 2010
@@ -30,9 +30,9 @@ import java.util.Vector;
import java.lang.reflect.Constructor;
import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.SimpleAnalyzer;
-import org.apache.lucene.analysis.StopAnalyzer;
-import org.apache.lucene.analysis.WhitespaceAnalyzer;
+import org.apache.lucene.analysis.core.SimpleAnalyzer;
+import org.apache.lucene.analysis.core.StopAnalyzer;
+import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.document.DateTools;
import org.apache.lucene.document.Document;
Modified: lucene/dev/trunk/lucene/contrib/ant/src/test/org/apache/lucene/ant/IndexTaskTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/ant/src/test/org/apache/lucene/ant/IndexTaskTest.java?rev=948195&r1=948194&r2=948195&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/ant/src/test/org/apache/lucene/ant/IndexTaskTest.java (original)
+++ lucene/dev/trunk/lucene/contrib/ant/src/test/org/apache/lucene/ant/IndexTaskTest.java Tue May 25 20:16:44 2010
@@ -21,7 +21,7 @@ import java.io.File;
import java.io.IOException;
import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.StopAnalyzer;
+import org.apache.lucene.analysis.core.StopAnalyzer;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
Modified: lucene/dev/trunk/lucene/contrib/benchmark/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/benchmark/build.xml?rev=948195&r1=948194&r2=948195&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/benchmark/build.xml (original)
+++ lucene/dev/trunk/lucene/contrib/benchmark/build.xml Tue May 25 20:16:44 2010
@@ -18,6 +18,7 @@
<module-uptodate name="analysis/common" jarfile="${common.dir}/../modules/analysis/build/common/lucene-analyzers-common-${version}.jar"
property="analyzers-common.uptodate" classpath.property="analyzers-common.jar"/>
<contrib-uptodate name="memory" property="memory.uptodate" classpath.property="memory.jar"/>
+ <contrib-uptodate name="demo" property="demo.uptodate" classpath.property="demo.jar"/>
<target name="check-files">
<available file="temp/news20.tar.gz" property="news20.exists"/>
@@ -139,8 +140,8 @@
<pathelement path="${memory.jar}"/>
<pathelement path="${highlighter.jar}"/>
<pathelement path="${analyzers-common.jar}"/>
+ <pathelement path="${demo.jar}"/>
<path refid="base.classpath"/>
- <pathelement path="${common.dir}/build/classes/demo"/>
<fileset dir="lib">
<include name="**/*.jar"/>
</fileset>
@@ -228,9 +229,9 @@
<echo>Benchmark output in JIRA table format is in file: ${shingle.jira.output.file}</echo>
</target>
- <target name="compile-demo">
- <subant target="compile-demo">
- <fileset dir="${common.dir}" includes="build.xml"/>
+ <target name="compile-demo" unless="demo.uptodate">
+ <subant target="default">
+ <fileset dir="${common.dir}/contrib/demo" includes="build.xml"/>
</subant>
</target>
<target name="compile-highlighter" unless="highlighter.uptodate">
Added: lucene/dev/trunk/lucene/contrib/demo/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/demo/build.xml?rev=948195&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/contrib/demo/build.xml (added)
+++ lucene/dev/trunk/lucene/contrib/demo/build.xml Tue May 25 20:16:44 2010
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<project name="demo" default="default">
+
+ <description>
+ Lucene Demo
+ </description>
+
+ <property name="build.demo.template" value="src/java/demo-build.template"/>
+
+ <property name="demo.name" value="lucene-demos-${version}"/>
+ <property name="demo.war.name" value="luceneweb"/>
+
+ <import file="../contrib-build.xml"/>
+
+ <module-uptodate name="analysis/common" jarfile="${common.dir}/../modules/analysis/build/common/lucene-analyzers-common-${version}.jar"
+ property="analyzers-common.uptodate" classpath.property="analyzers-common.jar"/>
+
+ <path id="classpath">
+ <pathelement path="${analyzers-common.jar}"/>
+ <path refid="base.classpath"/>
+ </path>
+
+ <target name="compile-core" depends="compile-analyzers-common, common.compile-core" />
+
+ <target name="compile-analyzers-common" unless="analyzers-common.uptodate">
+ <subant target="default">
+ <fileset dir="${common.dir}/../modules/analysis/common" includes="build.xml"/>
+ </subant>
+ </target>
+
+ <target name="war-demo" depends="jar-core">
+ <sequential>
+ <build-manifest title="Lucene Search Engine: demos"/>
+ <war destfile="${build.dir}/${demo.war.name}.war"
+ webxml="src/jsp/WEB-INF/web.xml"
+ manifest="${manifest.file}">
+ <fileset dir="src/jsp" excludes="WEB-INF/web.xml"/>
+ <lib dir="${build.dir}/../.." includes="lucene-core-${version}.jar"/>
+ <lib dir="${common.dir}/../modules/analysis/build/common" includes="lucene-analyzers-common-${version}.jar"/>
+ <lib dir="${build.dir}" includes="${final.name}.jar"/>
+ <metainf dir="${common.dir}">
+ <include name="LICENSE.txt"/>
+ <include name="NOTICE.txt"/>
+ </metainf>
+ </war>
+ </sequential>
+ </target>
+
+ <target name="clean-javacc">
+ <fileset dir="src/demo/org/apache/lucene/demo/html" includes="*.java">
+ <containsregexp expression="Generated.*By.*JavaCC"/>
+ </fileset>
+ </target>
+
+ <target name="javacc" depends="init,javacc-check" if="javacc.present">
+ <invoke-javacc target="src/demo/org/apache/lucene/demo/html/HTMLParser.jj"
+ outputDir="src/demo/org/apache/lucene/demo/html"
+ />
+ </target>
+</project>
Propchange: lucene/dev/trunk/lucene/contrib/demo/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java?rev=948195&r1=948194&r2=948195&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java (original)
+++ lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java Tue May 25 20:16:44 2010
@@ -21,24 +21,10 @@ import java.util.Collections;
import java.util.LinkedList;
import java.util.Set;
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.WhitespaceAnalyzer;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.Field.Index;
-import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.document.Field.TermVector;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.TermFreqVector;
import org.apache.lucene.index.TermPositionVector;
import org.apache.lucene.index.TermVectorOffsetInfo;
-import org.apache.lucene.queryParser.QueryParser;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.RAMDirectory;
-import org.apache.lucene.util.Version;
/**
* <code>FieldTermStack</code> is a stack that keeps query terms in the specified field
@@ -49,24 +35,24 @@ public class FieldTermStack {
private final String fieldName;
LinkedList<TermInfo> termList = new LinkedList<TermInfo>();
- public static void main( String[] args ) throws Exception {
- Analyzer analyzer = new WhitespaceAnalyzer(Version.LUCENE_CURRENT);
- QueryParser parser = new QueryParser(Version.LUCENE_CURRENT, "f", analyzer );
- Query query = parser.parse( "a x:b" );
- FieldQuery fieldQuery = new FieldQuery( query, true, false );
-
- Directory dir = new RAMDirectory();
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(Version.LUCENE_CURRENT, analyzer));
- Document doc = new Document();
- doc.add( new Field( "f", "a a a b b c a b b c d e f", Store.YES, Index.ANALYZED, TermVector.WITH_POSITIONS_OFFSETS ) );
- doc.add( new Field( "f", "b a b a f", Store.YES, Index.ANALYZED, TermVector.WITH_POSITIONS_OFFSETS ) );
- writer.addDocument( doc );
- writer.close();
-
- IndexReader reader = IndexReader.open( dir, true );
- new FieldTermStack( reader, 0, "f", fieldQuery );
- reader.close();
- }
+ //public static void main( String[] args ) throws Exception {
+ // Analyzer analyzer = new WhitespaceAnalyzer(Version.LUCENE_CURRENT);
+ // QueryParser parser = new QueryParser(Version.LUCENE_CURRENT, "f", analyzer );
+ // Query query = parser.parse( "a x:b" );
+ // FieldQuery fieldQuery = new FieldQuery( query, true, false );
+
+ // Directory dir = new RAMDirectory();
+ // IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(Version.LUCENE_CURRENT, analyzer));
+ // Document doc = new Document();
+ // doc.add( new Field( "f", "a a a b b c a b b c d e f", Store.YES, Index.ANALYZED, TermVector.WITH_POSITIONS_OFFSETS ) );
+ // doc.add( new Field( "f", "b a b a f", Store.YES, Index.ANALYZED, TermVector.WITH_POSITIONS_OFFSETS ) );
+ // writer.addDocument( doc );
+ // writer.close();
+
+ // IndexReader reader = IndexReader.open( dir, true );
+ // new FieldTermStack( reader, 0, "f", fieldQuery );
+ // reader.close();
+ //}
/**
* a constructor.
Modified: lucene/dev/trunk/lucene/contrib/lucli/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/lucli/build.xml?rev=948195&r1=948194&r2=948195&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/lucli/build.xml (original)
+++ lucene/dev/trunk/lucene/contrib/lucli/build.xml Tue May 25 20:16:44 2010
@@ -38,6 +38,22 @@
<import file="../contrib-build.xml"/>
+ <module-uptodate name="analysis/common" jarfile="${common.dir}/../modules/analysis/build/common/lucene-analyzers-common-${version}.jar"
+ property="analyzers-common.uptodate" classpath.property="analyzers-common.jar"/>
+
+ <path id="classpath">
+ <pathelement path="${analyzers-common.jar}"/>
+ <path refid="base.classpath"/>
+ </path>
+
+ <target name="compile-core" depends="compile-analyzers-common, common.compile-core" />
+
+ <target name="compile-analyzers-common" unless="analyzers-common.uptodate">
+ <subant target="default">
+ <fileset dir="${common.dir}/../modules/analysis/common" includes="build.xml"/>
+ </subant>
+ </target>
+
<target name="jar" depends="compile" description="Create JAR">
<jarify>
<manifest-attributes>
Modified: lucene/dev/trunk/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java?rev=948195&r1=948194&r2=948195&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java (original)
+++ lucene/dev/trunk/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java Tue May 25 20:16:44 2010
@@ -27,13 +27,9 @@ import java.util.Set;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
-import org.apache.lucene.analysis.KeywordAnalyzer;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenFilter;
import org.apache.lucene.analysis.MockTokenizer;
-import org.apache.lucene.analysis.SimpleAnalyzer;
-import org.apache.lucene.analysis.StopAnalyzer;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexWriter;
Modified: lucene/dev/trunk/lucene/contrib/misc/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/misc/build.xml?rev=948195&r1=948194&r2=948195&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/misc/build.xml (original)
+++ lucene/dev/trunk/lucene/contrib/misc/build.xml Tue May 25 20:16:44 2010
@@ -27,4 +27,19 @@
<import file="../contrib-build.xml"/>
+ <module-uptodate name="analysis/common" jarfile="${common.dir}/../modules/analysis/build/common/lucene-analyzers-common-${version}.jar"
+ property="analyzers-common.uptodate" classpath.property="analyzers-common.jar"/>
+
+ <path id="classpath">
+ <pathelement path="${analyzers-common.jar}"/>
+ <path refid="base.classpath"/>
+ </path>
+
+ <target name="compile-core" depends="compile-analyzers-common, common.compile-core" />
+
+ <target name="compile-analyzers-common" unless="analyzers-common.uptodate">
+ <subant target="default">
+ <fileset dir="${common.dir}/../modules/analysis/common" includes="build.xml"/>
+ </subant>
+ </target>
</project>
Modified: lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java?rev=948195&r1=948194&r2=948195&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java (original)
+++ lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java Tue May 25 20:16:44 2010
@@ -21,7 +21,7 @@ import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
-import org.apache.lucene.analysis.WhitespaceAnalyzer;
+import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
Modified: lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/misc/IndexMergeTool.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/misc/IndexMergeTool.java?rev=948195&r1=948194&r2=948195&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/misc/IndexMergeTool.java (original)
+++ lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/misc/IndexMergeTool.java Tue May 25 20:16:44 2010
@@ -16,7 +16,7 @@ package org.apache.lucene.misc;
* limitations under the License.
*/
-import org.apache.lucene.analysis.WhitespaceAnalyzer;
+import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
Modified: lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/similar/MoreLikeThis.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/similar/MoreLikeThis.java?rev=948195&r1=948194&r2=948195&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/similar/MoreLikeThis.java (original)
+++ lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/similar/MoreLikeThis.java Tue May 25 20:16:44 2010
@@ -32,7 +32,6 @@ import java.util.Set;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.analysis.tokenattributes.TermAttribute;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
@@ -49,7 +48,6 @@ import org.apache.lucene.search.TermQuer
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.store.FSDirectory;
import org.apache.lucene.util.PriorityQueue;
-import org.apache.lucene.util.Version;
/**
@@ -158,13 +156,6 @@ public final class MoreLikeThis {
*/
public static final int DEFAULT_MAX_NUM_TOKENS_PARSED=5000;
-
- /**
- * Default analyzer to parse source doc with.
- * @see #getAnalyzer
- */
- public static final Analyzer DEFAULT_ANALYZER = new StandardAnalyzer(Version.LUCENE_CURRENT);
-
/**
* Ignore terms with less than this frequency in the source doc.
* @see #getMinTermFreq
@@ -240,7 +231,7 @@ public final class MoreLikeThis {
/**
* Analyzer that will be used to parse the doc.
*/
- private Analyzer analyzer = DEFAULT_ANALYZER;
+ private Analyzer analyzer = null;
/**
* Ignore words less frequent that this.
@@ -343,10 +334,9 @@ public final class MoreLikeThis {
/**
* Returns an analyzer that will be used to parse source doc with. The default analyzer
- * is the {@link #DEFAULT_ANALYZER}.
+ * is not set.
*
* @return the analyzer that will be used to parse source doc with.
- * @see #DEFAULT_ANALYZER
*/
public Analyzer getAnalyzer() {
return analyzer;
@@ -887,6 +877,10 @@ public final class MoreLikeThis {
private void addTermFrequencies(Reader r, Map<String,Int> termFreqMap, String fieldName)
throws IOException
{
+ if (analyzer == null) {
+ throw new UnsupportedOperationException("To use MoreLikeThis without " +
+ "term vectors, you must provide an Analyzer");
+ }
TokenStream ts = analyzer.tokenStream(fieldName, r);
int tokenCount=0;
// for every token
Modified: lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java?rev=948195&r1=948194&r2=948195&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java (original)
+++ lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java Tue May 25 20:16:44 2010
@@ -21,7 +21,6 @@ import java.io.IOException;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenizer;
-import org.apache.lucene.analysis.WhitespaceAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexReader;
Modified: lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/similar/TestMoreLikeThis.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/similar/TestMoreLikeThis.java?rev=948195&r1=948194&r2=948195&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/similar/TestMoreLikeThis.java (original)
+++ lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/similar/TestMoreLikeThis.java Tue May 25 20:16:44 2010
@@ -24,6 +24,7 @@ import java.util.List;
import java.util.Map;
import org.apache.lucene.analysis.MockAnalyzer;
+import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexReader;
@@ -76,6 +77,7 @@ public class TestMoreLikeThis extends Lu
MoreLikeThis mlt = new MoreLikeThis(
reader);
+ mlt.setAnalyzer(new MockAnalyzer(MockTokenizer.WHITESPACE, false));
mlt.setMinDocFreq(1);
mlt.setMinTermFreq(1);
mlt.setMinWordLen(1);
@@ -110,6 +112,7 @@ public class TestMoreLikeThis extends Lu
private Map<String,Float> getOriginalValues() throws IOException {
Map<String,Float> originalValues = new HashMap<String,Float>();
MoreLikeThis mlt = new MoreLikeThis(reader);
+ mlt.setAnalyzer(new MockAnalyzer(MockTokenizer.WHITESPACE, false));
mlt.setMinDocFreq(1);
mlt.setMinTermFreq(1);
mlt.setMinWordLen(1);
Modified: lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.java?rev=948195&r1=948194&r2=948195&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.java (original)
+++ lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.java Tue May 25 20:16:44 2010
@@ -577,22 +577,6 @@ public class PrecedenceQueryParser imple
return sb.toString();
}
- /**
- * Command line tool to test QueryParser, using {@link org.apache.lucene.analysis.SimpleAnalyzer}.
- * Usage:<br>
- * <code>java org.apache.lucene.queryParser.QueryParser <input></code>
- */
- public static void main(String[] args) throws Exception {
- if (args.length == 0) {
- System.out.println("Usage: java org.apache.lucene.queryParser.QueryParser <input>");
- System.exit(0);
- }
- PrecedenceQueryParser qp = new PrecedenceQueryParser("field",
- new org.apache.lucene.analysis.SimpleAnalyzer());
- Query q = qp.parse(args[0]);
- System.out.println(q.toString("field"));
- }
-
// * Query ::= ( Clause )*
// * Clause ::= ["+", "-"] [<TERM> ":"] ( <TERM> | "(" Query ")" )
final public int Conjunction() throws ParseException {
@@ -1290,4 +1274,19 @@ public class PrecedenceQueryParser imple
JJCalls next;
}
+ /**
+ * Command line tool to test QueryParser, using {@link org.apache.lucene.analysis.SimpleAnalyzer}.
+ * Usage:<br>
+ * <code>java org.apache.lucene.queryParser.QueryParser <input></code>
+ */
+// public static void main(String[] args) throws Exception {
+// if (args.length == 0) {
+// System.out.println("Usage: java org.apache.lucene.queryParser.QueryParser <input>");
+// System.exit(0);
+// }
+// PrecedenceQueryParser qp = new PrecedenceQueryParser("field",
+// new org.apache.lucene.analysis.SimpleAnalyzer());
+// Query q = qp.parse(args[0]);
+// System.out.println(q.toString("field"));
+// }
}
Modified: lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.jj
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.jj?rev=948195&r1=948194&r2=948195&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.jj (original)
+++ lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.jj Tue May 25 20:16:44 2010
@@ -606,16 +606,16 @@ public class PrecedenceQueryParser {
* Usage:<br>
* <code>java org.apache.lucene.queryParser.QueryParser <input></code>
*/
- public static void main(String[] args) throws Exception {
- if (args.length == 0) {
- System.out.println("Usage: java org.apache.lucene.queryParser.QueryParser <input>");
- System.exit(0);
- }
- PrecedenceQueryParser qp = new PrecedenceQueryParser("field",
- new org.apache.lucene.analysis.SimpleAnalyzer());
- Query q = qp.parse(args[0]);
- System.out.println(q.toString("field"));
- }
+// public static void main(String[] args) throws Exception {
+// if (args.length == 0) {
+// System.out.println("Usage: java org.apache.lucene.queryParser.QueryParser <input>");
+// System.exit(0);
+// }
+// PrecedenceQueryParser qp = new PrecedenceQueryParser("field",
+// new org.apache.lucene.analysis.SimpleAnalyzer());
+// Query q = qp.parse(args[0]);
+// System.out.println(q.toString("field"));
+// }
}
PARSER_END(PrecedenceQueryParser)
Modified: lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiAnalyzerQPHelper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiAnalyzerQPHelper.java?rev=948195&r1=948194&r2=948195&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiAnalyzerQPHelper.java (original)
+++ lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiAnalyzerQPHelper.java Tue May 25 20:16:44 2010
@@ -20,11 +20,9 @@ package org.apache.lucene.queryParser.st
import java.io.Reader;
import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.LowerCaseFilter;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.standard.StandardTokenizer;
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
import org.apache.lucene.analysis.tokenattributes.TermAttribute;
Modified: lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQPHelper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQPHelper.java?rev=948195&r1=948194&r2=948195&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQPHelper.java (original)
+++ lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQPHelper.java Tue May 25 20:16:44 2010
@@ -32,7 +32,6 @@ import java.util.Locale;
import java.util.Map;
import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.KeywordAnalyzer;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenFilter;
import org.apache.lucene.analysis.MockTokenizer;
@@ -341,8 +340,9 @@ public class TestQPHelper extends Locali
"t�rm term term");
assertQueryEquals("�mlaut", new MockAnalyzer(MockTokenizer.WHITESPACE, false), "�mlaut");
- assertQueryEquals("\"\"", new KeywordAnalyzer(), "");
- assertQueryEquals("foo:\"\"", new KeywordAnalyzer(), "foo:");
+ // FIXME: change MockAnalyzer to not extend CharTokenizer for this test
+ //assertQueryEquals("\"\"", new KeywordAnalyzer(), "");
+ //assertQueryEquals("foo:\"\"", new KeywordAnalyzer(), "foo:");
assertQueryEquals("a AND b", null, "+a +b");
assertQueryEquals("(a AND b)", null, "+a +b");
Modified: lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQueryParserWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQueryParserWrapper.java?rev=948195&r1=948194&r2=948195&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQueryParserWrapper.java (original)
+++ lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQueryParserWrapper.java Tue May 25 20:16:44 2010
@@ -30,7 +30,6 @@ import java.util.List;
import java.util.Locale;
import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.KeywordAnalyzer;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenFilter;
import org.apache.lucene.analysis.MockTokenizer;
@@ -333,8 +332,9 @@ public class TestQueryParserWrapper exte
"t�rm term term");
assertQueryEquals("�mlaut", new MockAnalyzer(MockTokenizer.WHITESPACE, false), "�mlaut");
- assertQueryEquals("\"\"", new KeywordAnalyzer(), "");
- assertQueryEquals("foo:\"\"", new KeywordAnalyzer(), "foo:");
+ //FIXME: Change MockAnalyzer to not extend CharTokenizer for this test
+ //assertQueryEquals("\"\"", new KeywordAnalyzer(), "");
+ //assertQueryEquals("foo:\"\"", new KeywordAnalyzer(), "foo:");
assertQueryEquals("a AND b", null, "+a +b");
assertQueryEquals("(a AND b)", null, "+a +b");
Modified: lucene/dev/trunk/lucene/contrib/spellchecker/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/spellchecker/build.xml?rev=948195&r1=948194&r2=948195&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/spellchecker/build.xml (original)
+++ lucene/dev/trunk/lucene/contrib/spellchecker/build.xml Tue May 25 20:16:44 2010
@@ -24,4 +24,20 @@
</description>
<import file="../contrib-build.xml"/>
+
+ <module-uptodate name="analysis/common" jarfile="${common.dir}/../modules/analysis/build/common/lucene-analyzers-common-${version}.jar"
+ property="analyzers-common.uptodate" classpath.property="analyzers-common.jar"/>
+
+ <path id="classpath">
+ <pathelement path="${analyzers-common.jar}"/>
+ <path refid="base.classpath"/>
+ </path>
+
+ <target name="compile-core" depends="compile-analyzers-common, common.compile-core" />
+
+ <target name="compile-analyzers-common" unless="analyzers-common.uptodate">
+ <subant target="default">
+ <fileset dir="${common.dir}/../modules/analysis/common" includes="build.xml"/>
+ </subant>
+ </target>
</project>
Modified: lucene/dev/trunk/lucene/contrib/spellchecker/src/java/org/apache/lucene/search/spell/SpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/spellchecker/src/java/org/apache/lucene/search/spell/SpellChecker.java?rev=948195&r1=948194&r2=948195&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/spellchecker/src/java/org/apache/lucene/search/spell/SpellChecker.java (original)
+++ lucene/dev/trunk/lucene/contrib/spellchecker/src/java/org/apache/lucene/search/spell/SpellChecker.java Tue May 25 20:16:44 2010
@@ -20,7 +20,7 @@ package org.apache.lucene.search.spell;
import java.io.IOException;
import java.util.Iterator;
-import org.apache.lucene.analysis.WhitespaceAnalyzer;
+import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexReader;
Modified: lucene/dev/trunk/lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java?rev=948195&r1=948194&r2=948195&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java (original)
+++ lucene/dev/trunk/lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java Tue May 25 20:16:44 2010
@@ -22,7 +22,7 @@ import java.util.Iterator;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenizer;
-import org.apache.lucene.analysis.WhitespaceAnalyzer;
+import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexReader;
Modified: lucene/dev/trunk/lucene/contrib/swing/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/swing/build.xml?rev=948195&r1=948194&r2=948195&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/swing/build.xml (original)
+++ lucene/dev/trunk/lucene/contrib/swing/build.xml Tue May 25 20:16:44 2010
@@ -25,6 +25,22 @@
<import file="../contrib-build.xml"/>
+ <module-uptodate name="analysis/common" jarfile="${common.dir}/../modules/analysis/build/common/lucene-analyzers-common-${version}.jar"
+ property="analyzers-common.uptodate" classpath.property="analyzers-common.jar"/>
+
+ <path id="classpath">
+ <pathelement path="${analyzers-common.jar}"/>
+ <path refid="base.classpath"/>
+ </path>
+
+ <target name="compile-core" depends="compile-analyzers-common, common.compile-core" />
+
+ <target name="compile-analyzers-common" unless="analyzers-common.uptodate">
+ <subant target="default">
+ <fileset dir="${common.dir}/../modules/analysis/common" includes="build.xml"/>
+ </subant>
+ </target>
+
<target name="list-demo" depends="compile">
<java classname="org.apache.lucene.swing.models.ListSearcherSimulator"
fork="yes" spawn="yes"
Modified: lucene/dev/trunk/lucene/contrib/swing/src/java/org/apache/lucene/swing/models/ListSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/swing/src/java/org/apache/lucene/swing/models/ListSearcher.java?rev=948195&r1=948194&r2=948195&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/swing/src/java/org/apache/lucene/swing/models/ListSearcher.java (original)
+++ lucene/dev/trunk/lucene/contrib/swing/src/java/org/apache/lucene/swing/models/ListSearcher.java Tue May 25 20:16:44 2010
@@ -25,7 +25,7 @@ import javax.swing.event.ListDataEvent;
import javax.swing.event.ListDataListener;
import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.WhitespaceAnalyzer;
+import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.Fieldable;
Modified: lucene/dev/trunk/lucene/contrib/swing/src/java/org/apache/lucene/swing/models/TableSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/swing/src/java/org/apache/lucene/swing/models/TableSearcher.java?rev=948195&r1=948194&r2=948195&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/swing/src/java/org/apache/lucene/swing/models/TableSearcher.java (original)
+++ lucene/dev/trunk/lucene/contrib/swing/src/java/org/apache/lucene/swing/models/TableSearcher.java Tue May 25 20:16:44 2010
@@ -24,7 +24,7 @@ import javax.swing.table.AbstractTableMo
import javax.swing.table.TableModel;
import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.WhitespaceAnalyzer;
+import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.Fieldable;
Modified: lucene/dev/trunk/lucene/contrib/wordnet/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/wordnet/build.xml?rev=948195&r1=948194&r2=948195&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/wordnet/build.xml (original)
+++ lucene/dev/trunk/lucene/contrib/wordnet/build.xml Tue May 25 20:16:44 2010
@@ -30,6 +30,22 @@
<import file="../contrib-build.xml"/>
+ <module-uptodate name="analysis/common" jarfile="${common.dir}/../modules/analysis/build/common/lucene-analyzers-common-${version}.jar"
+ property="analyzers-common.uptodate" classpath.property="analyzers-common.jar"/>
+
+ <path id="classpath">
+ <pathelement path="${analyzers-common.jar}"/>
+ <path refid="base.classpath"/>
+ </path>
+
+ <target name="compile-core" depends="compile-analyzers-common, common.compile-core" />
+
+ <target name="compile-analyzers-common" unless="analyzers-common.uptodate">
+ <subant target="default">
+ <fileset dir="${common.dir}/../modules/analysis/common" includes="build.xml"/>
+ </subant>
+ </target>
+
<target name="index" depends="compile" description="Build WordNet index">
<fail if="synindex.exists">
Index already exists - must remove first.
Modified: lucene/dev/trunk/lucene/contrib/wordnet/src/test/org/apache/lucene/wordnet/TestSynonymTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/wordnet/src/test/org/apache/lucene/wordnet/TestSynonymTokenFilter.java?rev=948195&r1=948194&r2=948195&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/wordnet/src/test/org/apache/lucene/wordnet/TestSynonymTokenFilter.java (original)
+++ lucene/dev/trunk/lucene/contrib/wordnet/src/test/org/apache/lucene/wordnet/TestSynonymTokenFilter.java Tue May 25 20:16:44 2010
@@ -23,12 +23,12 @@ import java.io.IOException;
import java.io.Reader;
import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.LowerCaseFilter;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
-import org.apache.lucene.analysis.WhitespaceTokenizer;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
+import org.apache.lucene.analysis.core.LowerCaseFilter;
+import org.apache.lucene.analysis.core.WhitespaceTokenizer;
public class TestSynonymTokenFilter extends BaseTokenStreamTestCase {
final String testFile = "testSynonyms.txt";
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/TokenStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/TokenStream.java?rev=948195&r1=948194&r2=948195&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/TokenStream.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/TokenStream.java Tue May 25 20:16:44 2010
@@ -156,7 +156,7 @@ public abstract class TokenStream extend
* This method can be used to perform any end-of-stream operations, such as
* setting the final offset of a stream. The final offset of a stream might
* differ from the offset of the last token eg in case one or more whitespaces
- * followed after the last token, but a {@link WhitespaceTokenizer} was used.
+ * followed after the last token, but a WhitespaceTokenizer was used.
*
* @throws IOException
*/
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/QueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/QueryParser.java?rev=948195&r1=948194&r2=948195&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/QueryParser.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/QueryParser.java Tue May 25 20:16:44 2010
@@ -1082,22 +1082,6 @@ public class QueryParser implements Quer
return sb.toString();
}
- /**
- * Command line tool to test QueryParser, using {@link org.apache.lucene.analysis.SimpleAnalyzer}.
- * Usage:<br>
- * <code>java org.apache.lucene.queryParser.QueryParser <input></code>
- */
- public static void main(String[] args) throws Exception {
- if (args.length == 0) {
- System.out.println("Usage: java org.apache.lucene.queryParser.QueryParser <input>");
- System.exit(0);
- }
- QueryParser qp = new QueryParser(Version.LUCENE_CURRENT, "field",
- new org.apache.lucene.analysis.SimpleAnalyzer());
- Query q = qp.parse(args[0]);
- System.out.println(q.toString("field"));
- }
-
// * Query ::= ( Clause )*
// * Clause ::= ["+", "-"] [<TERM> ":"] ( <TERM> | "(" Query ")" )
final public int Conjunction() throws ParseException {
@@ -1802,4 +1786,19 @@ public class QueryParser implements Quer
JJCalls next;
}
+ /**
+ * Command line tool to test QueryParser, using {@link org.apache.lucene.analysis.SimpleAnalyzer}.
+ * Usage:<br>
+ * <code>java org.apache.lucene.queryParser.QueryParser <input></code>
+ */
+// public static void main(String[] args) throws Exception {
+// if (args.length == 0) {
+// System.out.println("Usage: java org.apache.lucene.queryParser.QueryParser <input>");
+// System.exit(0);
+// }
+// QueryParser qp = new QueryParser(Version.LUCENE_CURRENT, "field",
+// new org.apache.lucene.analysis.SimpleAnalyzer());
+// Query q = qp.parse(args[0]);
+// System.out.println(q.toString("field"));
+// }
}
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/QueryParser.jj
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/QueryParser.jj?rev=948195&r1=948194&r2=948195&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/QueryParser.jj (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/QueryParser.jj Tue May 25 20:16:44 2010
@@ -1111,16 +1111,16 @@ public class QueryParser {
* Usage:<br>
* <code>java org.apache.lucene.queryParser.QueryParser <input></code>
*/
- public static void main(String[] args) throws Exception {
- if (args.length == 0) {
- System.out.println("Usage: java org.apache.lucene.queryParser.QueryParser <input>");
- System.exit(0);
- }
- QueryParser qp = new QueryParser(Version.LUCENE_CURRENT, "field",
- new org.apache.lucene.analysis.SimpleAnalyzer());
- Query q = qp.parse(args[0]);
- System.out.println(q.toString("field"));
- }
+// public static void main(String[] args) throws Exception {
+// if (args.length == 0) {
+// System.out.println("Usage: java org.apache.lucene.queryParser.QueryParser <input>");
+// System.exit(0);
+// }
+// QueryParser qp = new QueryParser(Version.LUCENE_CURRENT, "field",
+// new org.apache.lucene.analysis.SimpleAnalyzer());
+// Query q = qp.parse(args[0]);
+// System.out.println(q.toString("field"));
+// }
}
PARSER_END(QueryParser)
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/MockTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/MockTokenizer.java?rev=948195&r1=948194&r2=948195&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/MockTokenizer.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/MockTokenizer.java Tue May 25 20:16:44 2010
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.io.Reader;
import org.apache.lucene.util.Version;
+import org.apache.lucene.util.AttributeSource.AttributeFactory;
import org.apache.lucene.util.automaton.CharacterRunAutomaton;
import org.apache.lucene.util.automaton.RegExp;
@@ -45,6 +46,13 @@ public class MockTokenizer extends CharT
private final boolean lowerCase;
private int state;
+ public MockTokenizer(AttributeFactory factory, Reader input, CharacterRunAutomaton runAutomaton, boolean lowerCase) {
+ super(Version.LUCENE_CURRENT, factory, input);
+ this.runAutomaton = runAutomaton;
+ this.lowerCase = lowerCase;
+ this.state = runAutomaton.getInitialState();
+ }
+
public MockTokenizer(Reader input, CharacterRunAutomaton runAutomaton, boolean lowerCase) {
super(Version.LUCENE_CURRENT, input);
this.runAutomaton = runAutomaton;