You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2011/05/23 18:50:04 UTC
svn commit: r1126578 [1/4] - in /lucene/dev/branches/flexscoring: ./
dev-tools/eclipse/ dev-tools/idea/ dev-tools/idea/.idea/
dev-tools/idea/lucene/ dev-tools/idea/lucene/contrib/ant/
dev-tools/idea/lucene/contrib/db/bdb-je/ dev-tools/idea/lucene/contr...
Author: rmuir
Date: Mon May 23 16:49:59 2011
New Revision: 1126578
URL: http://svn.apache.org/viewvc?rev=1126578&view=rev
Log:
merge trunk (1103041:1126281)
Added:
lucene/dev/branches/flexscoring/dev-tools/idea/modules/grouping/
- copied from r1126281, lucene/dev/trunk/dev-tools/idea/modules/grouping/
lucene/dev/branches/flexscoring/dev-tools/idea/modules/grouping/grouping.iml
- copied unchanged from r1126281, lucene/dev/trunk/dev-tools/idea/modules/grouping/grouping.iml
lucene/dev/branches/flexscoring/dev-tools/maven/modules/grouping/
- copied from r1126281, lucene/dev/trunk/dev-tools/maven/modules/grouping/
lucene/dev/branches/flexscoring/dev-tools/maven/modules/grouping/pom.xml.template
- copied unchanged from r1126281, lucene/dev/trunk/dev-tools/maven/modules/grouping/pom.xml.template
lucene/dev/branches/flexscoring/modules/grouping/src/java/org/apache/lucene/search/grouping/AllGroupsCollector.java
- copied unchanged from r1126281, lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/grouping/AllGroupsCollector.java
lucene/dev/branches/flexscoring/modules/grouping/src/java/org/apache/lucene/search/grouping/package.html
- copied unchanged from r1126281, lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/grouping/package.html
lucene/dev/branches/flexscoring/modules/grouping/src/java/overview.html
- copied unchanged from r1126281, lucene/dev/trunk/modules/grouping/src/java/overview.html
lucene/dev/branches/flexscoring/modules/grouping/src/test/org/apache/lucene/search/grouping/AllGroupsCollectorTest.java
- copied unchanged from r1126281, lucene/dev/trunk/modules/grouping/src/test/org/apache/lucene/search/grouping/AllGroupsCollectorTest.java
lucene/dev/branches/flexscoring/solr/contrib/clustering/lib/carrot2-core-3.5.0.jar
- copied unchanged from r1126281, lucene/dev/trunk/solr/contrib/clustering/lib/carrot2-core-3.5.0.jar
lucene/dev/branches/flexscoring/solr/contrib/clustering/lib/hppc-0.3.3.jar
- copied unchanged from r1126281, lucene/dev/trunk/solr/contrib/clustering/lib/hppc-0.3.3.jar
lucene/dev/branches/flexscoring/solr/contrib/clustering/lib/simple-xml-2.4.1.jar
- copied unchanged from r1126281, lucene/dev/trunk/solr/contrib/clustering/lib/simple-xml-2.4.1.jar
lucene/dev/branches/flexscoring/solr/contrib/clustering/src/main/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2StemmerFactory.java
- copied unchanged from r1126281, lucene/dev/trunk/solr/contrib/clustering/src/main/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2StemmerFactory.java
lucene/dev/branches/flexscoring/solr/contrib/clustering/src/main/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2TokenizerFactory.java
- copied unchanged from r1126281, lucene/dev/trunk/solr/contrib/clustering/src/main/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2TokenizerFactory.java
lucene/dev/branches/flexscoring/solr/contrib/clustering/src/main/java/org/apache/solr/handler/clustering/carrot2/SolrStopwordsCarrot2LexicalDataFactory.java
- copied unchanged from r1126281, lucene/dev/trunk/solr/contrib/clustering/src/main/java/org/apache/solr/handler/clustering/carrot2/SolrStopwordsCarrot2LexicalDataFactory.java
lucene/dev/branches/flexscoring/solr/contrib/clustering/src/test/java/org/apache/solr/handler/clustering/carrot2/LexicalResourcesCheckClusteringAlgorithm.java
- copied unchanged from r1126281, lucene/dev/trunk/solr/contrib/clustering/src/test/java/org/apache/solr/handler/clustering/carrot2/LexicalResourcesCheckClusteringAlgorithm.java
lucene/dev/branches/flexscoring/solr/contrib/clustering/src/test/resources/solr-clustering/conf/clustering/
- copied from r1126281, lucene/dev/trunk/solr/contrib/clustering/src/test/resources/solr-clustering/conf/clustering/
lucene/dev/branches/flexscoring/solr/contrib/clustering/src/test/resources/solr-clustering/conf/clustering/carrot2/
- copied from r1126281, lucene/dev/trunk/solr/contrib/clustering/src/test/resources/solr-clustering/conf/clustering/carrot2/
lucene/dev/branches/flexscoring/solr/contrib/clustering/src/test/resources/solr-clustering/conf/clustering/carrot2/stoplabels.mt
- copied unchanged from r1126281, lucene/dev/trunk/solr/contrib/clustering/src/test/resources/solr-clustering/conf/clustering/carrot2/stoplabels.mt
lucene/dev/branches/flexscoring/solr/contrib/clustering/src/test/resources/solr-clustering/conf/clustering/carrot2/stopwords.mt
- copied unchanged from r1126281, lucene/dev/trunk/solr/contrib/clustering/src/test/resources/solr-clustering/conf/clustering/carrot2/stopwords.mt
lucene/dev/branches/flexscoring/solr/contrib/clustering/src/test/resources/solr-clustering/conf/clustering/custom/
- copied from r1126281, lucene/dev/trunk/solr/contrib/clustering/src/test/resources/solr-clustering/conf/clustering/custom/
lucene/dev/branches/flexscoring/solr/contrib/clustering/src/test/resources/solr-clustering/conf/clustering/custom/stoplabels.mt
- copied unchanged from r1126281, lucene/dev/trunk/solr/contrib/clustering/src/test/resources/solr-clustering/conf/clustering/custom/stoplabels.mt
lucene/dev/branches/flexscoring/solr/contrib/clustering/src/test/resources/solr-clustering/conf/clustering/custom/stopwords.mt
- copied unchanged from r1126281, lucene/dev/trunk/solr/contrib/clustering/src/test/resources/solr-clustering/conf/clustering/custom/stopwords.mt
lucene/dev/branches/flexscoring/solr/contrib/extraction/src/test/java/org/apache/solr/handler/extraction/
- copied from r1126281, lucene/dev/trunk/solr/contrib/extraction/src/test/java/org/apache/solr/handler/extraction/
lucene/dev/branches/flexscoring/solr/contrib/extraction/src/test/java/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
- copied unchanged from r1126281, lucene/dev/trunk/solr/contrib/extraction/src/test/java/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
lucene/dev/branches/flexscoring/solr/contrib/extraction/src/test/resources/password-is-solrcell.docx
- copied unchanged from r1126281, lucene/dev/trunk/solr/contrib/extraction/src/test/resources/password-is-solrcell.docx
Removed:
lucene/dev/branches/flexscoring/modules/grouping/CHANGES.txt
lucene/dev/branches/flexscoring/modules/grouping/src/java/org/apache/lucene/search/grouping/CachingCollector.java
lucene/dev/branches/flexscoring/solr/contrib/clustering/lib/carrot2-core-3.4.2.jar
lucene/dev/branches/flexscoring/solr/contrib/clustering/lib/hppc-0.3.1.jar
lucene/dev/branches/flexscoring/solr/contrib/clustering/lib/simple-xml-2.3.5.jar
lucene/dev/branches/flexscoring/solr/contrib/clustering/src/main/java/org/apache/solr/handler/clustering/carrot2/LuceneLanguageModelFactory.java
lucene/dev/branches/flexscoring/solr/contrib/extraction/src/test/java/org/apache/solr/handler/ExtractingRequestHandlerTest.java
lucene/dev/branches/flexscoring/solr/lib/geronimo-stax-LICENSE-ASL.txt
lucene/dev/branches/flexscoring/solr/lib/geronimo-stax-NOTICE.txt
lucene/dev/branches/flexscoring/solr/lib/geronimo-stax-api_1.0_spec-1.0.1.jar
Modified:
lucene/dev/branches/flexscoring/ (props changed)
lucene/dev/branches/flexscoring/build.xml
lucene/dev/branches/flexscoring/dev-tools/eclipse/dot.classpath
lucene/dev/branches/flexscoring/dev-tools/idea/.idea/ant.xml
lucene/dev/branches/flexscoring/dev-tools/idea/.idea/compiler.xml
lucene/dev/branches/flexscoring/dev-tools/idea/.idea/modules.xml
lucene/dev/branches/flexscoring/dev-tools/idea/.idea/workspace.xml
lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/ant/ant.iml (props changed)
lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/db/bdb-je/bdb-je.iml (props changed)
lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/db/bdb/bdb.iml (props changed)
lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/demo/demo.iml (props changed)
lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/highlighter/highlighter.iml (props changed)
lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/instantiated/instantiated.iml (props changed)
lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/lucli/lucli.iml (props changed)
lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/memory/memory.iml (props changed)
lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/misc/misc.iml (props changed)
lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/queries/queries.iml (props changed)
lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/queryparser/queryparser.iml (props changed)
lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/spatial/spatial.iml (props changed)
lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/spellchecker/spellchecker.iml (props changed)
lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/swing/swing.iml (props changed)
lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/wordnet/wordnet.iml (props changed)
lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/xml-query-parser/xml-query-parser.iml (props changed)
lucene/dev/branches/flexscoring/dev-tools/idea/lucene/lucene.iml (props changed)
lucene/dev/branches/flexscoring/dev-tools/idea/modules/analysis/common/common.iml (props changed)
lucene/dev/branches/flexscoring/dev-tools/idea/modules/analysis/icu/icu.iml (props changed)
lucene/dev/branches/flexscoring/dev-tools/idea/modules/analysis/phonetic/phonetic.iml (props changed)
lucene/dev/branches/flexscoring/dev-tools/idea/modules/analysis/smartcn/smartcn.iml (props changed)
lucene/dev/branches/flexscoring/dev-tools/idea/modules/analysis/stempel/stempel.iml (props changed)
lucene/dev/branches/flexscoring/dev-tools/idea/modules/benchmark/benchmark.iml (props changed)
lucene/dev/branches/flexscoring/dev-tools/idea/parent.iml (props changed)
lucene/dev/branches/flexscoring/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml (props changed)
lucene/dev/branches/flexscoring/dev-tools/idea/solr/contrib/clustering/clustering.iml (props changed)
lucene/dev/branches/flexscoring/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml (props changed)
lucene/dev/branches/flexscoring/dev-tools/idea/solr/contrib/dataimporthandler/src/extras/extras.iml (props changed)
lucene/dev/branches/flexscoring/dev-tools/idea/solr/contrib/extraction/extraction.iml (props changed)
lucene/dev/branches/flexscoring/dev-tools/idea/solr/contrib/uima/uima.iml (props changed)
lucene/dev/branches/flexscoring/dev-tools/idea/solr/solr.iml (props changed)
lucene/dev/branches/flexscoring/dev-tools/maven/lucene/src/test-framework/pom.xml.template (props changed)
lucene/dev/branches/flexscoring/dev-tools/maven/modules/pom.xml.template
lucene/dev/branches/flexscoring/dev-tools/maven/pom.xml.template
lucene/dev/branches/flexscoring/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template
lucene/dev/branches/flexscoring/dev-tools/maven/solr/contrib/uima/pom.xml.template (props changed)
lucene/dev/branches/flexscoring/dev-tools/maven/solr/src/pom.xml.template
lucene/dev/branches/flexscoring/dev-tools/maven/solr/src/solrj/pom.xml.template
lucene/dev/branches/flexscoring/dev-tools/maven/solr/src/test-framework/pom.xml.template (contents, props changed)
lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilter.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/HyphenatedWordsFilter.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PrefixAndSuffixAwareTokenFilter.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PrefixAwareTokenFilter.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapper.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilter.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/util/ReusableAnalyzerBase.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemmer.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/commongrams/CommonGramsFilterTest.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilter.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilter.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilter.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilter.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilter.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilter.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilter.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilter.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiNormalizer.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiStemmer.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilter.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/in/TestIndicNormalizer.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianLightStemFilter.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianStemmer.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestASCIIFoldingFilter.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCapitalizationFilter.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestHyphenatedWordsFilter.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeepWordFilter.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilter.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLengthFilter.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPrefixAndSuffixAwareTokenFilter.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPrefixAwareTokenFilter.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilterTest.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenFilterTest.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceCharFilter.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceFilter.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterTest.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterTest.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/reverse/TestReverseStringFilter.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianLightStemFilter.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/DateRecognizerSinkTokenizerTest.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TokenRangeSinkTokenizerTest.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TokenTypeSinkTokenizerTest.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishLightStemFilter.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymFilter.java
lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishLowerCaseFilter.java
lucene/dev/branches/flexscoring/modules/grouping/ (props changed)
lucene/dev/branches/flexscoring/modules/grouping/build.xml
lucene/dev/branches/flexscoring/modules/grouping/src/java/org/apache/lucene/search/grouping/FirstPassGroupingCollector.java
lucene/dev/branches/flexscoring/modules/grouping/src/java/org/apache/lucene/search/grouping/SearchGroup.java
lucene/dev/branches/flexscoring/modules/grouping/src/java/org/apache/lucene/search/grouping/SecondPassGroupingCollector.java
lucene/dev/branches/flexscoring/modules/grouping/src/java/org/apache/lucene/search/grouping/TopGroups.java
lucene/dev/branches/flexscoring/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
lucene/dev/branches/flexscoring/solr/ (props changed)
lucene/dev/branches/flexscoring/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/flexscoring/solr/LICENSE.txt (props changed)
lucene/dev/branches/flexscoring/solr/NOTICE.txt (props changed)
lucene/dev/branches/flexscoring/solr/README.txt (props changed)
lucene/dev/branches/flexscoring/solr/build.xml (props changed)
lucene/dev/branches/flexscoring/solr/client/ (props changed)
lucene/dev/branches/flexscoring/solr/common-build.xml (props changed)
lucene/dev/branches/flexscoring/solr/contrib/ (props changed)
lucene/dev/branches/flexscoring/solr/contrib/clustering/CHANGES.txt
lucene/dev/branches/flexscoring/solr/contrib/clustering/src/main/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java
lucene/dev/branches/flexscoring/solr/contrib/clustering/src/main/java/org/apache/solr/handler/clustering/carrot2/CarrotParams.java
lucene/dev/branches/flexscoring/solr/contrib/clustering/src/test/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngineTest.java
lucene/dev/branches/flexscoring/solr/contrib/clustering/src/test/java/org/apache/solr/handler/clustering/carrot2/MockClusteringAlgorithm.java
lucene/dev/branches/flexscoring/solr/contrib/clustering/src/test/resources/solr-clustering/conf/solrconfig.xml
lucene/dev/branches/flexscoring/solr/contrib/clustering/src/test/resources/solr-clustering/conf/stopwords.txt
lucene/dev/branches/flexscoring/solr/contrib/extraction/CHANGES.txt
lucene/dev/branches/flexscoring/solr/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java
lucene/dev/branches/flexscoring/solr/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/ExtractingParams.java
lucene/dev/branches/flexscoring/solr/example/ (props changed)
lucene/dev/branches/flexscoring/solr/example/solr/conf/solrconfig.xml
lucene/dev/branches/flexscoring/solr/lib/ (props changed)
lucene/dev/branches/flexscoring/solr/site/ (props changed)
lucene/dev/branches/flexscoring/solr/src/ (props changed)
lucene/dev/branches/flexscoring/solr/src/java/org/apache/solr/core/SolrConfig.java
lucene/dev/branches/flexscoring/solr/src/java/org/apache/solr/request/SimpleFacets.java
lucene/dev/branches/flexscoring/solr/src/java/org/apache/solr/response/JSONResponseWriter.java
lucene/dev/branches/flexscoring/solr/src/java/org/apache/solr/response/XMLWriter.java
lucene/dev/branches/flexscoring/solr/src/java/org/apache/solr/search/JoinQParserPlugin.java
lucene/dev/branches/flexscoring/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java
lucene/dev/branches/flexscoring/solr/src/test/org/apache/solr/TestJoin.java
lucene/dev/branches/flexscoring/solr/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java
lucene/dev/branches/flexscoring/solr/src/test/org/apache/solr/request/JSONWriterTest.java
lucene/dev/branches/flexscoring/solr/testlogging.properties (props changed)
Modified: lucene/dev/branches/flexscoring/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/build.xml?rev=1126578&r1=1126577&r2=1126578&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/build.xml (original)
+++ lucene/dev/branches/flexscoring/build.xml Mon May 23 16:49:59 2011
@@ -77,14 +77,6 @@
<mkdir dir=".settings"/>
<copy file="dev-tools/eclipse/resources.prefs"
tofile=".settings/org.eclipse.core.resources.prefs" overwrite="true"/>
- <echo>Running Lucene contrib db/bdb-je task 'get-je-jar' ...</echo>
- <subant target="get-je-jar">
- <fileset dir="lucene/contrib/db/bdb-je" includes="build.xml" />
- </subant>
- <echo>Running Lucene contrib db/bdb task 'get-db-jar' ...</echo>
- <subant target="get-db-jar">
- <fileset dir="lucene/contrib/db/bdb" includes="build.xml" />
- </subant>
<echo>
SUCCESS: You must right-click your project and choose Refresh
Please note, your project must use a Java 6 JRE
@@ -95,14 +87,6 @@
<copy todir=".">
<fileset dir="dev-tools/idea"/>
</copy>
- <echo>Running Lucene contrib db/bdb-je task 'get-je-jar' ...</echo>
- <subant target="get-je-jar">
- <fileset dir="lucene/contrib/db/bdb-je" includes="build.xml" />
- </subant>
- <echo>Running Lucene contrib db/bdb task 'get-db-jar' ...</echo>
- <subant target="get-db-jar">
- <fileset dir="lucene/contrib/db/bdb" includes="build.xml" />
- </subant>
<echo>
To complete IntelliJ IDEA setup, you must manually configure
Project Structure | Project | Project SDK.
Modified: lucene/dev/branches/flexscoring/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/eclipse/dot.classpath?rev=1126578&r1=1126577&r2=1126578&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/flexscoring/dev-tools/eclipse/dot.classpath Mon May 23 16:49:59 2011
@@ -3,21 +3,12 @@
<classpathentry kind="src" path="lucene/src/java"/>
<classpathentry kind="src" path="lucene/src/test-framework"/>
<classpathentry kind="src" path="lucene/src/test"/>
- <classpathentry kind="src" path="lucene/contrib/ant/src/java"/>
- <classpathentry kind="src" path="lucene/contrib/ant/src/resources"/>
- <classpathentry kind="src" path="lucene/contrib/ant/src/test"/>
- <classpathentry kind="src" path="lucene/contrib/db/bdb/src/java"/>
- <classpathentry kind="src" path="lucene/contrib/db/bdb/src/test"/>
- <classpathentry kind="src" path="lucene/contrib/db/bdb-je/src/java"/>
- <classpathentry kind="src" path="lucene/contrib/db/bdb-je/src/test"/>
<classpathentry kind="src" path="lucene/contrib/demo/src/java"/>
<classpathentry kind="src" path="lucene/contrib/demo/src/test"/>
<classpathentry kind="src" path="lucene/contrib/highlighter/src/java"/>
<classpathentry kind="src" path="lucene/contrib/highlighter/src/test"/>
<classpathentry kind="src" path="lucene/contrib/instantiated/src/java"/>
<classpathentry kind="src" path="lucene/contrib/instantiated/src/test"/>
- <classpathentry kind="src" path="lucene/contrib/lucli/src/java"/>
- <classpathentry kind="src" path="lucene/contrib/lucli/src/test"/>
<classpathentry kind="src" path="lucene/contrib/memory/src/java"/>
<classpathentry kind="src" path="lucene/contrib/memory/src/test"/>
<classpathentry kind="src" path="lucene/contrib/misc/src/java"/>
@@ -31,8 +22,6 @@
<classpathentry kind="src" path="lucene/contrib/spatial/src/test"/>
<classpathentry kind="src" path="lucene/contrib/spellchecker/src/java"/>
<classpathentry kind="src" path="lucene/contrib/spellchecker/src/test"/>
- <classpathentry kind="src" path="lucene/contrib/swing/src/java"/>
- <classpathentry kind="src" path="lucene/contrib/swing/src/test"/>
<classpathentry kind="src" path="lucene/contrib/wordnet/src/java"/>
<classpathentry kind="src" path="lucene/contrib/wordnet/src/test"/>
<classpathentry kind="src" path="lucene/contrib/xml-query-parser/src/java"/>
@@ -53,6 +42,8 @@
<classpathentry kind="src" path="modules/analysis/stempel/src/test"/>
<classpathentry kind="src" path="modules/benchmark/src/java"/>
<classpathentry kind="src" path="modules/benchmark/src/test"/>
+ <classpathentry kind="src" path="modules/grouping/src/java"/>
+ <classpathentry kind="src" path="modules/grouping/src/test"/>
<classpathentry kind="src" path="solr/src/java"/>
<classpathentry kind="src" path="solr/src/webapp/src"/>
<classpathentry kind="src" path="solr/src/common"/>
@@ -82,10 +73,6 @@
<classpathentry kind="lib" path="lucene/lib/ant-1.7.1.jar"/>
<classpathentry kind="lib" path="lucene/lib/ant-junit-1.7.1.jar"/>
<classpathentry kind="lib" path="lucene/lib/junit-4.7.jar"/>
- <classpathentry kind="lib" path="lucene/contrib/ant/lib/jtidy-r938.jar"/>
- <classpathentry kind="lib" path="lucene/contrib/db/bdb/lib/db-4.7.25.jar"/>
- <classpathentry kind="lib" path="lucene/contrib/db/bdb-je/lib/je-3.3.93.jar"/>
- <classpathentry kind="lib" path="lucene/contrib/lucli/lib/jline.jar"/>
<classpathentry kind="lib" path="lucene/contrib/queries/lib/jakarta-regexp-1.4.jar"/>
<classpathentry kind="lib" path="modules/analysis/icu/lib/icu4j-4_6.jar"/>
<classpathentry kind="lib" path="modules/analysis/phonetic/lib/commons-codec-1.4.jar"/>
@@ -105,7 +92,6 @@
<classpathentry kind="lib" path="solr/lib/commons-io-1.4.jar"/>
<classpathentry kind="lib" path="solr/lib/commons-lang-2.4.jar"/>
<classpathentry kind="lib" path="solr/lib/easymock-2.2.jar"/>
- <classpathentry kind="lib" path="solr/lib/geronimo-stax-api_1.0_spec-1.0.1.jar"/>
<classpathentry kind="lib" path="solr/lib/guava-r05.jar"/>
<classpathentry kind="lib" path="solr/lib/jcl-over-slf4j-1.6.1.jar"/>
<classpathentry kind="lib" path="solr/lib/junit-4.7.jar"/>
@@ -124,13 +110,13 @@
<classpathentry kind="lib" path="solr/example/lib/jsp-2.1/jsp-2.1-glassfish-2.1.v20091210.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jsp-2.1/jsp-2.1-jetty-6.1.26.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jsp-2.1/jsp-api-2.1-glassfish-2.1.v20091210.jar"/>
- <classpathentry kind="lib" path="solr/contrib/clustering/lib/carrot2-core-3.4.2.jar"/>
- <classpathentry kind="lib" path="solr/contrib/clustering/lib/hppc-0.3.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/clustering/lib/carrot2-core-3.5.0.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/clustering/lib/hppc-0.3.3.jar"/>
<classpathentry kind="lib" path="solr/contrib/clustering/lib/jackson-core-asl-1.5.2.jar"/>
<classpathentry kind="lib" path="solr/contrib/clustering/lib/jackson-mapper-asl-1.5.2.jar"/>
<classpathentry kind="lib" path="solr/contrib/clustering/lib/mahout-collections-0.3.jar"/>
<classpathentry kind="lib" path="solr/contrib/clustering/lib/mahout-math-0.3.jar"/>
- <classpathentry kind="lib" path="solr/contrib/clustering/lib/simple-xml-2.3.5.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/clustering/lib/simple-xml-2.4.1.jar"/>
<classpathentry kind="lib" path="solr/contrib/dataimporthandler/lib/activation-1.1.jar"/>
<classpathentry kind="lib" path="solr/contrib/dataimporthandler/lib/mail-1.4.1.jar"/>
<classpathentry kind="lib" path="solr/contrib/extraction/lib/asm-3.1.jar"/>
Modified: lucene/dev/branches/flexscoring/dev-tools/idea/.idea/ant.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/idea/.idea/ant.xml?rev=1126578&r1=1126577&r2=1126578&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/idea/.idea/ant.xml (original)
+++ lucene/dev/branches/flexscoring/dev-tools/idea/.idea/ant.xml Mon May 23 16:49:59 2011
@@ -26,6 +26,7 @@
<buildFile url="file://$PROJECT_DIR$/modules/analysis/smartcn/build.xml" />
<buildFile url="file://$PROJECT_DIR$/modules/analysis/stempel/build.xml" />
<buildFile url="file://$PROJECT_DIR$/modules/benchmark/build.xml" />
+ <buildFile url="file://$PROJECT_DIR$/modules/grouping/build.xml" />
<buildFile url="file://$PROJECT_DIR$/solr/build.xml" />
<buildFile url="file://$PROJECT_DIR$/solr/contrib/analysis-extras/build.xml" />
<buildFile url="file://$PROJECT_DIR$/solr/contrib/clustering/build.xml" />
Modified: lucene/dev/branches/flexscoring/dev-tools/idea/.idea/compiler.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/idea/.idea/compiler.xml?rev=1126578&r1=1126577&r2=1126578&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/idea/.idea/compiler.xml (original)
+++ lucene/dev/branches/flexscoring/dev-tools/idea/.idea/compiler.xml Mon May 23 16:49:59 2011
@@ -27,6 +27,7 @@
<entry name="?*.tbl" />
<entry name="?*.tld" />
<entry name="?*.txt" />
+ <entry name="?*.utf8"/>
<entry name="?*.xml" />
<entry name="?*.xsl" />
<entry name="?*.vm" />
Modified: lucene/dev/branches/flexscoring/dev-tools/idea/.idea/modules.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/idea/.idea/modules.xml?rev=1126578&r1=1126577&r2=1126578&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/idea/.idea/modules.xml (original)
+++ lucene/dev/branches/flexscoring/dev-tools/idea/.idea/modules.xml Mon May 23 16:49:59 2011
@@ -26,6 +26,7 @@
<module filepath="$PROJECT_DIR$/modules/analysis/smartcn/smartcn.iml" />
<module filepath="$PROJECT_DIR$/modules/analysis/stempel/stempel.iml" />
<module filepath="$PROJECT_DIR$/modules/benchmark/benchmark.iml" />
+ <module filepath="$PROJECT_DIR$/modules/grouping/grouping.iml" />
<module filepath="$PROJECT_DIR$/solr/solr.iml" />
<module filepath="$PROJECT_DIR$/solr/contrib/analysis-extras/analysis-extras.iml" />
<module filepath="$PROJECT_DIR$/solr/contrib/clustering/clustering.iml" />
Modified: lucene/dev/branches/flexscoring/dev-tools/idea/.idea/workspace.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/idea/.idea/workspace.xml?rev=1126578&r1=1126577&r2=1126578&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/idea/.idea/workspace.xml (original)
+++ lucene/dev/branches/flexscoring/dev-tools/idea/.idea/workspace.xml Mon May 23 16:49:59 2011
@@ -71,6 +71,13 @@
<option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
+ <configuration default="false" name="grouping module" type="JUnit" factoryName="JUnit">
+ <module name="grouping" />
+ <option name="TEST_OBJECT" value="package" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/modules/grouping/build" />
+ <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
+ <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
+ </configuration>
<configuration default="false" name="highlighter contrib" type="JUnit" factoryName="JUnit">
<module name="highlighter" />
<option name="TEST_OBJECT" value="package" />
@@ -204,7 +211,7 @@
<option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
- <list size="29">
+ <list size="30">
<item index="0" class="java.lang.String" itemvalue="JUnit.analysis-extras contrib" />
<item index="1" class="java.lang.String" itemvalue="JUnit.ant contrib" />
<item index="2" class="java.lang.String" itemvalue="JUnit.bdb contrib" />
@@ -215,25 +222,26 @@
<item index="7" class="java.lang.String" itemvalue="JUnit.dataimporthandler contrib" />
<item index="8" class="java.lang.String" itemvalue="JUnit.extraction contrib" />
<item index="9" class="java.lang.String" itemvalue="JUnit.extras from dataimporthandler contrib" />
- <item index="10" class="java.lang.String" itemvalue="JUnit.highlighter contrib" />
- <item index="11" class="java.lang.String" itemvalue="JUnit.icu analysis module" />
- <item index="12" class="java.lang.String" itemvalue="JUnit.instantiated contrib" />
- <item index="13" class="java.lang.String" itemvalue="JUnit.lucene" />
- <item index="14" class="java.lang.String" itemvalue="JUnit.lucli contrib" />
- <item index="15" class="java.lang.String" itemvalue="JUnit.memory contrib" />
- <item index="16" class="java.lang.String" itemvalue="JUnit.misc contrib" />
- <item index="17" class="java.lang.String" itemvalue="JUnit.phonetic analysis module" />
- <item index="18" class="java.lang.String" itemvalue="JUnit.queries contrib" />
- <item index="19" class="java.lang.String" itemvalue="JUnit.queryparser contrib" />
- <item index="20" class="java.lang.String" itemvalue="JUnit.smartcn analysis module" />
- <item index="21" class="java.lang.String" itemvalue="JUnit.solr" />
- <item index="22" class="java.lang.String" itemvalue="JUnit.spatial contrib" />
- <item index="23" class="java.lang.String" itemvalue="JUnit.spellchecker contrib" />
- <item index="24" class="java.lang.String" itemvalue="JUnit.stempel analysis module" />
- <item index="25" class="java.lang.String" itemvalue="JUnit.swing contrib" />
- <item index="26" class="java.lang.String" itemvalue="JUnit.uima contrib" />
- <item index="27" class="java.lang.String" itemvalue="JUnit.wordnet contrib" />
- <item index="28" class="java.lang.String" itemvalue="JUnit.xml-query-parser contrib" />
+ <item index="10" class="java.lang.String" itemvalue="JUnit.grouping module" />
+ <item index="11" class="java.lang.String" itemvalue="JUnit.highlighter contrib" />
+ <item index="12" class="java.lang.String" itemvalue="JUnit.icu analysis module" />
+ <item index="13" class="java.lang.String" itemvalue="JUnit.instantiated contrib" />
+ <item index="14" class="java.lang.String" itemvalue="JUnit.lucene" />
+ <item index="15" class="java.lang.String" itemvalue="JUnit.lucli contrib" />
+ <item index="16" class="java.lang.String" itemvalue="JUnit.memory contrib" />
+ <item index="17" class="java.lang.String" itemvalue="JUnit.misc contrib" />
+ <item index="18" class="java.lang.String" itemvalue="JUnit.phonetic analysis module" />
+ <item index="19" class="java.lang.String" itemvalue="JUnit.queries contrib" />
+ <item index="20" class="java.lang.String" itemvalue="JUnit.queryparser contrib" />
+ <item index="21" class="java.lang.String" itemvalue="JUnit.smartcn analysis module" />
+ <item index="22" class="java.lang.String" itemvalue="JUnit.solr" />
+ <item index="23" class="java.lang.String" itemvalue="JUnit.spatial contrib" />
+ <item index="24" class="java.lang.String" itemvalue="JUnit.spellchecker contrib" />
+ <item index="25" class="java.lang.String" itemvalue="JUnit.stempel analysis module" />
+ <item index="26" class="java.lang.String" itemvalue="JUnit.swing contrib" />
+ <item index="27" class="java.lang.String" itemvalue="JUnit.uima contrib" />
+ <item index="28" class="java.lang.String" itemvalue="JUnit.wordnet contrib" />
+ <item index="29" class="java.lang.String" itemvalue="JUnit.xml-query-parser contrib" />
</list>
</component>
</project>
Modified: lucene/dev/branches/flexscoring/dev-tools/maven/modules/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/maven/modules/pom.xml.template?rev=1126578&r1=1126577&r2=1126578&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/maven/modules/pom.xml.template (original)
+++ lucene/dev/branches/flexscoring/dev-tools/maven/modules/pom.xml.template Mon May 23 16:49:59 2011
@@ -33,6 +33,7 @@
<modules>
<module>analysis</module>
<module>benchmark</module>
+ <module>grouping</module>
</modules>
<build>
<directory>build/lucene-modules-aggregator</directory>
Modified: lucene/dev/branches/flexscoring/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/maven/pom.xml.template?rev=1126578&r1=1126577&r2=1126578&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/flexscoring/dev-tools/maven/pom.xml.template Mon May 23 16:49:59 2011
@@ -24,6 +24,7 @@
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>8</version>
+ <relativePath/>
</parent>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-solr-grandparent</artifactId>
@@ -106,14 +107,6 @@
</licenses>
<repositories>
<repository>
- <id>carrot2.org</id>
- <name>Carrot2 Maven2 repository</name>
- <url>http://download.carrot2.org/maven2/</url>
- <snapshots>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </repository>
- <repository>
<id>apache.snapshots</id>
<name>Apache Snapshot Repository</name>
<url>http://repository.apache.org/snapshots</url>
@@ -238,11 +231,6 @@
<version>1.1</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-commons-csv</artifactId>
<version>${project.version}</version>
@@ -305,7 +293,7 @@
<dependency>
<groupId>org.carrot2</groupId>
<artifactId>carrot2-core</artifactId>
- <version>3.4.2</version>
+ <version>3.5.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
Modified: lucene/dev/branches/flexscoring/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template?rev=1126578&r1=1126577&r2=1126578&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template (original)
+++ lucene/dev/branches/flexscoring/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template Mon May 23 16:49:59 2011
@@ -70,10 +70,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- </dependency>
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
Modified: lucene/dev/branches/flexscoring/dev-tools/maven/solr/src/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/maven/solr/src/pom.xml.template?rev=1126578&r1=1126577&r2=1126578&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/maven/solr/src/pom.xml.template (original)
+++ lucene/dev/branches/flexscoring/dev-tools/maven/solr/src/pom.xml.template Mon May 23 16:49:59 2011
@@ -97,10 +97,6 @@
<artifactId>solr-commons-csv</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- </dependency>
- <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
Modified: lucene/dev/branches/flexscoring/dev-tools/maven/solr/src/solrj/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/maven/solr/src/solrj/pom.xml.template?rev=1126578&r1=1126577&r2=1126578&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/maven/solr/src/solrj/pom.xml.template (original)
+++ lucene/dev/branches/flexscoring/dev-tools/maven/solr/src/solrj/pom.xml.template Mon May 23 16:49:59 2011
@@ -49,10 +49,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<exclusions>
Modified: lucene/dev/branches/flexscoring/dev-tools/maven/solr/src/test-framework/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/maven/solr/src/test-framework/pom.xml.template?rev=1126578&r1=1126577&r2=1126578&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/maven/solr/src/test-framework/pom.xml.template (original)
+++ lucene/dev/branches/flexscoring/dev-tools/maven/solr/src/test-framework/pom.xml.template Mon May 23 16:49:59 2011
@@ -1,76 +1,76 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <!--
- 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.
- -->
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-parent</artifactId>
- <version>@version@</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-test-framework</artifactId>
- <packaging>jar</packaging>
- <name>Apache Solr Test Framework</name>
- <description>Apache Solr Test Framework</description>
- <properties>
- <module-directory>solr/src/test-framework</module-directory>
- <build-directory>../../build</build-directory>
- </properties>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>solr-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-test-framework</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- </dependencies>
- <build>
- <directory>${build-directory}</directory>
- <outputDirectory>${build-directory}/classes/test-framework</outputDirectory>
- <sourceDirectory>.</sourceDirectory>
- <resources>
- <resource>
- <directory>.</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <!--
+ 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.
+ -->
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-parent</artifactId>
+ <version>@version@</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-test-framework</artifactId>
+ <packaging>jar</packaging>
+ <name>Apache Solr Test Framework</name>
+ <description>Apache Solr Test Framework</description>
+ <properties>
+ <module-directory>solr/src/test-framework</module-directory>
+ <build-directory>../../build</build-directory>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>solr-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-test-framework</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <directory>${build-directory}</directory>
+ <outputDirectory>${build-directory}/classes/test-framework</outputDirectory>
+ <sourceDirectory>.</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>.</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Modified: lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilter.java?rev=1126578&r1=1126577&r2=1126578&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilter.java (original)
+++ lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilter.java Mon May 23 16:49:59 2011
@@ -49,6 +49,7 @@ public final class CommonGramsQueryFilte
private State previous;
private String previousType;
+ private boolean exhausted;
/**
* Constructs a new CommonGramsQueryFilter based on the provided CommomGramsFilter
@@ -67,6 +68,7 @@ public final class CommonGramsQueryFilte
super.reset();
previous = null;
previousType = null;
+ exhausted = false;
}
/**
@@ -79,7 +81,7 @@ public final class CommonGramsQueryFilte
*/
@Override
public boolean incrementToken() throws IOException {
- while (input.incrementToken()) {
+ while (!exhausted && input.incrementToken()) {
State current = captureState();
if (previous != null && !isGramType()) {
@@ -96,6 +98,8 @@ public final class CommonGramsQueryFilte
previous = current;
}
+ exhausted = true;
+
if (previous == null || GRAM_TYPE.equals(previousType)) {
return false;
}
Modified: lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/HyphenatedWordsFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/HyphenatedWordsFilter.java?rev=1126578&r1=1126577&r2=1126578&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/HyphenatedWordsFilter.java (original)
+++ lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/HyphenatedWordsFilter.java Mon May 23 16:49:59 2011
@@ -59,6 +59,7 @@ public final class HyphenatedWordsFilter
private final StringBuilder hyphenated = new StringBuilder();
private State savedState;
+ private boolean exhausted = false;
/**
* Creates a new HyphenatedWordsFilter
@@ -74,7 +75,7 @@ public final class HyphenatedWordsFilter
*/
@Override
public boolean incrementToken() throws IOException {
- while (input.incrementToken()) {
+ while (!exhausted && input.incrementToken()) {
char[] term = termAttribute.buffer();
int termLength = termAttribute.length();
@@ -96,6 +97,8 @@ public final class HyphenatedWordsFilter
}
}
+ exhausted = true;
+
if (savedState != null) {
// the final term ends with a hyphen
// add back the hyphen, for backwards compatibility.
@@ -115,6 +118,7 @@ public final class HyphenatedWordsFilter
super.reset();
hyphenated.setLength(0);
savedState = null;
+ exhausted = false;
}
// ================================================= Helper Methods ================================================
Modified: lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PrefixAndSuffixAwareTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PrefixAndSuffixAwareTokenFilter.java?rev=1126578&r1=1126577&r2=1126578&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PrefixAndSuffixAwareTokenFilter.java (original)
+++ lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PrefixAndSuffixAwareTokenFilter.java Mon May 23 16:49:59 2011
@@ -76,4 +76,9 @@ public class PrefixAndSuffixAwareTokenFi
public void close() throws IOException {
suffix.close();
}
+
+ @Override
+ public void end() throws IOException {
+ suffix.end();
+ }
}
Modified: lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PrefixAwareTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PrefixAwareTokenFilter.java?rev=1126578&r1=1126577&r2=1126578&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PrefixAwareTokenFilter.java (original)
+++ lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PrefixAwareTokenFilter.java Mon May 23 16:49:59 2011
@@ -159,6 +159,12 @@ public class PrefixAwareTokenFilter exte
}
@Override
+ public void end() throws IOException {
+ prefix.end();
+ suffix.end();
+ }
+
+ @Override
public void close() throws IOException {
prefix.close();
suffix.close();
Modified: lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java?rev=1126578&r1=1126577&r2=1126578&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java (original)
+++ lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java Mon May 23 16:49:59 2011
@@ -225,7 +225,6 @@ public final class QueryAutoStopWordAnal
TokenStream result = delegate.reusableTokenStream(fieldName, reader);
if (result == streams.wrapped) {
/* the wrapped analyzer reused the stream */
- streams.withStopFilter.reset();
} else {
/*
* the wrapped analyzer did not. if there are any stopwords for the
Modified: lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapper.java?rev=1126578&r1=1126577&r2=1126578&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapper.java (original)
+++ lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapper.java Mon May 23 16:49:59 2011
@@ -199,10 +199,7 @@ public final class ShingleAnalyzerWrappe
setPreviousTokenStream(streams);
} else {
TokenStream result = defaultAnalyzer.reusableTokenStream(fieldName, reader);
- if (result == streams.wrapped) {
- /* the wrapped analyzer reused the stream */
- streams.shingle.reset();
- } else {
+ if (result != streams.wrapped) {
/* the wrapped analyzer did not, create a new shingle around the new one */
streams.wrapped = result;
streams.shingle = new ShingleFilter(streams.wrapped);
Modified: lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java?rev=1126578&r1=1126577&r2=1126578&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java (original)
+++ lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java Mon May 23 16:49:59 2011
@@ -327,6 +327,8 @@ public final class ShingleFilter extends
return tokenAvailable;
}
+ private boolean exhausted;
+
/**
* <p>Get the next token from the input stream.
* <p>If the next token has <code>positionIncrement > 1</code>,
@@ -359,7 +361,7 @@ public final class ShingleFilter extends
}
isNextInputStreamToken = false;
newTarget.isFiller = false;
- } else if (input.incrementToken()) {
+ } else if (!exhausted && input.incrementToken()) {
if (null == target) {
newTarget = new InputWindowToken(cloneAttributes());
} else {
@@ -387,6 +389,7 @@ public final class ShingleFilter extends
}
} else {
newTarget = null;
+ exhausted = true;
}
return newTarget;
}
@@ -435,7 +438,8 @@ public final class ShingleFilter extends
inputWindow.clear();
numFillerTokensToInsert = 0;
isOutputHere = false;
- noShingleOutput = true;
+ noShingleOutput = true;
+ exhausted = false;
if (outputUnigramsIfNoShingles && ! outputUnigrams) {
// Fix up gramSize if minValue was reset for outputUnigramsIfNoShingles
gramSize.minValue = minShingleSize;
Modified: lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilter.java?rev=1126578&r1=1126577&r2=1126578&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilter.java (original)
+++ lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilter.java Mon May 23 16:49:59 2011
@@ -190,14 +190,18 @@ public final class SynonymFilter extends
private LinkedList<AttributeSource> buffer;
private LinkedList<AttributeSource> matched;
+ private boolean exhausted;
+
private AttributeSource nextTok() throws IOException {
if (buffer!=null && !buffer.isEmpty()) {
return buffer.removeFirst();
} else {
- if (input.incrementToken()) {
+ if (!exhausted && input.incrementToken()) {
return this;
- } else
+ } else {
+ exhausted = true;
return null;
+ }
}
}
@@ -250,5 +254,6 @@ public final class SynonymFilter extends
public void reset() throws IOException {
input.reset();
replacement = null;
+ exhausted = false;
}
}
Modified: lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/util/ReusableAnalyzerBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/util/ReusableAnalyzerBase.java?rev=1126578&r1=1126577&r2=1126578&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/util/ReusableAnalyzerBase.java (original)
+++ lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/util/ReusableAnalyzerBase.java Mon May 23 16:49:59 2011
@@ -159,8 +159,6 @@ public abstract class ReusableAnalyzerBa
*/
protected boolean reset(final Reader reader) throws IOException {
source.reset(reader);
- if(sink != source)
- sink.reset(); // only reset if the sink reference is different from source
return true;
}
Modified: lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemmer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemmer.java?rev=1126578&r1=1126577&r2=1126578&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemmer.java (original)
+++ lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemmer.java Mon May 23 16:49:59 2011
@@ -21,7 +21,7 @@ import java.io.IOException;
import java.io.StringReader;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
-import org.apache.lucene.analysis.core.WhitespaceTokenizer;
+import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter;
import org.apache.lucene.analysis.util.CharArraySet;
import org.apache.lucene.util.Version;
@@ -215,8 +215,7 @@ public class TestBulgarianStemmer extend
public void testWithKeywordAttribute() throws IOException {
CharArraySet set = new CharArraySet(Version.LUCENE_31, 1, true);
set.add("ÑÑÑоеве");
- WhitespaceTokenizer tokenStream = new WhitespaceTokenizer(TEST_VERSION_CURRENT,
- new StringReader("ÑÑÑоевеÑе ÑÑÑоеве"));
+ MockTokenizer tokenStream = new MockTokenizer(new StringReader("ÑÑÑоевеÑе ÑÑÑоеве"), MockTokenizer.WHITESPACE, false);
BulgarianStemFilter filter = new BulgarianStemFilter(
new KeywordMarkerFilter(tokenStream, set));
Modified: lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.java?rev=1126578&r1=1126577&r2=1126578&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.java (original)
+++ lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.java Mon May 23 16:49:59 2011
@@ -22,8 +22,8 @@ import java.io.StringReader;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.CharReader;
import org.apache.lucene.analysis.CharStream;
+import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.core.WhitespaceTokenizer;
public class TestMappingCharFilter extends BaseTokenStreamTestCase {
@@ -64,55 +64,55 @@ public class TestMappingCharFilter exten
public void testNothingChange() throws Exception {
CharStream cs = new MappingCharFilter( normMap, new StringReader( "x" ) );
- TokenStream ts = new WhitespaceTokenizer(TEST_VERSION_CURRENT, cs );
+ TokenStream ts = new MockTokenizer(cs, MockTokenizer.WHITESPACE, false);
assertTokenStreamContents(ts, new String[]{"x"}, new int[]{0}, new int[]{1});
}
public void test1to1() throws Exception {
CharStream cs = new MappingCharFilter( normMap, new StringReader( "h" ) );
- TokenStream ts = new WhitespaceTokenizer( TEST_VERSION_CURRENT, cs );
+ TokenStream ts = new MockTokenizer(cs, MockTokenizer.WHITESPACE, false);
assertTokenStreamContents(ts, new String[]{"i"}, new int[]{0}, new int[]{1});
}
public void test1to2() throws Exception {
CharStream cs = new MappingCharFilter( normMap, new StringReader( "j" ) );
- TokenStream ts = new WhitespaceTokenizer( TEST_VERSION_CURRENT, cs );
+ TokenStream ts = new MockTokenizer(cs, MockTokenizer.WHITESPACE, false);
assertTokenStreamContents(ts, new String[]{"jj"}, new int[]{0}, new int[]{1});
}
public void test1to3() throws Exception {
CharStream cs = new MappingCharFilter( normMap, new StringReader( "k" ) );
- TokenStream ts = new WhitespaceTokenizer( TEST_VERSION_CURRENT, cs );
+ TokenStream ts = new MockTokenizer(cs, MockTokenizer.WHITESPACE, false);
assertTokenStreamContents(ts, new String[]{"kkk"}, new int[]{0}, new int[]{1});
}
public void test2to4() throws Exception {
CharStream cs = new MappingCharFilter( normMap, new StringReader( "ll" ) );
- TokenStream ts = new WhitespaceTokenizer( TEST_VERSION_CURRENT, cs );
+ TokenStream ts = new MockTokenizer(cs, MockTokenizer.WHITESPACE, false);
assertTokenStreamContents(ts, new String[]{"llll"}, new int[]{0}, new int[]{2});
}
public void test2to1() throws Exception {
CharStream cs = new MappingCharFilter( normMap, new StringReader( "aa" ) );
- TokenStream ts = new WhitespaceTokenizer( TEST_VERSION_CURRENT, cs );
+ TokenStream ts = new MockTokenizer(cs, MockTokenizer.WHITESPACE, false);
assertTokenStreamContents(ts, new String[]{"a"}, new int[]{0}, new int[]{2});
}
public void test3to1() throws Exception {
CharStream cs = new MappingCharFilter( normMap, new StringReader( "bbb" ) );
- TokenStream ts = new WhitespaceTokenizer( TEST_VERSION_CURRENT, cs );
+ TokenStream ts = new MockTokenizer(cs, MockTokenizer.WHITESPACE, false);
assertTokenStreamContents(ts, new String[]{"b"}, new int[]{0}, new int[]{3});
}
public void test4to2() throws Exception {
CharStream cs = new MappingCharFilter( normMap, new StringReader( "cccc" ) );
- TokenStream ts = new WhitespaceTokenizer( TEST_VERSION_CURRENT, cs );
+ TokenStream ts = new MockTokenizer(cs, MockTokenizer.WHITESPACE, false);
assertTokenStreamContents(ts, new String[]{"cc"}, new int[]{0}, new int[]{4});
}
public void test5to0() throws Exception {
CharStream cs = new MappingCharFilter( normMap, new StringReader( "empty" ) );
- TokenStream ts = new WhitespaceTokenizer( TEST_VERSION_CURRENT, cs );
+ TokenStream ts = new MockTokenizer(cs, MockTokenizer.WHITESPACE, false);
assertTokenStreamContents(ts, new String[0]);
}
@@ -136,7 +136,7 @@ public class TestMappingCharFilter exten
//
public void testTokenStream() throws Exception {
CharStream cs = new MappingCharFilter( normMap, CharReader.get( new StringReader( "h i j k ll cccc bbb aa" ) ) );
- TokenStream ts = new WhitespaceTokenizer( TEST_VERSION_CURRENT, cs );
+ TokenStream ts = new MockTokenizer(cs, MockTokenizer.WHITESPACE, false);
assertTokenStreamContents(ts,
new String[]{"i","i","jj","kkk","llll","cc","b","a"},
new int[]{0,2,4,6,8,11,16,20},
@@ -157,7 +157,7 @@ public class TestMappingCharFilter exten
public void testChained() throws Exception {
CharStream cs = new MappingCharFilter( normMap,
new MappingCharFilter( normMap, CharReader.get( new StringReader( "aaaa ll h" ) ) ) );
- TokenStream ts = new WhitespaceTokenizer( TEST_VERSION_CURRENT, cs );
+ TokenStream ts = new MockTokenizer(cs, MockTokenizer.WHITESPACE, false);
assertTokenStreamContents(ts,
new String[]{"a","llllllll","i"},
new int[]{0,5,8},
Modified: lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/commongrams/CommonGramsFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/commongrams/CommonGramsFilterTest.java?rev=1126578&r1=1126577&r2=1126578&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/commongrams/CommonGramsFilterTest.java (original)
+++ lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/commongrams/CommonGramsFilterTest.java Mon May 23 16:49:59 2011
@@ -21,6 +21,7 @@ import java.io.StringReader;
import java.util.Arrays;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
+import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.core.WhitespaceTokenizer;
@@ -90,7 +91,7 @@ public class CommonGramsFilterTest exten
@Override
public TokenStream tokenStream(String field, Reader in) {
return new CommonGramsQueryFilter(new CommonGramsFilter(TEST_VERSION_CURRENT,
- new WhitespaceTokenizer(TEST_VERSION_CURRENT, in), commonWords));
+ new MockTokenizer(in, MockTokenizer.WHITESPACE, false), commonWords));
}
};
@@ -159,7 +160,7 @@ public class CommonGramsFilterTest exten
@Override
public TokenStream tokenStream(String field, Reader in) {
return new CommonGramsFilter(TEST_VERSION_CURRENT,
- new WhitespaceTokenizer(TEST_VERSION_CURRENT, in), commonWords);
+ new MockTokenizer(in, MockTokenizer.WHITESPACE, false), commonWords);
}
};
@@ -245,7 +246,7 @@ public class CommonGramsFilterTest exten
*/
public void testCaseSensitive() throws Exception {
final String input = "How The s a brown s cow d like A B thing?";
- WhitespaceTokenizer wt = new WhitespaceTokenizer(TEST_VERSION_CURRENT, new StringReader(input));
+ MockTokenizer wt = new MockTokenizer(new StringReader(input), MockTokenizer.WHITESPACE, false);
TokenFilter cgf = new CommonGramsFilter(TEST_VERSION_CURRENT, wt, commonWords);
assertTokenStreamContents(cgf, new String[] {"How", "The", "The_s", "s",
"s_a", "a", "a_brown", "brown", "brown_s", "s", "s_cow", "cow",
@@ -257,7 +258,7 @@ public class CommonGramsFilterTest exten
*/
public void testLastWordisStopWord() throws Exception {
final String input = "dog the";
- WhitespaceTokenizer wt = new WhitespaceTokenizer(TEST_VERSION_CURRENT, new StringReader(input));
+ MockTokenizer wt = new MockTokenizer(new StringReader(input), MockTokenizer.WHITESPACE, false);
CommonGramsFilter cgf = new CommonGramsFilter(TEST_VERSION_CURRENT, wt, commonWords);
TokenFilter nsf = new CommonGramsQueryFilter(cgf);
assertTokenStreamContents(nsf, new String[] { "dog_the" });
@@ -268,7 +269,7 @@ public class CommonGramsFilterTest exten
*/
public void testFirstWordisStopWord() throws Exception {
final String input = "the dog";
- WhitespaceTokenizer wt = new WhitespaceTokenizer(TEST_VERSION_CURRENT, new StringReader(input));
+ MockTokenizer wt = new MockTokenizer(new StringReader(input), MockTokenizer.WHITESPACE, false);
CommonGramsFilter cgf = new CommonGramsFilter(TEST_VERSION_CURRENT, wt, commonWords);
TokenFilter nsf = new CommonGramsQueryFilter(cgf);
assertTokenStreamContents(nsf, new String[] { "the_dog" });
@@ -279,7 +280,7 @@ public class CommonGramsFilterTest exten
*/
public void testOneWordQueryStopWord() throws Exception {
final String input = "the";
- WhitespaceTokenizer wt = new WhitespaceTokenizer(TEST_VERSION_CURRENT, new StringReader(input));
+ MockTokenizer wt = new MockTokenizer(new StringReader(input), MockTokenizer.WHITESPACE, false);
CommonGramsFilter cgf = new CommonGramsFilter(TEST_VERSION_CURRENT, wt, commonWords);
TokenFilter nsf = new CommonGramsQueryFilter(cgf);
assertTokenStreamContents(nsf, new String[] { "the" });
@@ -290,7 +291,7 @@ public class CommonGramsFilterTest exten
*/
public void testOneWordQuery() throws Exception {
final String input = "monster";
- WhitespaceTokenizer wt = new WhitespaceTokenizer(TEST_VERSION_CURRENT, new StringReader(input));
+ MockTokenizer wt = new MockTokenizer(new StringReader(input), MockTokenizer.WHITESPACE, false);
CommonGramsFilter cgf = new CommonGramsFilter(TEST_VERSION_CURRENT, wt, commonWords);
TokenFilter nsf = new CommonGramsQueryFilter(cgf);
assertTokenStreamContents(nsf, new String[] { "monster" });
@@ -301,7 +302,7 @@ public class CommonGramsFilterTest exten
*/
public void TestFirstAndLastStopWord() throws Exception {
final String input = "the of";
- WhitespaceTokenizer wt = new WhitespaceTokenizer(TEST_VERSION_CURRENT, new StringReader(input));
+ MockTokenizer wt = new MockTokenizer(new StringReader(input), MockTokenizer.WHITESPACE, false);
CommonGramsFilter cgf = new CommonGramsFilter(TEST_VERSION_CURRENT, wt, commonWords);
TokenFilter nsf = new CommonGramsQueryFilter(cgf);
assertTokenStreamContents(nsf, new String[] { "the_of" });
Modified: lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java?rev=1126578&r1=1126577&r2=1126578&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java (original)
+++ lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java Mon May 23 16:49:59 2011
@@ -21,6 +21,7 @@ import java.io.StringReader;
import org.xml.sax.InputSource;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
+import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.compound.hyphenation.HyphenationTree;
import org.apache.lucene.analysis.core.WhitespaceTokenizer;
@@ -35,8 +36,8 @@ public class TestCompoundWordTokenFilter
.getHyphenationTree(is);
HyphenationCompoundWordTokenFilter tf = new HyphenationCompoundWordTokenFilter(TEST_VERSION_CURRENT,
- new WhitespaceTokenizer(TEST_VERSION_CURRENT, new StringReader(
- "min veninde som er lidt af en læsehest")), hyphenator,
+ new MockTokenizer(new StringReader("min veninde som er lidt af en læsehest"), MockTokenizer.WHITESPACE, false),
+ hyphenator,
dict, CompoundWordTokenFilterBase.DEFAULT_MIN_WORD_SIZE,
CompoundWordTokenFilterBase.DEFAULT_MIN_SUBWORD_SIZE,
CompoundWordTokenFilterBase.DEFAULT_MAX_SUBWORD_SIZE, false);
@@ -55,8 +56,8 @@ public class TestCompoundWordTokenFilter
// the word basket will not be added due to the longest match option
HyphenationCompoundWordTokenFilter tf = new HyphenationCompoundWordTokenFilter(TEST_VERSION_CURRENT,
- new WhitespaceTokenizer(TEST_VERSION_CURRENT, new StringReader(
- "basketballkurv")), hyphenator, dict,
+ new MockTokenizer(new StringReader("basketballkurv"), MockTokenizer.WHITESPACE, false),
+ hyphenator, dict,
CompoundWordTokenFilterBase.DEFAULT_MIN_WORD_SIZE,
CompoundWordTokenFilterBase.DEFAULT_MIN_SUBWORD_SIZE, 40, true);
assertTokenStreamContents(tf,
@@ -77,7 +78,7 @@ public class TestCompoundWordTokenFilter
HyphenationCompoundWordTokenFilter tf = new HyphenationCompoundWordTokenFilter(
TEST_VERSION_CURRENT,
- new WhitespaceTokenizer(TEST_VERSION_CURRENT, new StringReader("basketballkurv")),
+ new MockTokenizer(new StringReader("basketballkurv"), MockTokenizer.WHITESPACE, false),
hyphenator,
CompoundWordTokenFilterBase.DEFAULT_MIN_WORD_SIZE,
2, 4);
@@ -89,7 +90,7 @@ public class TestCompoundWordTokenFilter
tf = new HyphenationCompoundWordTokenFilter(
TEST_VERSION_CURRENT,
- new WhitespaceTokenizer(TEST_VERSION_CURRENT, new StringReader("basketballkurv")),
+ new MockTokenizer(new StringReader("basketballkurv"), MockTokenizer.WHITESPACE, false),
hyphenator,
CompoundWordTokenFilterBase.DEFAULT_MIN_WORD_SIZE,
4, 6);
@@ -101,7 +102,7 @@ public class TestCompoundWordTokenFilter
tf = new HyphenationCompoundWordTokenFilter(
TEST_VERSION_CURRENT,
- new WhitespaceTokenizer(TEST_VERSION_CURRENT, new StringReader("basketballkurv")),
+ new MockTokenizer(new StringReader("basketballkurv"), MockTokenizer.WHITESPACE, false),
hyphenator,
CompoundWordTokenFilterBase.DEFAULT_MIN_WORD_SIZE,
4, 10);
@@ -120,9 +121,10 @@ public class TestCompoundWordTokenFilter
"Sko", "Vind", "Rute", "Torkare", "Blad" };
DictionaryCompoundWordTokenFilter tf = new DictionaryCompoundWordTokenFilter(TEST_VERSION_CURRENT,
- new WhitespaceTokenizer(TEST_VERSION_CURRENT,
+ new MockTokenizer(
new StringReader(
- "Bildörr Bilmotor Biltak Slagborr Hammarborr Pelarborr Glasögonfodral Basfiolsfodral Basfiolsfodralmakaregesäll Skomakare Vindrutetorkare Vindrutetorkarblad abba")),
+ "Bildörr Bilmotor Biltak Slagborr Hammarborr Pelarborr Glasögonfodral Basfiolsfodral Basfiolsfodralmakaregesäll Skomakare Vindrutetorkare Vindrutetorkarblad abba"),
+ MockTokenizer.WHITESPACE, false),
dict);
assertTokenStreamContents(tf, new String[] { "Bildörr", "Bil", "dörr", "Bilmotor",
@@ -149,7 +151,7 @@ public class TestCompoundWordTokenFilter
"Sko", "Vind", "Rute", "Torkare", "Blad", "Fiolsfodral" };
DictionaryCompoundWordTokenFilter tf = new DictionaryCompoundWordTokenFilter(TEST_VERSION_CURRENT,
- new WhitespaceTokenizer(TEST_VERSION_CURRENT, new StringReader("Basfiolsfodralmakaregesäll")),
+ new MockTokenizer(new StringReader("Basfiolsfodralmakaregesäll"), MockTokenizer.WHITESPACE, false),
dict, CompoundWordTokenFilterBase.DEFAULT_MIN_WORD_SIZE,
CompoundWordTokenFilterBase.DEFAULT_MIN_SUBWORD_SIZE,
CompoundWordTokenFilterBase.DEFAULT_MAX_SUBWORD_SIZE, true);
Modified: lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilter.java?rev=1126578&r1=1126577&r2=1126578&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilter.java (original)
+++ lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilter.java Mon May 23 16:49:59 2011
@@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.Set;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
+import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
@@ -36,36 +37,23 @@ public class TestStopFilter extends Base
public void testExactCase() throws IOException {
StringReader reader = new StringReader("Now is The Time");
Set<String> stopWords = asSet("is", "the", "Time");
- TokenStream stream = new StopFilter(TEST_VERSION_CURRENT, new WhitespaceTokenizer(TEST_VERSION_CURRENT, reader), stopWords, false);
- final CharTermAttribute termAtt = stream.getAttribute(CharTermAttribute.class);
- assertTrue(stream.incrementToken());
- assertEquals("Now", termAtt.toString());
- assertTrue(stream.incrementToken());
- assertEquals("The", termAtt.toString());
- assertFalse(stream.incrementToken());
+ TokenStream stream = new StopFilter(TEST_VERSION_CURRENT, new MockTokenizer(reader, MockTokenizer.WHITESPACE, false), stopWords, false);
+ assertTokenStreamContents(stream, new String[] { "Now", "The" });
}
public void testIgnoreCase() throws IOException {
StringReader reader = new StringReader("Now is The Time");
Set<String> stopWords = asSet( "is", "the", "Time" );
- TokenStream stream = new StopFilter(TEST_VERSION_CURRENT, new WhitespaceTokenizer(TEST_VERSION_CURRENT, reader), stopWords, true);
- final CharTermAttribute termAtt = stream.getAttribute(CharTermAttribute.class);
- assertTrue(stream.incrementToken());
- assertEquals("Now", termAtt.toString());
- assertFalse(stream.incrementToken());
+ TokenStream stream = new StopFilter(TEST_VERSION_CURRENT, new MockTokenizer(reader, MockTokenizer.WHITESPACE, false), stopWords, true);
+ assertTokenStreamContents(stream, new String[] { "Now" });
}
public void testStopFilt() throws IOException {
StringReader reader = new StringReader("Now is The Time");
String[] stopWords = new String[] { "is", "the", "Time" };
Set<Object> stopSet = StopFilter.makeStopSet(TEST_VERSION_CURRENT, stopWords);
- TokenStream stream = new StopFilter(TEST_VERSION_CURRENT, new WhitespaceTokenizer(TEST_VERSION_CURRENT, reader), stopSet);
- final CharTermAttribute termAtt = stream.getAttribute(CharTermAttribute.class);
- assertTrue(stream.incrementToken());
- assertEquals("Now", termAtt.toString());
- assertTrue(stream.incrementToken());
- assertEquals("The", termAtt.toString());
- assertFalse(stream.incrementToken());
+ TokenStream stream = new StopFilter(TEST_VERSION_CURRENT, new MockTokenizer(reader, MockTokenizer.WHITESPACE, false), stopSet);
+ assertTokenStreamContents(stream, new String[] { "Now", "The" });
}
/**
@@ -85,11 +73,11 @@ public class TestStopFilter extends Base
Set<Object> stopSet = StopFilter.makeStopSet(TEST_VERSION_CURRENT, stopWords);
// with increments
StringReader reader = new StringReader(sb.toString());
- StopFilter stpf = new StopFilter(Version.LUCENE_40, new WhitespaceTokenizer(TEST_VERSION_CURRENT, reader), stopSet);
+ StopFilter stpf = new StopFilter(Version.LUCENE_40, new MockTokenizer(reader, MockTokenizer.WHITESPACE, false), stopSet);
doTestStopPositons(stpf,true);
// without increments
reader = new StringReader(sb.toString());
- stpf = new StopFilter(TEST_VERSION_CURRENT, new WhitespaceTokenizer(TEST_VERSION_CURRENT, reader), stopSet);
+ stpf = new StopFilter(TEST_VERSION_CURRENT, new MockTokenizer(reader, MockTokenizer.WHITESPACE, false), stopSet);
doTestStopPositons(stpf,false);
// with increments, concatenating two stop filters
ArrayList<String> a0 = new ArrayList<String>();
@@ -108,7 +96,7 @@ public class TestStopFilter extends Base
Set<Object> stopSet0 = StopFilter.makeStopSet(TEST_VERSION_CURRENT, stopWords0);
Set<Object> stopSet1 = StopFilter.makeStopSet(TEST_VERSION_CURRENT, stopWords1);
reader = new StringReader(sb.toString());
- StopFilter stpf0 = new StopFilter(TEST_VERSION_CURRENT, new WhitespaceTokenizer(TEST_VERSION_CURRENT, reader), stopSet0); // first part of the set
+ StopFilter stpf0 = new StopFilter(TEST_VERSION_CURRENT, new MockTokenizer(reader, MockTokenizer.WHITESPACE, false), stopSet0); // first part of the set
stpf0.setEnablePositionIncrements(true);
StopFilter stpf01 = new StopFilter(TEST_VERSION_CURRENT, stpf0, stopSet1); // two stop filters concatenated!
doTestStopPositons(stpf01,true);
@@ -119,6 +107,7 @@ public class TestStopFilter extends Base
stpf.setEnablePositionIncrements(enableIcrements);
CharTermAttribute termAtt = stpf.getAttribute(CharTermAttribute.class);
PositionIncrementAttribute posIncrAtt = stpf.getAttribute(PositionIncrementAttribute.class);
+ stpf.reset();
for (int i=0; i<20; i+=3) {
assertTrue(stpf.incrementToken());
log("Token "+i+": "+stpf);
@@ -127,6 +116,8 @@ public class TestStopFilter extends Base
assertEquals("all but first token must have position increment of 3",enableIcrements?(i==0?1:3):1,posIncrAtt.getPositionIncrement());
}
assertFalse(stpf.incrementToken());
+ stpf.end();
+ stpf.close();
}
// print debug info depending on VERBOSE
Modified: lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java?rev=1126578&r1=1126577&r2=1126578&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java (original)
+++ lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java Mon May 23 16:49:59 2011
@@ -21,7 +21,7 @@ import java.io.IOException;
import java.io.StringReader;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
-import org.apache.lucene.analysis.core.WhitespaceTokenizer;
+import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter;
import org.apache.lucene.analysis.util.CharArraySet;
@@ -278,7 +278,7 @@ public class TestCzechStemmer extends Ba
CharArraySet set = new CharArraySet(TEST_VERSION_CURRENT, 1, true);
set.add("hole");
CzechStemFilter filter = new CzechStemFilter(new KeywordMarkerFilter(
- new WhitespaceTokenizer(TEST_VERSION_CURRENT, new StringReader("hole desek")), set));
+ new MockTokenizer(new StringReader("hole desek"), MockTokenizer.WHITESPACE, false), set));
assertTokenStreamContents(filter, new String[] { "hole", "desk" });
}