You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by bu...@apache.org on 2011/01/24 20:38:47 UTC
svn commit: r1062944 [1/4] - in /lucene/dev/branches/realtime_search: ./
dev-tools/eclipse/ dev-tools/idea/.idea/ dev-tools/idea/solr/contrib/uima/
dev-tools/maven/ dev-tools/maven/lucene/ dev-tools/maven/lucene/contrib/
dev-tools/maven/lucene/contrib/...
Author: buschmi
Date: Mon Jan 24 19:38:40 2011
New Revision: 1062944
URL: http://svn.apache.org/viewvc?rev=1062944&view=rev
Log:
Merging r1061975 through r1062931 into realtime branch
Added:
lucene/dev/branches/realtime_search/dev-tools/eclipse/lucene-codestyle.xml
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/eclipse/lucene-codestyle.xml
lucene/dev/branches/realtime_search/dev-tools/idea/solr/contrib/uima/
- copied from r1062931, lucene/dev/trunk/dev-tools/idea/solr/contrib/uima/
lucene/dev/branches/realtime_search/dev-tools/idea/solr/contrib/uima/uima.iml
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/idea/solr/contrib/uima/uima.iml
lucene/dev/branches/realtime_search/dev-tools/maven/lucene/contrib/ant/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/lucene/contrib/ant/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/lucene/contrib/db/bdb-je/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/lucene/contrib/db/bdb-je/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/lucene/contrib/db/bdb/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/lucene/contrib/db/bdb/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/lucene/contrib/db/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/lucene/contrib/db/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/lucene/contrib/demo/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/lucene/contrib/demo/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/lucene/contrib/instantiated/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/lucene/contrib/instantiated/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/lucene/contrib/lucli/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/lucene/contrib/lucli/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/lucene/contrib/memory/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/lucene/contrib/memory/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/lucene/contrib/misc/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/lucene/contrib/misc/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/lucene/contrib/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/lucene/contrib/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/lucene/contrib/queries/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/lucene/contrib/queries/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/lucene/contrib/queryparser/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/lucene/contrib/queryparser/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/lucene/contrib/spatial/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/lucene/contrib/spatial/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/lucene/contrib/spellchecker/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/lucene/contrib/spellchecker/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/lucene/contrib/swing/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/lucene/contrib/swing/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/lucene/contrib/wordnet/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/lucene/contrib/wordnet/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/lucene/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/lucene/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/lucene/src/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/lucene/src/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/modules/analysis/common/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/modules/analysis/common/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/modules/analysis/icu/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/modules/analysis/icu/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/modules/analysis/phonetic/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/modules/analysis/phonetic/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/modules/analysis/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/modules/analysis/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/modules/analysis/smartcn/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/modules/analysis/smartcn/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/modules/analysis/stempel/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/modules/analysis/stempel/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/modules/benchmark/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/modules/benchmark/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/modules/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/modules/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/solr/contrib/clustering/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/solr/contrib/clustering/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/solr/contrib/extraction/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/solr/contrib/extraction/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/solr/contrib/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/solr/contrib/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/solr/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/solr/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/solr/src/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/solr/src/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/solr/src/solrj/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/solr/src/solrj/pom.xml.template
lucene/dev/branches/realtime_search/dev-tools/maven/solr/src/webapp/pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/dev-tools/maven/solr/src/webapp/pom.xml.template
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/SimilarityProvider.java
- copied unchanged from r1062931, lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/SimilarityProvider.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestSimilarityProvider.java
- copied unchanged from r1062931, lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSimilarityProvider.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/spans/MultiSpansWrapper.java
- copied unchanged from r1062931, lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/MultiSpansWrapper.java
lucene/dev/branches/realtime_search/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WaitForMergesTask.java
- copied unchanged from r1062931, lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WaitForMergesTask.java
lucene/dev/branches/realtime_search/solr/contrib/uima/ (props changed)
- copied from r1062931, lucene/dev/trunk/solr/contrib/uima/
lucene/dev/branches/realtime_search/solr/contrib/uima/CHANGES.txt
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/CHANGES.txt
lucene/dev/branches/realtime_search/solr/contrib/uima/README.txt
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/README.txt
lucene/dev/branches/realtime_search/solr/contrib/uima/build.xml
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/build.xml
lucene/dev/branches/realtime_search/solr/contrib/uima/lib/
- copied from r1062931, lucene/dev/trunk/solr/contrib/uima/lib/
lucene/dev/branches/realtime_search/solr/contrib/uima/lib/commons-digester-2.0.jar
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/lib/commons-digester-2.0.jar
lucene/dev/branches/realtime_search/solr/contrib/uima/lib/commons-lang-2.4.jar
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/lib/commons-lang-2.4.jar
lucene/dev/branches/realtime_search/solr/contrib/uima/lib/uima-an-alchemy.jar
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/lib/uima-an-alchemy.jar
lucene/dev/branches/realtime_search/solr/contrib/uima/lib/uima-an-calais.jar
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/lib/uima-an-calais.jar
lucene/dev/branches/realtime_search/solr/contrib/uima/lib/uima-an-tagger.jar
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/lib/uima-an-tagger.jar
lucene/dev/branches/realtime_search/solr/contrib/uima/lib/uima-an-wst.jar
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/lib/uima-an-wst.jar
lucene/dev/branches/realtime_search/solr/contrib/uima/lib/uima-core.jar
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/lib/uima-core.jar
lucene/dev/branches/realtime_search/solr/contrib/uima/solr-uima-pom.xml.template
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/solr-uima-pom.xml.template
lucene/dev/branches/realtime_search/solr/contrib/uima/src/
- copied from r1062931, lucene/dev/trunk/solr/contrib/uima/src/
lucene/dev/branches/realtime_search/solr/contrib/uima/src/main/
- copied from r1062931, lucene/dev/trunk/solr/contrib/uima/src/main/
lucene/dev/branches/realtime_search/solr/contrib/uima/src/main/java/
- copied from r1062931, lucene/dev/trunk/solr/contrib/uima/src/main/java/
lucene/dev/branches/realtime_search/solr/contrib/uima/src/main/java/org/
- copied from r1062931, lucene/dev/trunk/solr/contrib/uima/src/main/java/org/
lucene/dev/branches/realtime_search/solr/contrib/uima/src/main/java/org/apache/
- copied from r1062931, lucene/dev/trunk/solr/contrib/uima/src/main/java/org/apache/
lucene/dev/branches/realtime_search/solr/contrib/uima/src/main/java/org/apache/solr/
- copied from r1062931, lucene/dev/trunk/solr/contrib/uima/src/main/java/org/apache/solr/
lucene/dev/branches/realtime_search/solr/contrib/uima/src/main/java/org/apache/solr/uima/
- copied from r1062931, lucene/dev/trunk/solr/contrib/uima/src/main/java/org/apache/solr/uima/
lucene/dev/branches/realtime_search/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/
- copied from r1062931, lucene/dev/trunk/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/
lucene/dev/branches/realtime_search/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/SolrUIMAConfiguration.java
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/SolrUIMAConfiguration.java
lucene/dev/branches/realtime_search/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/SolrUIMAConfigurationReader.java
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/SolrUIMAConfigurationReader.java
lucene/dev/branches/realtime_search/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java
lucene/dev/branches/realtime_search/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java
lucene/dev/branches/realtime_search/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorFactory.java
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorFactory.java
lucene/dev/branches/realtime_search/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/ae/
- copied from r1062931, lucene/dev/trunk/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/ae/
lucene/dev/branches/realtime_search/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/ae/AEProvider.java
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/ae/AEProvider.java
lucene/dev/branches/realtime_search/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/ae/AEProviderFactory.java
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/ae/AEProviderFactory.java
lucene/dev/branches/realtime_search/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/ae/OverridingParamsAEProvider.java
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/ae/OverridingParamsAEProvider.java
lucene/dev/branches/realtime_search/solr/contrib/uima/src/main/resources/
- copied from r1062931, lucene/dev/trunk/solr/contrib/uima/src/main/resources/
lucene/dev/branches/realtime_search/solr/contrib/uima/src/main/resources/org/
- copied from r1062931, lucene/dev/trunk/solr/contrib/uima/src/main/resources/org/
lucene/dev/branches/realtime_search/solr/contrib/uima/src/main/resources/org/apache/
- copied from r1062931, lucene/dev/trunk/solr/contrib/uima/src/main/resources/org/apache/
lucene/dev/branches/realtime_search/solr/contrib/uima/src/main/resources/org/apache/uima/
- copied from r1062931, lucene/dev/trunk/solr/contrib/uima/src/main/resources/org/apache/uima/
lucene/dev/branches/realtime_search/solr/contrib/uima/src/main/resources/org/apache/uima/desc/
- copied from r1062931, lucene/dev/trunk/solr/contrib/uima/src/main/resources/org/apache/uima/desc/
lucene/dev/branches/realtime_search/solr/contrib/uima/src/main/resources/org/apache/uima/desc/AggregateSentenceAE.xml
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/src/main/resources/org/apache/uima/desc/AggregateSentenceAE.xml
lucene/dev/branches/realtime_search/solr/contrib/uima/src/main/resources/org/apache/uima/desc/ExtServicesAE.xml
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/src/main/resources/org/apache/uima/desc/ExtServicesAE.xml
lucene/dev/branches/realtime_search/solr/contrib/uima/src/main/resources/org/apache/uima/desc/HmmTagger.xml
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/src/main/resources/org/apache/uima/desc/HmmTagger.xml
lucene/dev/branches/realtime_search/solr/contrib/uima/src/main/resources/org/apache/uima/desc/OpenCalaisAnnotator.xml
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/src/main/resources/org/apache/uima/desc/OpenCalaisAnnotator.xml
lucene/dev/branches/realtime_search/solr/contrib/uima/src/main/resources/org/apache/uima/desc/OverridingParamsExtServicesAE.xml
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/src/main/resources/org/apache/uima/desc/OverridingParamsExtServicesAE.xml
lucene/dev/branches/realtime_search/solr/contrib/uima/src/main/resources/org/apache/uima/desc/TextCategorizationAEDescriptor.xml
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/src/main/resources/org/apache/uima/desc/TextCategorizationAEDescriptor.xml
lucene/dev/branches/realtime_search/solr/contrib/uima/src/main/resources/org/apache/uima/desc/TextConceptTaggingAEDescriptor.xml
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/src/main/resources/org/apache/uima/desc/TextConceptTaggingAEDescriptor.xml
lucene/dev/branches/realtime_search/solr/contrib/uima/src/main/resources/org/apache/uima/desc/TextKeywordExtractionAEDescriptor.xml
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/src/main/resources/org/apache/uima/desc/TextKeywordExtractionAEDescriptor.xml
lucene/dev/branches/realtime_search/solr/contrib/uima/src/main/resources/org/apache/uima/desc/TextLanguageDetectionAEDescriptor.xml
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/src/main/resources/org/apache/uima/desc/TextLanguageDetectionAEDescriptor.xml
lucene/dev/branches/realtime_search/solr/contrib/uima/src/main/resources/org/apache/uima/desc/TextRankedEntityExtractionAEDescriptor.xml
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/src/main/resources/org/apache/uima/desc/TextRankedEntityExtractionAEDescriptor.xml
lucene/dev/branches/realtime_search/solr/contrib/uima/src/main/resources/org/apache/uima/desc/WhitespaceTokenizer.xml
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/src/main/resources/org/apache/uima/desc/WhitespaceTokenizer.xml
lucene/dev/branches/realtime_search/solr/contrib/uima/src/main/resources/org/apache/uima/desc/baseAlchemyTypeSystemDescriptor.xml
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/src/main/resources/org/apache/uima/desc/baseAlchemyTypeSystemDescriptor.xml
lucene/dev/branches/realtime_search/solr/contrib/uima/src/main/resources/solr/
- copied from r1062931, lucene/dev/trunk/solr/contrib/uima/src/main/resources/solr/
lucene/dev/branches/realtime_search/solr/contrib/uima/src/main/resources/solr/conf/
- copied from r1062931, lucene/dev/trunk/solr/contrib/uima/src/main/resources/solr/conf/
lucene/dev/branches/realtime_search/solr/contrib/uima/src/main/resources/solr/conf/aggregate-uima-config.xml
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/src/main/resources/solr/conf/aggregate-uima-config.xml
lucene/dev/branches/realtime_search/solr/contrib/uima/src/main/resources/solr/conf/uima-fields.xml
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/src/main/resources/solr/conf/uima-fields.xml
lucene/dev/branches/realtime_search/solr/contrib/uima/src/test/
- copied from r1062931, lucene/dev/trunk/solr/contrib/uima/src/test/
lucene/dev/branches/realtime_search/solr/contrib/uima/src/test/java/
- copied from r1062931, lucene/dev/trunk/solr/contrib/uima/src/test/java/
lucene/dev/branches/realtime_search/solr/contrib/uima/src/test/java/org/
- copied from r1062931, lucene/dev/trunk/solr/contrib/uima/src/test/java/org/
lucene/dev/branches/realtime_search/solr/contrib/uima/src/test/java/org/apache/
- copied from r1062931, lucene/dev/trunk/solr/contrib/uima/src/test/java/org/apache/
lucene/dev/branches/realtime_search/solr/contrib/uima/src/test/java/org/apache/solr/
- copied from r1062931, lucene/dev/trunk/solr/contrib/uima/src/test/java/org/apache/solr/
lucene/dev/branches/realtime_search/solr/contrib/uima/src/test/java/org/apache/solr/uima/
- copied from r1062931, lucene/dev/trunk/solr/contrib/uima/src/test/java/org/apache/solr/uima/
lucene/dev/branches/realtime_search/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/
- copied from r1062931, lucene/dev/trunk/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/
lucene/dev/branches/realtime_search/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java
lucene/dev/branches/realtime_search/solr/contrib/uima/src/test/resources/
- copied from r1062931, lucene/dev/trunk/solr/contrib/uima/src/test/resources/
lucene/dev/branches/realtime_search/solr/contrib/uima/src/test/resources/solr-uima/
- copied from r1062931, lucene/dev/trunk/solr/contrib/uima/src/test/resources/solr-uima/
lucene/dev/branches/realtime_search/solr/contrib/uima/src/test/resources/solr-uima/conf/
- copied from r1062931, lucene/dev/trunk/solr/contrib/uima/src/test/resources/solr-uima/conf/
lucene/dev/branches/realtime_search/solr/contrib/uima/src/test/resources/solr-uima/conf/protwords.txt
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/src/test/resources/solr-uima/conf/protwords.txt
lucene/dev/branches/realtime_search/solr/contrib/uima/src/test/resources/solr-uima/conf/schema.xml
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/src/test/resources/solr-uima/conf/schema.xml
lucene/dev/branches/realtime_search/solr/contrib/uima/src/test/resources/solr-uima/conf/solrconfig.xml
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/src/test/resources/solr-uima/conf/solrconfig.xml
lucene/dev/branches/realtime_search/solr/contrib/uima/src/test/resources/solr-uima/conf/spellings.txt
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/src/test/resources/solr-uima/conf/spellings.txt
lucene/dev/branches/realtime_search/solr/contrib/uima/src/test/resources/solr-uima/conf/stopwords.txt
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/src/test/resources/solr-uima/conf/stopwords.txt
lucene/dev/branches/realtime_search/solr/contrib/uima/src/test/resources/solr-uima/conf/synonyms.txt
- copied unchanged from r1062931, lucene/dev/trunk/solr/contrib/uima/src/test/resources/solr-uima/conf/synonyms.txt
Modified:
lucene/dev/branches/realtime_search/ (props changed)
lucene/dev/branches/realtime_search/build.xml
lucene/dev/branches/realtime_search/dev-tools/eclipse/dot.classpath
lucene/dev/branches/realtime_search/dev-tools/idea/.idea/ant.xml
lucene/dev/branches/realtime_search/dev-tools/idea/.idea/modules.xml
lucene/dev/branches/realtime_search/dev-tools/idea/.idea/workspace.xml
lucene/dev/branches/realtime_search/lucene/ (props changed)
lucene/dev/branches/realtime_search/lucene/CHANGES.txt
lucene/dev/branches/realtime_search/lucene/MIGRATE.txt
lucene/dev/branches/realtime_search/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
lucene/dev/branches/realtime_search/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexWriter.java
lucene/dev/branches/realtime_search/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
lucene/dev/branches/realtime_search/lucene/contrib/misc/src/java/org/apache/lucene/index/FieldNormModifier.java
lucene/dev/branches/realtime_search/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java
lucene/dev/branches/realtime_search/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java
lucene/dev/branches/realtime_search/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/StandardBooleanQueryNodeBuilder.java
lucene/dev/branches/realtime_search/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/StandardBooleanQueryNode.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/CompoundFileWriter.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/FieldsReader.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/IndexFormatTooOldException.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/IndexWriter.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/IndexWriterConfig.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/LogMergePolicy.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/MergePolicy.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/NormsWriterPerField.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/SegmentDeletes.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/SegmentInfo.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/SegmentMerger.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/SegmentReader.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/codecs/BlockTermsReader.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/codecs/DefaultSegmentInfosReader.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/codecs/DefaultSegmentInfosWriter.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/codecs/MergeState.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/codecs/MultiLevelSkipListReader.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/codecs/TermsConsumer.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/codecs/standard/StandardPostingsReader.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/BooleanQuery.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/CachingSpanFilter.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/DefaultSimilarity.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/IndexSearcher.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/MatchAllDocsQuery.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/MultiPhraseQuery.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/PhraseQuery.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/Query.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/Similarity.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/SpanFilter.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/SpanQueryFilter.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/TermQuery.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/Weight.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/payloads/PayloadSpanUtil.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/spans/FieldMaskingSpanQuery.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/spans/SpanFirstQuery.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/spans/SpanMultiTermQueryWrapper.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/spans/SpanNearQuery.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/spans/SpanNotQuery.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/spans/SpanOrQuery.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/spans/SpanPositionCheckQuery.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/spans/SpanQuery.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/spans/SpanTermQuery.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/spans/SpanWeight.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/spans/Spans.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/util/Constants.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/index/DocHelper.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/index/TestDeletionPolicy.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/index/TestIndexFileDeleter.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/index/TestIndexReader.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/index/TestIndexReaderClone.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/index/TestIndexReaderCloneNorms.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/index/TestIndexReaderReopen.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/index/TestIndexWriterConfig.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/index/TestMaxTermFrequency.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/index/TestNRTThreads.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/index/TestNorms.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/index/TestOmitTf.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/index/TestParallelReader.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/index/index.31.cfs.zip
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/index/index.31.nocfs.zip
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/JustCompileSearch.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/QueryUtils.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestBoolean2.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestComplexExplanations.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestConstantScoreQuery.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestPositionIncrement.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestSetNorm.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestSimilarity.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestSpanQueryFilter.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/payloads/PayloadHelper.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/spans/JustCompileSearchSpans.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java
lucene/dev/branches/realtime_search/modules/ (props changed)
lucene/dev/branches/realtime_search/modules/analysis/common/build.xml
lucene/dev/branches/realtime_search/modules/analysis/smartcn/build.xml
lucene/dev/branches/realtime_search/modules/analysis/stempel/build.xml
lucene/dev/branches/realtime_search/modules/benchmark/CHANGES.txt
lucene/dev/branches/realtime_search/modules/benchmark/build.xml
lucene/dev/branches/realtime_search/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
lucene/dev/branches/realtime_search/modules/build.xml
lucene/dev/branches/realtime_search/solr/ (props changed)
lucene/dev/branches/realtime_search/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/realtime_search/solr/KEYS (props changed)
lucene/dev/branches/realtime_search/solr/LICENSE.txt (props changed)
lucene/dev/branches/realtime_search/solr/NOTICE.txt (props changed)
lucene/dev/branches/realtime_search/solr/README.txt (props changed)
lucene/dev/branches/realtime_search/solr/build.xml (contents, props changed)
lucene/dev/branches/realtime_search/solr/client/ (props changed)
lucene/dev/branches/realtime_search/solr/common-build.xml (contents, props changed)
lucene/dev/branches/realtime_search/solr/contrib/ (props changed)
lucene/dev/branches/realtime_search/solr/contrib/dataimporthandler/CHANGES.txt
lucene/dev/branches/realtime_search/solr/example/ (props changed)
lucene/dev/branches/realtime_search/solr/example/example-DIH/solr/db/conf/ (props changed)
lucene/dev/branches/realtime_search/solr/example/example-DIH/solr/db/conf/solrconfig.xml
lucene/dev/branches/realtime_search/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
lucene/dev/branches/realtime_search/solr/example/example-DIH/solr/rss/conf/rss-data-config.xml
lucene/dev/branches/realtime_search/solr/example/example-DIH/solr/rss/conf/schema.xml
lucene/dev/branches/realtime_search/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
lucene/dev/branches/realtime_search/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
lucene/dev/branches/realtime_search/solr/lib/ (props changed)
lucene/dev/branches/realtime_search/solr/site/ (props changed)
lucene/dev/branches/realtime_search/solr/src/ (props changed)
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/core/CoreContainer.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/schema/IndexSchema.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/schema/SimilarityFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/SolrConstantScoreQuery.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/IDFValueSource.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/NormValueSource.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/TFValueSource.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/update/SolrIndexConfig.java
lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/schema/CustomSimilarityFactory.java
lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/schema/IndexSchemaTest.java
lucene/dev/branches/realtime_search/solr/testlogging.properties (props changed)
Modified: lucene/dev/branches/realtime_search/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/build.xml?rev=1062944&r1=1062943&r2=1062944&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/build.xml (original)
+++ lucene/dev/branches/realtime_search/build.xml Mon Jan 24 19:38:40 2011
@@ -38,6 +38,18 @@
</sequential>
</target>
+ <property name="version" value="4.0-SNAPSHOT"/>
+ <target name="get-maven-poms"
+ description="Copy Maven POMs from dev-tools/maven/ to their target locations">
+ <copy todir=".">
+ <fileset dir="${basedir}/dev-tools/maven"/>
+ <filterset begintoken="@" endtoken="@">
+ <filter token="version" value="${version}"/>
+ </filterset>
+ <globmapper from="*.template" to="*"/>
+ </copy>
+ </target>
+
<target name="generate-maven-artifacts" description="Generate Maven Artifacts for Lucene and Solr">
<property name="maven.dist.dir" location="dist/maven" />
<mkdir dir="${maven.dist.dir}" />
@@ -67,6 +79,7 @@
</subant>
<echo>
SUCCESS: You must right-click your project and choose Refresh
+ Please note, your project must use a Java 6 JRE
</echo>
</target>
@@ -76,9 +89,9 @@
<property environment="env"/>
<target name="idea" depends="copy-idea-files,finish-idea-setup-windows,
finish-idea-setup-mac,
- finish-idea-setup-unix"/>
- <target name="copy-idea-files"
- description="Setup IntelliJ IDEA configuration files">
+ finish-idea-setup-unix"
+ description="Setup IntelliJ IDEA configuration files"/>
+ <target name="copy-idea-files">
<copy todir=".">
<fileset dir="dev-tools/idea">
<exclude name="Intellij-Lucene-Codestyle.xml"/>
Modified: lucene/dev/branches/realtime_search/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/dev-tools/eclipse/dot.classpath?rev=1062944&r1=1062943&r2=1062944&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/realtime_search/dev-tools/eclipse/dot.classpath Mon Jan 24 19:38:40 2011
@@ -75,6 +75,10 @@
<classpathentry kind="src" path="solr/contrib/extraction/src/main/java"/>
<classpathentry kind="src" path="solr/contrib/extraction/src/test/java"/>
<classpathentry kind="src" path="solr/contrib/extraction/src/test/resources"/>
+ <classpathentry kind="src" path="solr/contrib/uima/src/main/java"/>
+ <classpathentry kind="src" path="solr/contrib/uima/src/main/resources"/>
+ <classpathentry kind="src" path="solr/contrib/uima/src/test/java"/>
+ <classpathentry kind="src" path="solr/contrib/uima/src/test/resources"/>
<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"/>
@@ -153,6 +157,12 @@
<classpathentry kind="lib" path="solr/contrib/extraction/lib/tika-core-0.8.jar"/>
<classpathentry kind="lib" path="solr/contrib/extraction/lib/tika-parsers-0.8.jar"/>
<classpathentry kind="lib" path="solr/contrib/extraction/lib/xmlbeans-2.3.0.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/uima/lib/commons-digester-2.0.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/uima/lib/uima-an-alchemy.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/uima/lib/uima-an-calais.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/uima/lib/uima-an-tagger.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/uima/lib/uima-an-wst.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/uima/lib/uima-core.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: lucene/dev/branches/realtime_search/dev-tools/idea/.idea/ant.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/dev-tools/idea/.idea/ant.xml?rev=1062944&r1=1062943&r2=1062944&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/dev-tools/idea/.idea/ant.xml (original)
+++ lucene/dev/branches/realtime_search/dev-tools/idea/.idea/ant.xml Mon Jan 24 19:38:40 2011
@@ -32,5 +32,6 @@
<buildFile url="file://$PROJECT_DIR$/solr/contrib/clustering/build.xml" />
<buildFile url="file://$PROJECT_DIR$/solr/contrib/dataimporthandler/build.xml" />
<buildFile url="file://$PROJECT_DIR$/solr/contrib/extraction/build.xml" />
+ <buildFile url="file://$PROJECT_DIR$/solr/contrib/uima/build.xml" />
</component>
</project>
Modified: lucene/dev/branches/realtime_search/dev-tools/idea/.idea/modules.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/dev-tools/idea/.idea/modules.xml?rev=1062944&r1=1062943&r2=1062944&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/dev-tools/idea/.idea/modules.xml (original)
+++ lucene/dev/branches/realtime_search/dev-tools/idea/.idea/modules.xml Mon Jan 24 19:38:40 2011
@@ -33,6 +33,7 @@
<module filepath="$PROJECT_DIR$/lucene/contrib/swing/swing.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/wordnet/wordnet.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/xml-query-parser/xml-query-parser.iml" />
+ <module filepath="$PROJECT_DIR$/solr/contrib/uima/uima.iml" />
</modules>
</component>
</project>
Modified: lucene/dev/branches/realtime_search/dev-tools/idea/.idea/workspace.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/dev-tools/idea/.idea/workspace.xml?rev=1062944&r1=1062943&r2=1062944&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/dev-tools/idea/.idea/workspace.xml (original)
+++ lucene/dev/branches/realtime_search/dev-tools/idea/.idea/workspace.xml Mon Jan 24 19:38:40 2011
@@ -29,10 +29,10 @@
<option name="VM_PARAMETERS" value="-ea -DtempDir=bdb-je-temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
- <configuration default="false" name="benchmark contrib" type="JUnit" factoryName="JUnit">
+ <configuration default="false" name="benchmark module" type="JUnit" factoryName="JUnit">
<module name="benchmark" />
<option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/benchmark" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/modules/benchmark/build" />
<option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
@@ -92,7 +92,7 @@
<option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
- <configuration default="false" name="lucene" type="JUnit" factoryName="JUnit">
+ <configuration default="true" name="lucene" type="JUnit" factoryName="JUnit">
<module name="lucene" />
<option name="TEST_OBJECT" value="package" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build" />
@@ -141,13 +141,6 @@
<option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
- <configuration default="false" name="remote contrib" type="JUnit" factoryName="JUnit">
- <module name="remote" />
- <option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/remote" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
- <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
- </configuration>
<configuration default="false" name="smartcn analysis module" type="JUnit" factoryName="JUnit">
<module name="smartcn" />
<option name="TEST_OBJECT" value="package" />
@@ -190,6 +183,13 @@
<option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
+ <configuration default="false" name="uima contrib" type="JUnit" factoryName="JUnit">
+ <module name="uima" />
+ <option name="TEST_OBJECT" value="package" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/contrib/uima/build" />
+ <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.0 -DtempDir=temp" />
+ <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
+ </configuration>
<configuration default="false" name="wordnet contrib" type="JUnit" factoryName="JUnit">
<module name="wordnet" />
<option name="TEST_OBJECT" value="package" />
@@ -209,7 +209,7 @@
<item index="1" class="java.lang.String" itemvalue="JUnit.ant contrib" />
<item index="2" class="java.lang.String" itemvalue="JUnit.bdb contrib" />
<item index="3" class="java.lang.String" itemvalue="JUnit.bdb-je contrib" />
- <item index="4" class="java.lang.String" itemvalue="JUnit.benchmark contrib" />
+ <item index="4" class="java.lang.String" itemvalue="JUnit.benchmark module" />
<item index="5" class="java.lang.String" itemvalue="JUnit.clustering contrib" />
<item index="6" class="java.lang.String" itemvalue="JUnit.common analysis module" />
<item index="7" class="java.lang.String" itemvalue="JUnit.dataimporthandler contrib" />
@@ -225,13 +225,13 @@
<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.remote 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="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" />
</list>
Modified: lucene/dev/branches/realtime_search/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/lucene/CHANGES.txt?rev=1062944&r1=1062943&r2=1062944&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/realtime_search/lucene/CHANGES.txt Mon Jan 24 19:38:40 2011
@@ -127,6 +127,12 @@ Changes in backwards compatibility polic
* LUCENE-2865: Weight#scorer(AtomicReaderContext, boolean, boolean) now accepts
a ScorerContext struct instead of booleans.(Simon Willnauer)
+
+* LUCENE-2882: Cut over SpanQuery#getSpans to AtomicReaderContext to enforce
+ per segment semantics on SpanQuery & Spans. (Simon Willnauer)
+
+* LUCENE-2236: Similarity can now be configured on a per-field basis. See the
+ migration notes in MIGRATE.txt for more details. (Robert Muir, Doron Cohen)
Changes in Runtime Behavior
@@ -140,6 +146,9 @@ Changes in Runtime Behavior
documents that don't have the field get a norm byte value of 0. Previously, Lucene
would populate "fake norms" with Similarity.getDefault() for these documents.
(Robert Muir, Mike Mccandless)
+
+* LUCENE-2720: IndexWriter throws IndexFormatTooOldException on open, rather
+ than later when e.g. a merge starts. (Shai Erera, Mike McCandless, Uwe Schindler)
API Changes
@@ -673,6 +682,19 @@ Bug fixes
* LUCENE-2860: Fixed SegmentInfo.sizeInBytes to factor includeDocStores when it
decides whether to return the cached computed size or not. (Shai Erera)
+* LUCENE-2584: SegmentInfo.files() could hit ConcurrentModificationException if
+ called by multiple threads. (Alexander Kanarsky via Shai Erera)
+
+* LUCENE-2809: Fixed IndexWriter.numDocs to take into account
+ applied but not yet flushed deletes. (Mike McCandless)
+
+* LUCENE-2879: MultiPhraseQuery previously calculated its phrase IDF by summing
+ internally, it now calls Similarity.idfExplain(Collection, IndexSearcher).
+ (Robert Muir)
+
+* LUCENE-2693: RAM used by IndexWriter was slightly incorrectly computed.
+ (Jason Rutherglen via Shai Erera)
+
New features
* LUCENE-2128: Parallelized fetching document frequencies during weight
Modified: lucene/dev/branches/realtime_search/lucene/MIGRATE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/lucene/MIGRATE.txt?rev=1062944&r1=1062943&r2=1062944&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/lucene/MIGRATE.txt (original)
+++ lucene/dev/branches/realtime_search/lucene/MIGRATE.txt Mon Jan 24 19:38:40 2011
@@ -331,3 +331,9 @@ LUCENE-1458, LUCENE-2111: Flexible Index
toString() is no longer implemented by AttributeImpl, so if you have overridden
toString(), port your customization over to reflectWith(). reflectAsString() would
then return what toString() did before.
+
+* LUCENE-2236: DefaultSimilarity can no longer be set statically (and dangerously) for the entire JVM.
+ Instead, IndexWriterConfig and IndexSearcher now take a SimilarityProvider.
+ Similarity can now be configured on a per-field basis.
+ Similarity retains only the field-specific relevance methods such as tf() and idf().
+ Methods that apply to the entire query such as coord() and queryNorm() exist in SimilarityProvider.
Modified: lucene/dev/branches/realtime_search/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java?rev=1062944&r1=1062943&r2=1062944&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java (original)
+++ lucene/dev/branches/realtime_search/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java Mon Jan 24 19:38:40 2011
@@ -30,6 +30,7 @@ import org.apache.lucene.analysis.Cachin
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
+import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.index.memory.MemoryIndex;
import org.apache.lucene.search.*;
import org.apache.lucene.search.spans.FieldMaskingSpanQuery;
@@ -50,7 +51,7 @@ public class WeightedSpanTermExtractor {
private String fieldName;
private TokenStream tokenStream;
- private Map<String,IndexReader> readers = new HashMap<String,IndexReader>(10);
+ private Map<String,AtomicReaderContext> readers = new HashMap<String,AtomicReaderContext>(10);
private String defaultField;
private boolean expandMultiTermQuery;
private boolean cachedTokenStream;
@@ -66,11 +67,11 @@ public class WeightedSpanTermExtractor {
}
private void closeReaders() {
- Collection<IndexReader> readerSet = readers.values();
+ Collection<AtomicReaderContext> ctxSet = readers.values();
- for (final IndexReader reader : readerSet) {
+ for (final AtomicReaderContext ctx : ctxSet) {
try {
- reader.close();
+ ctx.reader.close();
} catch (IOException e) {
// alert?
}
@@ -149,7 +150,7 @@ public class WeightedSpanTermExtractor {
query = mtq;
}
if (mtq.getField() != null) {
- IndexReader ir = getReaderForField(mtq.getField());
+ IndexReader ir = getLeafContextForField(mtq.getField()).reader;
extract(query.rewrite(ir), terms);
}
} else if (query instanceof MultiPhraseQuery) {
@@ -234,7 +235,7 @@ public class WeightedSpanTermExtractor {
final boolean mustRewriteQuery = mustRewriteQuery(spanQuery);
if (mustRewriteQuery) {
for (final String field : fieldNames) {
- final SpanQuery rewrittenQuery = (SpanQuery) spanQuery.rewrite(getReaderForField(field));
+ final SpanQuery rewrittenQuery = (SpanQuery) spanQuery.rewrite(getLeafContextForField(field).reader);
queries.put(field, rewrittenQuery);
rewrittenQuery.extractTerms(nonWeightedTerms);
}
@@ -246,12 +247,12 @@ public class WeightedSpanTermExtractor {
for (final String field : fieldNames) {
- IndexReader reader = getReaderForField(field);
+ AtomicReaderContext context = getLeafContextForField(field);
final Spans spans;
if (mustRewriteQuery) {
- spans = queries.get(field).getSpans(reader);
+ spans = queries.get(field).getSpans(context);
} else {
- spans = spanQuery.getSpans(reader);
+ spans = spanQuery.getSpans(context);
}
@@ -317,22 +318,23 @@ public class WeightedSpanTermExtractor {
return rv;
}
- private IndexReader getReaderForField(String field) throws IOException {
+ private AtomicReaderContext getLeafContextForField(String field) throws IOException {
if(wrapToCaching && !cachedTokenStream && !(tokenStream instanceof CachingTokenFilter)) {
tokenStream = new CachingTokenFilter(tokenStream);
cachedTokenStream = true;
}
- IndexReader reader = readers.get(field);
- if (reader == null) {
+ AtomicReaderContext context = readers.get(field);
+ if (context == null) {
MemoryIndex indexer = new MemoryIndex();
indexer.addField(field, tokenStream);
tokenStream.reset();
IndexSearcher searcher = indexer.createSearcher();
- reader = searcher.getIndexReader();
- readers.put(field, reader);
+ // MEM index has only atomic ctx
+ context = (AtomicReaderContext) searcher.getTopReaderContext();
+ readers.put(field, context);
}
- return reader;
+ return context;
}
/**
Modified: lucene/dev/branches/realtime_search/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexWriter.java?rev=1062944&r1=1062943&r2=1062944&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexWriter.java (original)
+++ lucene/dev/branches/realtime_search/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexWriter.java Mon Jan 24 19:38:40 2011
@@ -42,7 +42,8 @@ import org.apache.lucene.index.FieldInve
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermVectorOffsetInfo;
-import org.apache.lucene.search.Similarity;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.SimilarityProvider;
import org.apache.lucene.util.StringHelper;
import org.apache.lucene.util.ArrayUtil;
import org.apache.lucene.util.CollectionUtil;
@@ -67,7 +68,7 @@ public class InstantiatedIndexWriter imp
private final InstantiatedIndex index;
private final Analyzer analyzer;
- private Similarity similarity = Similarity.getDefault(); // how to normalize;
+ private SimilarityProvider similarityProvider = IndexSearcher.getDefaultSimilarityProvider(); // how to normalize;
private transient Set<String> fieldNameBuffer;
/**
@@ -236,11 +237,12 @@ public class InstantiatedIndexWriter imp
termsInDocument += eFieldTermDocInfoFactoriesByTermText.getValue().size();
if (eFieldTermDocInfoFactoriesByTermText.getKey().indexed && !eFieldTermDocInfoFactoriesByTermText.getKey().omitNorms) {
+ final String fieldName = eFieldTermDocInfoFactoriesByTermText.getKey().fieldName;
final FieldInvertState invertState = new FieldInvertState();
invertState.setBoost(eFieldTermDocInfoFactoriesByTermText.getKey().boost * document.getDocument().getBoost());
invertState.setLength(eFieldTermDocInfoFactoriesByTermText.getKey().fieldLength);
- final float norm = similarity.computeNorm(eFieldTermDocInfoFactoriesByTermText.getKey().fieldName, invertState);
- normsByFieldNameAndDocumentNumber.get(eFieldTermDocInfoFactoriesByTermText.getKey().fieldName)[document.getDocumentNumber()] = similarity.encodeNormValue(norm);
+ final float norm = similarityProvider.get(fieldName).computeNorm(fieldName, invertState);
+ normsByFieldNameAndDocumentNumber.get(fieldName)[document.getDocumentNumber()] = similarityProvider.get(fieldName).encodeNormValue(norm);
} else {
System.currentTimeMillis();
}
@@ -659,12 +661,12 @@ public class InstantiatedIndexWriter imp
addDocument(doc, analyzer);
}
- public Similarity getSimilarity() {
- return similarity;
+ public SimilarityProvider getSimilarityProvider() {
+ return similarityProvider;
}
- public void setSimilarity(Similarity similarity) {
- this.similarity = similarity;
+ public void setSimilarityProvider(SimilarityProvider similarityProvider) {
+ this.similarityProvider = similarityProvider;
}
public Analyzer getAnalyzer() {
Modified: lucene/dev/branches/realtime_search/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java?rev=1062944&r1=1062943&r2=1062944&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java (original)
+++ lucene/dev/branches/realtime_search/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java Mon Jan 24 19:38:40 2011
@@ -57,6 +57,7 @@ import org.apache.lucene.search.IndexSea
import org.apache.lucene.search.Query;
import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.Similarity;
+import org.apache.lucene.search.SimilarityProvider;
import org.apache.lucene.store.RAMDirectory; // for javadocs
import org.apache.lucene.util.ArrayUtil;
import org.apache.lucene.util.BytesRef;
@@ -1169,9 +1170,9 @@ public class MemoryIndex implements Seri
};
}
- private Similarity getSimilarity() {
- if (searcher != null) return searcher.getSimilarity();
- return Similarity.getDefault();
+ private SimilarityProvider getSimilarityProvider() {
+ if (searcher != null) return searcher.getSimilarityProvider();
+ return IndexSearcher.getDefaultSimilarityProvider();
}
private void setSearcher(IndexSearcher searcher) {
@@ -1181,20 +1182,21 @@ public class MemoryIndex implements Seri
/** performance hack: cache norms to avoid repeated expensive calculations */
private byte[] cachedNorms;
private String cachedFieldName;
- private Similarity cachedSimilarity;
+ private SimilarityProvider cachedSimilarity;
@Override
public byte[] norms(String fieldName) {
byte[] norms = cachedNorms;
- Similarity sim = getSimilarity();
+ SimilarityProvider sim = getSimilarityProvider();
if (fieldName != cachedFieldName || sim != cachedSimilarity) { // not cached?
Info info = getInfo(fieldName);
+ Similarity fieldSim = sim.get(fieldName);
int numTokens = info != null ? info.numTokens : 0;
int numOverlapTokens = info != null ? info.numOverlapTokens : 0;
float boost = info != null ? info.getBoost() : 1.0f;
FieldInvertState invertState = new FieldInvertState(0, numTokens, numOverlapTokens, 0, boost);
- float n = sim.computeNorm(fieldName, invertState);
- byte norm = sim.encodeNormValue(n);
+ float n = fieldSim.computeNorm(fieldName, invertState);
+ byte norm = fieldSim.encodeNormValue(n);
norms = new byte[] {norm};
// cache it for future reuse
Modified: lucene/dev/branches/realtime_search/lucene/contrib/misc/src/java/org/apache/lucene/index/FieldNormModifier.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/lucene/contrib/misc/src/java/org/apache/lucene/index/FieldNormModifier.java?rev=1062944&r1=1062943&r2=1062944&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/lucene/contrib/misc/src/java/org/apache/lucene/index/FieldNormModifier.java (original)
+++ lucene/dev/branches/realtime_search/lucene/contrib/misc/src/java/org/apache/lucene/index/FieldNormModifier.java Mon Jan 24 19:38:40 2011
@@ -24,6 +24,7 @@ import java.util.ArrayList;
import org.apache.lucene.search.DefaultSimilarity;
import org.apache.lucene.search.Similarity;
+import org.apache.lucene.search.SimilarityProvider;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
import org.apache.lucene.util.StringHelper;
@@ -57,13 +58,13 @@ public class FieldNormModifier {
System.exit(1);
}
- Similarity s = null;
+ SimilarityProvider s = null;
if (args[1].equals("-d"))
args[1] = DefaultSimilarity.class.getName();
try {
- s = Class.forName(args[1]).asSubclass(Similarity.class).newInstance();
+ s = Class.forName(args[1]).asSubclass(SimilarityProvider.class).newInstance();
} catch (Exception e) {
System.err.println("Couldn't instantiate similarity with empty constructor: " + args[1]);
e.printStackTrace(System.err);
@@ -84,7 +85,7 @@ public class FieldNormModifier {
private Directory dir;
- private Similarity sim;
+ private SimilarityProvider sim;
/**
* Constructor for code that wishes to use this class programmatically
@@ -93,7 +94,7 @@ public class FieldNormModifier {
* @param d the Directory to modify
* @param s the Similarity to use (can be null)
*/
- public FieldNormModifier(Directory d, Similarity s) {
+ public FieldNormModifier(Directory d, SimilarityProvider s) {
dir = d;
sim = s;
}
@@ -111,7 +112,7 @@ public class FieldNormModifier {
*/
public void reSetNorms(String field) throws IOException {
String fieldName = StringHelper.intern(field);
-
+ Similarity fieldSim = sim.get(field);
IndexReader reader = null;
try {
reader = IndexReader.open(dir, false);
@@ -148,7 +149,7 @@ public class FieldNormModifier {
for (int d = 0; d < termCounts.length; d++) {
if (delDocs == null || !delDocs.get(d)) {
invertState.setLength(termCounts[d]);
- subReader.setNorm(d, fieldName, sim.encodeNormValue(sim.computeNorm(fieldName, invertState)));
+ subReader.setNorm(d, fieldName, fieldSim.encodeNormValue(fieldSim.computeNorm(fieldName, invertState)));
}
}
}
Modified: lucene/dev/branches/realtime_search/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java?rev=1062944&r1=1062943&r2=1062944&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java (original)
+++ lucene/dev/branches/realtime_search/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java Mon Jan 24 19:38:40 2011
@@ -28,7 +28,7 @@ import org.apache.lucene.search.Collecto
import org.apache.lucene.search.DefaultSimilarity;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Scorer;
-import org.apache.lucene.search.Similarity;
+import org.apache.lucene.search.SimilarityProvider;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
@@ -42,7 +42,7 @@ public class TestFieldNormModifier exten
public Directory store;
/** inverts the normal notion of lengthNorm */
- public static Similarity s = new DefaultSimilarity() {
+ public static SimilarityProvider s = new DefaultSimilarity() {
@Override
public float computeNorm(String fieldName, FieldInvertState state) {
return state.getBoost() * (discountOverlaps ? state.getLength() - state.getNumOverlap() : state.getLength());
Modified: lucene/dev/branches/realtime_search/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java?rev=1062944&r1=1062943&r2=1062944&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java (original)
+++ lucene/dev/branches/realtime_search/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java Mon Jan 24 19:38:40 2011
@@ -33,7 +33,7 @@ import org.apache.lucene.search.Collecto
import org.apache.lucene.search.DefaultSimilarity;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Scorer;
-import org.apache.lucene.search.Similarity;
+import org.apache.lucene.search.SimilarityProvider;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
@@ -47,7 +47,7 @@ public class TestLengthNormModifier exte
public Directory store;
/** inverts the normal notion of lengthNorm */
- public static Similarity s = new DefaultSimilarity() {
+ public static SimilarityProvider s = new DefaultSimilarity() {
@Override
public float computeNorm(String fieldName, FieldInvertState state) {
return state.getBoost() * (discountOverlaps ? state.getLength() - state.getNumOverlap() : state.getLength());
@@ -163,7 +163,7 @@ public class TestLengthNormModifier exte
}
// override the norms to be inverted
- Similarity s = new DefaultSimilarity() {
+ SimilarityProvider s = new DefaultSimilarity() {
@Override
public float computeNorm(String fieldName, FieldInvertState state) {
return state.getBoost() * (discountOverlaps ? state.getLength() - state.getNumOverlap() : state.getLength());
Modified: lucene/dev/branches/realtime_search/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/StandardBooleanQueryNodeBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/StandardBooleanQueryNodeBuilder.java?rev=1062944&r1=1062943&r2=1062944&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/StandardBooleanQueryNodeBuilder.java (original)
+++ lucene/dev/branches/realtime_search/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/StandardBooleanQueryNodeBuilder.java Mon Jan 24 19:38:40 2011
@@ -31,7 +31,7 @@ import org.apache.lucene.queryParser.sta
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.Query;
-import org.apache.lucene.search.Similarity;
+import org.apache.lucene.search.SimilarityProvider;
import org.apache.lucene.search.BooleanQuery.TooManyClauses;
/**
@@ -41,7 +41,7 @@ import org.apache.lucene.search.BooleanQ
*
* @see BooleanQueryNodeBuilder
* @see BooleanQuery
- * @see Similarity#coord(int, int)
+ * @see SimilarityProvider#coord(int, int)
*/
public class StandardBooleanQueryNodeBuilder implements StandardQueryBuilder {
Modified: lucene/dev/branches/realtime_search/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/StandardBooleanQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/StandardBooleanQueryNode.java?rev=1062944&r1=1062943&r2=1062944&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/StandardBooleanQueryNode.java (original)
+++ lucene/dev/branches/realtime_search/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/StandardBooleanQueryNode.java Mon Jan 24 19:38:40 2011
@@ -22,14 +22,14 @@ import java.util.List;
import org.apache.lucene.queryParser.core.nodes.BooleanQueryNode;
import org.apache.lucene.queryParser.core.nodes.QueryNode;
import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.Similarity;
+import org.apache.lucene.search.SimilarityProvider;
/**
* A {@link StandardBooleanQueryNode} has the same behavior as
* {@link BooleanQueryNode}. It only indicates if the coord should be enabled or
* not for this boolean query. <br/>
*
- * @see Similarity#coord(int, int)
+ * @see SimilarityProvider#coord(int, int)
* @see BooleanQuery
*/
public class StandardBooleanQueryNode extends BooleanQueryNode {
Modified: lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/CompoundFileWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/CompoundFileWriter.java?rev=1062944&r1=1062943&r2=1062944&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/CompoundFileWriter.java (original)
+++ lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/CompoundFileWriter.java Mon Jan 24 19:38:40 2011
@@ -17,16 +17,16 @@ package org.apache.lucene.index;
* limitations under the License.
*/
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.LinkedList;
+
+import org.apache.lucene.index.codecs.MergeState;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.IndexOutput;
import org.apache.lucene.store.IndexInput;
+import org.apache.lucene.store.IndexOutput;
import org.apache.lucene.util.IOUtils;
-import java.util.LinkedList;
-import java.util.HashSet;
-
-import java.io.IOException;
-
/**
* Combines multiple files into a single compound file.
* The file format:<br>
@@ -76,7 +76,7 @@ final class CompoundFileWriter {
private HashSet<String> ids;
private LinkedList<FileEntry> entries;
private boolean merged = false;
- private SegmentMerger.CheckAbort checkAbort;
+ private MergeState.CheckAbort checkAbort;
/** Create the compound stream in the specified file. The file name is the
* entire name (no extensions are added).
@@ -86,7 +86,7 @@ final class CompoundFileWriter {
this(dir, name, null);
}
- CompoundFileWriter(Directory dir, String name, SegmentMerger.CheckAbort checkAbort) {
+ CompoundFileWriter(Directory dir, String name, MergeState.CheckAbort checkAbort) {
if (dir == null)
throw new NullPointerException("directory cannot be null");
if (name == null)
Modified: lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java?rev=1062944&r1=1062943&r2=1062944&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java (original)
+++ lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java Mon Jan 24 19:38:40 2011
@@ -30,7 +30,7 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.index.DocumentsWriterPerThread.IndexingChain;
import org.apache.lucene.index.DocumentsWriterPerThreadPool.ThreadState;
import org.apache.lucene.search.Query;
-import org.apache.lucene.search.Similarity;
+import org.apache.lucene.search.SimilarityProvider;
import org.apache.lucene.store.AlreadyClosedException;
import org.apache.lucene.store.Directory;
@@ -109,7 +109,7 @@ final class DocumentsWriter {
private volatile boolean closed;
PrintStream infoStream;
- Similarity similarity;
+ SimilarityProvider similarityProvider;
List<String> newFiles;
@@ -137,7 +137,7 @@ final class DocumentsWriter {
DocumentsWriter(Directory directory, IndexWriter writer, IndexingChain chain, DocumentsWriterPerThreadPool indexerThreadPool, FieldInfos fieldInfos, BufferedDeletes bufferedDeletes) throws IOException {
this.directory = directory;
this.indexWriter = writer;
- this.similarity = writer.getConfig().getSimilarity();
+ this.similarityProvider = writer.getConfig().getSimilarityProvider();
this.fieldInfos = fieldInfos;
this.bufferedDeletes = bufferedDeletes;
this.perThreadPool = indexerThreadPool;
@@ -243,8 +243,8 @@ final class DocumentsWriter {
pushConfigChange();
}
- synchronized void setSimilarity(Similarity similarity) {
- this.similarity = similarity;
+ synchronized void setSimilarityProvider(SimilarityProvider similarityProvider) {
+ this.similarityProvider = similarityProvider;
pushConfigChange();
}
@@ -253,7 +253,7 @@ final class DocumentsWriter {
while (it.hasNext()) {
DocumentsWriterPerThread perThread = it.next().perThread;
perThread.docState.infoStream = this.infoStream;
- perThread.docState.similarity = this.similarity;
+ perThread.docState.similarityProvider = this.similarityProvider;
}
}
Modified: lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java?rev=1062944&r1=1062943&r2=1062944&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java (original)
+++ lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java Mon Jan 24 19:38:40 2011
@@ -28,7 +28,7 @@ import java.util.concurrent.atomic.Atomi
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.search.Query;
-import org.apache.lucene.search.Similarity;
+import org.apache.lucene.search.SimilarityProvider;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.ByteBlockPool.DirectAllocator;
import org.apache.lucene.util.RamUsageEstimator;
@@ -87,7 +87,7 @@ public class DocumentsWriterPerThread {
final DocumentsWriterPerThread docWriter;
Analyzer analyzer;
PrintStream infoStream;
- Similarity similarity;
+ SimilarityProvider similarityProvider;
int docID;
Document doc;
String maxTermPrefix;
@@ -156,7 +156,7 @@ public class DocumentsWriterPerThread {
this.fieldInfos = new FieldInfos();
this.infoStream = parent.indexWriter.getInfoStream();
this.docState = new DocState(this);
- this.docState.similarity = parent.indexWriter.getConfig().getSimilarity();
+ this.docState.similarityProvider = parent.indexWriter.getConfig().getSimilarityProvider();
consumer = indexingChain.getChain(this);
if (consumer instanceof DocFieldProcessor) {
Modified: lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/FieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/FieldsReader.java?rev=1062944&r1=1062943&r2=1062944&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/FieldsReader.java (original)
+++ lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/FieldsReader.java Mon Jan 24 19:38:40 2011
@@ -37,8 +37,10 @@ import java.io.Reader;
* Class responsible for access to stored document fields.
* <p/>
* It uses <segment>.fdt and <segment>.fdx; files.
+ *
+ * @lucene.internal
*/
-final class FieldsReader implements Cloneable {
+public final class FieldsReader implements Cloneable {
private final static int FORMAT_SIZE = 4;
private final FieldInfos fieldInfos;
@@ -74,6 +76,23 @@ final class FieldsReader implements Clon
ensureOpen();
return new FieldsReader(fieldInfos, numTotalDocs, size, format, docStoreOffset, cloneableFieldsStream, cloneableIndexStream);
}
+
+ /** Verifies that the code version which wrote the segment is supported. */
+ public static void checkCodeVersion(Directory dir, String segment) throws IOException {
+ final String indexStreamFN = IndexFileNames.segmentFileName(segment, "", IndexFileNames.FIELDS_INDEX_EXTENSION);
+ IndexInput idxStream = dir.openInput(indexStreamFN, 1024);
+
+ try {
+ int format = idxStream.readInt();
+ if (format < FieldsWriter.FORMAT_MINIMUM)
+ throw new IndexFormatTooOldException(indexStreamFN, format, FieldsWriter.FORMAT_MINIMUM, FieldsWriter.FORMAT_CURRENT);
+ if (format > FieldsWriter.FORMAT_CURRENT)
+ throw new IndexFormatTooNewException(indexStreamFN, format, FieldsWriter.FORMAT_MINIMUM, FieldsWriter.FORMAT_CURRENT);
+ } finally {
+ idxStream.close();
+ }
+
+ }
// Used only by clone
private FieldsReader(FieldInfos fieldInfos, int numTotalDocs, int size, int format, int docStoreOffset,
@@ -89,11 +108,11 @@ final class FieldsReader implements Clon
indexStream = (IndexInput) cloneableIndexStream.clone();
}
- FieldsReader(Directory d, String segment, FieldInfos fn) throws IOException {
+ public FieldsReader(Directory d, String segment, FieldInfos fn) throws IOException {
this(d, segment, fn, BufferedIndexInput.BUFFER_SIZE, -1, 0);
}
- FieldsReader(Directory d, String segment, FieldInfos fn, int readBufferSize, int docStoreOffset, int size) throws IOException {
+ public FieldsReader(Directory d, String segment, FieldInfos fn, int readBufferSize, int docStoreOffset, int size) throws IOException {
boolean success = false;
isOriginal = true;
try {
@@ -157,7 +176,7 @@ final class FieldsReader implements Clon
*
* @throws IOException
*/
- final void close() throws IOException {
+ public final void close() throws IOException {
if (!closed) {
if (fieldsStream != null) {
fieldsStream.close();
@@ -178,7 +197,7 @@ final class FieldsReader implements Clon
}
}
- final int size() {
+ public final int size() {
return size;
}
@@ -186,7 +205,7 @@ final class FieldsReader implements Clon
indexStream.seek(FORMAT_SIZE + (docID + docStoreOffset) * 8L);
}
- final Document doc(int n, FieldSelector fieldSelector) throws CorruptIndexException, IOException {
+ public final Document doc(int n, FieldSelector fieldSelector) throws CorruptIndexException, IOException {
seekIndex(n);
long position = indexStream.readLong();
fieldsStream.seek(position);
@@ -237,7 +256,7 @@ final class FieldsReader implements Clon
* contiguous range of length numDocs starting with
* startDocID. Returns the IndexInput (the fieldStream),
* already seeked to the starting point for startDocID.*/
- final IndexInput rawDocs(int[] lengths, int startDocID, int numDocs) throws IOException {
+ public final IndexInput rawDocs(int[] lengths, int startDocID, int numDocs) throws IOException {
seekIndex(startDocID);
long startOffset = indexStream.readLong();
long lastOffset = startOffset;
Modified: lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/IndexFormatTooOldException.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/IndexFormatTooOldException.java?rev=1062944&r1=1062943&r2=1062944&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/IndexFormatTooOldException.java (original)
+++ lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/index/IndexFormatTooOldException.java Mon Jan 24 19:38:40 2011
@@ -23,10 +23,15 @@ package org.apache.lucene.index;
*/
public class IndexFormatTooOldException extends CorruptIndexException {
+ public IndexFormatTooOldException(String filename, String version) {
+ super("Format version is not supported" + (filename!=null ? (" in file '" + filename + "'") : "") +
+ ": " + version + ". This version of Lucene only supports indexes created with release 3.0 and later.");
+ }
+
public IndexFormatTooOldException(String filename, int version, int minVersion, int maxVersion) {
super("Format version is not supported" + (filename!=null ? (" in file '" + filename + "'") : "") +
- ": " + version + " (needs to be between " + minVersion + " and " + maxVersion +
- "). This version of Lucene only supports indexes created with release 3.0 and later.");
+ ": " + version + " (needs to be between " + minVersion + " and " + maxVersion +
+ "). This version of Lucene only supports indexes created with release 3.0 and later.");
}
}