lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sim...@apache.org
Subject svn commit: r1025539 [1/10] - in /lucene/dev/branches/docvalues: ./ lucene/ lucene/contrib/ lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ lucene/contrib/highlighter/src/test/ lucene/contrib/instantiated/src/test/org/apache...
Date Wed, 20 Oct 2010 12:44:39 GMT
Author: simonw
Date: Wed Oct 20 12:44:28 2010
New Revision: 1025539

URL: http://svn.apache.org/viewvc?rev=1025539&view=rev
Log:
Merged in trunk from revision 1021643

Added:
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java
      - copied unchanged from r1024556, lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java
    lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/core/WordBreakTestUnicode_6_0_0.java
      - copied unchanged from r1024556, lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/core/WordBreakTestUnicode_6_0_0.java
    lucene/dev/branches/docvalues/solr/example/solr/conf/velocity/facet_dates.vm
      - copied unchanged from r1024556, lucene/dev/trunk/solr/example/solr/conf/velocity/facet_dates.vm
    lucene/dev/branches/docvalues/solr/example/solr/conf/velocity/facet_pivot.vm
      - copied unchanged from r1024556, lucene/dev/trunk/solr/example/solr/conf/velocity/facet_pivot.vm
    lucene/dev/branches/docvalues/solr/example/solr/conf/velocity/facet_queries.vm
      - copied unchanged from r1024556, lucene/dev/trunk/solr/example/solr/conf/velocity/facet_queries.vm
    lucene/dev/branches/docvalues/solr/example/solr/conf/velocity/facet_ranges.vm
      - copied unchanged from r1024556, lucene/dev/trunk/solr/example/solr/conf/velocity/facet_ranges.vm
    lucene/dev/branches/docvalues/solr/lib/log4j-over-slf4j-1.5.5.jar
      - copied unchanged from r1024556, lucene/dev/trunk/solr/lib/log4j-over-slf4j-1.5.5.jar
    lucene/dev/branches/docvalues/solr/lib/zookeeper-3.3.1.jar
      - copied unchanged from r1024556, lucene/dev/trunk/solr/lib/zookeeper-3.3.1.jar
    lucene/dev/branches/docvalues/solr/src/common/org/apache/solr/common/cloud/
      - copied from r1024556, lucene/dev/trunk/solr/src/common/org/apache/solr/common/cloud/
    lucene/dev/branches/docvalues/solr/src/common/org/apache/solr/common/cloud/CloudState.java
      - copied unchanged from r1024556, lucene/dev/trunk/solr/src/common/org/apache/solr/common/cloud/CloudState.java
    lucene/dev/branches/docvalues/solr/src/common/org/apache/solr/common/cloud/ConnectionManager.java
      - copied unchanged from r1024556, lucene/dev/trunk/solr/src/common/org/apache/solr/common/cloud/ConnectionManager.java
    lucene/dev/branches/docvalues/solr/src/common/org/apache/solr/common/cloud/DefaultConnectionStrategy.java
      - copied unchanged from r1024556, lucene/dev/trunk/solr/src/common/org/apache/solr/common/cloud/DefaultConnectionStrategy.java
    lucene/dev/branches/docvalues/solr/src/common/org/apache/solr/common/cloud/OnReconnect.java
      - copied unchanged from r1024556, lucene/dev/trunk/solr/src/common/org/apache/solr/common/cloud/OnReconnect.java
    lucene/dev/branches/docvalues/solr/src/common/org/apache/solr/common/cloud/Slice.java
      - copied unchanged from r1024556, lucene/dev/trunk/solr/src/common/org/apache/solr/common/cloud/Slice.java
    lucene/dev/branches/docvalues/solr/src/common/org/apache/solr/common/cloud/SolrZkClient.java
      - copied unchanged from r1024556, lucene/dev/trunk/solr/src/common/org/apache/solr/common/cloud/SolrZkClient.java
    lucene/dev/branches/docvalues/solr/src/common/org/apache/solr/common/cloud/SolrZooKeeper.java
      - copied unchanged from r1024556, lucene/dev/trunk/solr/src/common/org/apache/solr/common/cloud/SolrZooKeeper.java
    lucene/dev/branches/docvalues/solr/src/common/org/apache/solr/common/cloud/ZkClientConnectionStrategy.java
      - copied unchanged from r1024556, lucene/dev/trunk/solr/src/common/org/apache/solr/common/cloud/ZkClientConnectionStrategy.java
    lucene/dev/branches/docvalues/solr/src/common/org/apache/solr/common/cloud/ZkNodeProps.java
      - copied unchanged from r1024556, lucene/dev/trunk/solr/src/common/org/apache/solr/common/cloud/ZkNodeProps.java
    lucene/dev/branches/docvalues/solr/src/common/org/apache/solr/common/cloud/ZkStateReader.java
      - copied unchanged from r1024556, lucene/dev/trunk/solr/src/common/org/apache/solr/common/cloud/ZkStateReader.java
    lucene/dev/branches/docvalues/solr/src/common/org/apache/solr/common/cloud/ZooKeeperException.java
      - copied unchanged from r1024556, lucene/dev/trunk/solr/src/common/org/apache/solr/common/cloud/ZooKeeperException.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/cloud/
      - copied from r1024556, lucene/dev/trunk/solr/src/java/org/apache/solr/cloud/
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/cloud/CloudDescriptor.java
      - copied unchanged from r1024556, lucene/dev/trunk/solr/src/java/org/apache/solr/cloud/CloudDescriptor.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/cloud/SolrZkServer.java
      - copied unchanged from r1024556, lucene/dev/trunk/solr/src/java/org/apache/solr/cloud/SolrZkServer.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/cloud/ZkController.java
      - copied unchanged from r1024556, lucene/dev/trunk/solr/src/java/org/apache/solr/cloud/ZkController.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java
      - copied unchanged from r1024556, lucene/dev/trunk/solr/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/handler/component/PivotFacetHelper.java
      - copied unchanged from r1024556, lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/PivotFacetHelper.java
    lucene/dev/branches/docvalues/solr/src/solrj/org/apache/solr/client/solrj/impl/CloudSolrServer.java
      - copied unchanged from r1024556, lucene/dev/trunk/solr/src/solrj/org/apache/solr/client/solrj/impl/CloudSolrServer.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/SolrInfoMBeanTest.java
      - copied unchanged from r1024556, lucene/dev/trunk/solr/src/test/org/apache/solr/SolrInfoMBeanTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/cloud/
      - copied from r1024556, lucene/dev/trunk/solr/src/test/org/apache/solr/cloud/
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/cloud/AbstractDistributedZkTestCase.java
      - copied unchanged from r1024556, lucene/dev/trunk/solr/src/test/org/apache/solr/cloud/AbstractDistributedZkTestCase.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/cloud/AbstractZkTestCase.java
      - copied unchanged from r1024556, lucene/dev/trunk/solr/src/test/org/apache/solr/cloud/AbstractZkTestCase.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
      - copied unchanged from r1024556, lucene/dev/trunk/solr/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/cloud/BasicZkTest.java
      - copied unchanged from r1024556, lucene/dev/trunk/solr/src/test/org/apache/solr/cloud/BasicZkTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/cloud/CloudStateUpdateTest.java
      - copied unchanged from r1024556, lucene/dev/trunk/solr/src/test/org/apache/solr/cloud/CloudStateUpdateTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/cloud/ZkControllerTest.java
      - copied unchanged from r1024556, lucene/dev/trunk/solr/src/test/org/apache/solr/cloud/ZkControllerTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/cloud/ZkNodePropsTest.java
      - copied unchanged from r1024556, lucene/dev/trunk/solr/src/test/org/apache/solr/cloud/ZkNodePropsTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/cloud/ZkSolrClientTest.java
      - copied unchanged from r1024556, lucene/dev/trunk/solr/src/test/org/apache/solr/cloud/ZkSolrClientTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/cloud/ZkTestServer.java
      - copied unchanged from r1024556, lucene/dev/trunk/solr/src/test/org/apache/solr/cloud/ZkTestServer.java
    lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-spellcheckcomponent.xml
      - copied unchanged from r1024556, lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-spellcheckcomponent.xml
    lucene/dev/branches/docvalues/solr/src/test/test-files/solr/solr.xml
      - copied unchanged from r1024556, lucene/dev/trunk/solr/src/test/test-files/solr/solr.xml
    lucene/dev/branches/docvalues/solr/src/webapp/web/admin/zookeeper.jsp
      - copied unchanged from r1024556, lucene/dev/trunk/solr/src/webapp/web/admin/zookeeper.jsp
Removed:
    lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/core/WordBreakTestUnicode_5_2_0.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/handler/component/PivotFacetComponent.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/core/AlternateIndexReaderTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/handler/component/DistributedSpellCollatorTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/search/FunctionQParserTest.java
Modified:
    lucene/dev/branches/docvalues/   (props changed)
    lucene/dev/branches/docvalues/lucene/   (props changed)
    lucene/dev/branches/docvalues/lucene/CHANGES.txt
    lucene/dev/branches/docvalues/lucene/MIGRATE.txt
    lucene/dev/branches/docvalues/lucene/build.xml   (contents, props changed)
    lucene/dev/branches/docvalues/lucene/common-build.xml
    lucene/dev/branches/docvalues/lucene/contrib/   (props changed)
    lucene/dev/branches/docvalues/lucene/contrib/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/docvalues/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTask.java
    lucene/dev/branches/docvalues/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetHighlightTask.java
    lucene/dev/branches/docvalues/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetVectorHighlightTask.java
    lucene/dev/branches/docvalues/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.java
    lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/test/   (props changed)
    lucene/dev/branches/docvalues/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java   (props changed)
    lucene/dev/branches/docvalues/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
    lucene/dev/branches/docvalues/lucene/contrib/queries/src/java/org/apache/lucene/search/FuzzyLikeThisQuery.java
    lucene/dev/branches/docvalues/lucene/contrib/queries/src/java/org/apache/lucene/search/regex/RegexQuery.java
    lucene/dev/branches/docvalues/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestRegexQuery.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/processors/QueryNodeProcessorPipeline.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/MultiFieldQueryParserWrapper.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/QueryParserWrapper.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/StandardQueryParser.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldBoostMapAttribute.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldBoostMapAttributeImpl.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParser.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParser.jj
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/StandardQueryNodeProcessorPipeline.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/precedence/TestPrecedenceQueryParser.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/TestSpanQueryParser.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/TestSpanQueryParserSimpleSample.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQPHelper.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQueryParserWrapper.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQPHelper.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQueryParserWrapper.java
    lucene/dev/branches/docvalues/lucene/contrib/spellchecker/src/java/org/apache/lucene/search/spell/DirectSpellChecker.java
    lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/LuceneContribQuery.dtd
    lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/FuzzyLikeThisQueryBuilder.java
    lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestQueryTemplateManager.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java   (props changed)
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttributeImpl.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/CheckIndex.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/values/FixedSortedBytesImpl.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/values/VarSortedBytesImpl.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/messages/NLS.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/AutomatonQuery.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/BooleanScorer.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/FieldCacheImpl.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/FuzzyQuery.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/FuzzyTermsEnum.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/MultiTermQuery.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java   (props changed)
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/NumericRangeQuery.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/PrefixQuery.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/QueryWrapperFilter.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/TermRangeQuery.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/cache/CachedArrayCreator.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/cache/DocTermsCreator.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/cache/DocTermsIndexCreator.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/util/ArrayUtil.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/util/ByteBlockPool.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/util/BytesRefHash.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/util/PagedBytes.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/util/StringHelper.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/TestDemo.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/TestExternalCodecs.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/analysis/MockAnalyzer.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/document/TestDateTools.java   (contents, props changed)
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/document/TestNumberTools.java   (props changed)
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java   (props changed)
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestCodecs.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestStressIndexing.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/messages/TestNLS.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/queryParser/TestQueryParser.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/search/TestPhraseQuery.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/search/TestPrefixRandom.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/search/TestRegexpRandom2.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/search/TestThreadSafe.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/util/LuceneJUnitResultFormatter.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/util/LuceneTestCase.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java   (props changed)
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/util/TestBytesRefHash.java
    lucene/dev/branches/docvalues/modules/analysis/CHANGES.txt
    lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/ASCIITLD.jflex-macro
    lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/READ_BEFORE_REGENERATING.txt
    lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java
    lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex
    lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29Tokenizer.java
    lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29Tokenizer.jflex
    lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestStandardAnalyzer.java
    lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestUAX29Tokenizer.java
    lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/core/generateJavaUnicodeWordBreakTest.pl
    lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestISOLatin1AccentFilter.java   (props changed)
    lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java
    lucene/dev/branches/docvalues/solr/   (props changed)
    lucene/dev/branches/docvalues/solr/CHANGES.txt
    lucene/dev/branches/docvalues/solr/build.xml
    lucene/dev/branches/docvalues/solr/contrib/clustering/build.xml
    lucene/dev/branches/docvalues/solr/contrib/clustering/src/test/java/org/apache/solr/handler/clustering/ClusteringComponentTest.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/build.xml
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestMailEntityProcessor.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestTikaEntityProcessor.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/FieldReaderDataSource.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTestCase.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestCachedSqlEntityProcessor.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestClobTransformer.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDataConfig.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDateFormatTransformer.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder2.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestEntityProcessorBase.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestErrorHandling.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestEvaluatorBag.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestFieldReader.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestFileListEntityProcessor.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestJdbcDataSource.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestLineEntityProcessor.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestNumberFormatTransformer.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestPlainTextEntityProcessor.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestRegexTransformer.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestScriptTransformer.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor2.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta2.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestTemplateString.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestTemplateTransformer.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestThreaded.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestURLDataSource.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestVariableResolver.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathRecordReader.java
    lucene/dev/branches/docvalues/solr/contrib/extraction/build.xml
    lucene/dev/branches/docvalues/solr/contrib/extraction/src/test/java/org/apache/solr/handler/ExtractingRequestHandlerTest.java
    lucene/dev/branches/docvalues/solr/example/solr/conf/solrconfig.xml
    lucene/dev/branches/docvalues/solr/example/solr/conf/velocity/VM_global_library.vm
    lucene/dev/branches/docvalues/solr/example/solr/conf/velocity/facets.vm
    lucene/dev/branches/docvalues/solr/example/solr/conf/velocity/hit.vm
    lucene/dev/branches/docvalues/solr/lib/commons-httpclient-3.1.jar   (props changed)
    lucene/dev/branches/docvalues/solr/lib/jcl-over-slf4j-1.5.5.jar   (props changed)
    lucene/dev/branches/docvalues/solr/src/common/org/apache/solr/common/   (props changed)
    lucene/dev/branches/docvalues/solr/src/common/org/apache/solr/common/params/CoreAdminParams.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/ArabicNormalizationFilterFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/ArabicStemFilterFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/BufferedTokenStream.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/BulgarianStemFilterFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/ClassicFilterFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/ClassicTokenizerFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/CzechStemFilterFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/DelimitedPayloadTokenFilterFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/DoubleMetaphoneFilterFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/EdgeNGramFilterFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/EdgeNGramTokenizerFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/EnglishMinimalStemFilterFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/EnglishPossessiveFilterFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/FinnishLightStemFilterFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/FrenchLightStemFilterFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/FrenchMinimalStemFilterFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/GermanLightStemFilterFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/GermanMinimalStemFilterFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/GreekStemFilterFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/HindiNormalizationFilterFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/HindiStemFilterFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/HungarianLightStemFilterFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/HyphenatedWordsFilterFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/HyphenationCompoundWordTokenFilterFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/ISOLatin1AccentFilterFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/IndicNormalizationFilterFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/IndicTokenizerFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/IndonesianStemFilterFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/ItalianLightStemFilterFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/KeywordMarkerFilterFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/KeywordTokenizerFactory.java   (contents, props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/LimitTokenCountFilterFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/NGramFilterFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/NGramTokenizerFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/PatternReplaceFilterFactory.java   (contents, props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/PatternTokenizerFactory.java   (contents, props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/PortugueseLightStemFilterFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/PortugueseMinimalStemFilterFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/RemoveDuplicatesTokenFilterFactory.java   (contents, props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/ReversedWildcardFilter.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/ReversedWildcardFilterFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/RussianLightStemFilterFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/SpanishLightStemFilterFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/StemmerOverrideFilterFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/SwedishLightStemFilterFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/TrimFilterFactory.java   (contents, props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/TurkishLowerCaseFilterFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/analysis/WikipediaTokenizerFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/core/CoreContainer.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/core/CoreDescriptor.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/core/IndexReaderFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/core/JmxMonitoredMap.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/core/PluginInfo.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/core/RAMDirectoryFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/core/RefCntRamDirectory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/core/SolrCore.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/core/SolrResourceLoader.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/handler/AnalysisRequestHandler.java   (contents, props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/handler/ContentStreamHandlerBase.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/handler/ContentStreamLoader.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/handler/RequestHandlerBase.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/handler/SpellCheckerRequestHandler.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/handler/XMLLoader.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/handler/component/FacetComponent.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/handler/component/FieldFacetStats.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/handler/component/QueryComponent.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/handler/component/ResponseBuilder.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/handler/component/SearchHandler.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/handler/component/ShardRequest.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/handler/component/ShardResponse.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/handler/component/StatsComponent.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/handler/component/StatsValues.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/handler/component/TermVectorComponent.java   (contents, props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/handler/component/TermsComponent.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/highlight/SingleFragListBuilder.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/request/BinaryQueryResponseWriter.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/request/BinaryResponseWriter.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/request/JSONResponseWriter.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/request/PHPResponseWriter.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/request/PHPSerializedResponseWriter.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/request/PythonResponseWriter.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/request/QueryResponseWriter.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/request/RawResponseWriter.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/request/RubyResponseWriter.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/request/ServletSolrParams.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/request/SimpleFacets.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/request/SolrQueryResponse.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/request/TextResponseWriter.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/request/XMLResponseWriter.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/request/XSLTResponseWriter.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/response/BaseResponseWriter.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/response/GenericBinaryResponseWriter.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/response/GenericTextResponseWriter.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/response/JSONResponseWriter.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/response/PageTool.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/response/PythonResponseWriter.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/response/RubyResponseWriter.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/response/SolrParamResourceLoader.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/response/SolrVelocityResourceLoader.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/response/TextResponseWriter.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/response/VelocityResponseWriter.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/response/XSLTResponseWriter.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/schema/AbstractSubTypeFieldType.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/schema/BinaryField.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/schema/ByteField.java   (contents, props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/schema/CoordinateFieldType.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/schema/GeoHashField.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/schema/LatLonType.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/schema/PointType.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/schema/SchemaAware.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/schema/ShortField.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/schema/SimilarityFactory.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/schema/SpatialQueryable.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/DocSetHitCollector.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/FieldQParserPlugin.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/FunctionQParserPlugin.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/MutableValueLong.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/RawQParserPlugin.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/SolrFilter.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/SpatialFilterQParser.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/SpatialFilterQParserPlugin.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/SpatialOptions.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/TermQParserPlugin.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/function/ByteFieldSource.java   (contents, props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/function/DoubleFieldSource.java   (contents, props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/function/JoinDocFreqValueSource.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/function/LiteralValueSource.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/function/LongFieldSource.java   (contents, props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/function/MultiFloatFunction.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/function/MultiValueSource.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/function/NumericFieldCacheSource.java   (contents, props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/function/ShortFieldSource.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/function/VectorValueSource.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/function/distance/GeohashFunction.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/function/distance/HaversineFunction.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/function/distance/StringDistanceFunction.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/spelling/DirectSolrSpellChecker.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/spelling/PossibilityIterator.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/spelling/QueryConverter.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/spelling/RankedSpellPossibility.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/spelling/SolrSpellChecker.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/spelling/SpellCheckCollation.java   (contents, props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/spelling/SpellCheckCollator.java   (contents, props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/spelling/SpellCheckCorrection.java   (contents, props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/spelling/SpellingOptions.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/spelling/SpellingQueryConverter.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/spelling/SpellingResult.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/spelling/suggest/BufferingTermFreqIteratorWrapper.java   (contents, props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/spelling/suggest/FileDictionary.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/spelling/suggest/Lookup.java   (contents, props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/spelling/suggest/SortedTermFreqIteratorWrapper.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/spelling/suggest/Suggester.java   (contents, props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/spelling/suggest/UnsortedTermFreqIteratorWrapper.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/spelling/suggest/jaspell/JaspellLookup.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/spelling/suggest/jaspell/JaspellTernarySearchTrie.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/spelling/suggest/tst/TSTAutocomplete.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/spelling/suggest/tst/TSTLookup.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/spelling/suggest/tst/TernaryTreeNode.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/update/processor/UpdateRequestProcessorChain.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/util/BitSetIterator.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/util/BitUtil.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/util/BoundedTreeSet.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/util/DateMathParser.java   (contents, props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/util/HighFrequencyDictionary.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/util/HighlightingUtils.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/util/OpenBitSet.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/util/SimplePostTool.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/util/SolrPluginUtils.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/util/SortedIterator.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/util/TermFreqIterator.java   (contents, props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/util/TestHarness.java   (contents, props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/util/doc-files/min-should-match.html   (contents, props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/util/plugin/PluginInfoInitialized.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/util/xslt/TransformerProvider.java   (props changed)
    lucene/dev/branches/docvalues/solr/src/maven/solr-core-pom.xml.template   (props changed)
    lucene/dev/branches/docvalues/solr/src/maven/solr-solrj-pom.xml.template   (props changed)
    lucene/dev/branches/docvalues/solr/src/solrj/org/   (props changed)
    lucene/dev/branches/docvalues/solr/src/solrj/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java
    lucene/dev/branches/docvalues/solr/src/solrj/org/apache/solr/client/solrj/response/QueryResponse.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/BaseDistributedSearchTestCase.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/BasicFunctionalityTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/JSONTestUtil.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/SolrTestCaseJ4.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/TestPluginEnable.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/analysis/TestLuceneMatchVersion.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/analysis/TestThaiWordFilterFactory.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/client/   (props changed)
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/core/AlternateDirectoryTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/core/IndexReaderFactoryTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/core/RequestHandlersTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/core/SOLR749Test.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/core/SolrCoreTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/core/TestArbitraryIndexDir.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/core/TestConfig.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/core/TestJmxIntegration.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/core/TestLegacyMergeSchedulerPolicyConfig.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/core/TestPropInjectDefaults.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/core/TestQuerySenderListener.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/handler/DocumentAnalysisRequestHandlerTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/handler/TestReplicationHandler.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/handler/component/SearchHandlerTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/highlight/HighlighterTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/request/JSONWriterTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/request/SimpleFacetsTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/request/TestBinaryResponseWriter.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/response/TestCSVResponseWriter.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/schema/LegacyDateFieldTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/schema/NotRequiredUniqueKeyTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/search/QueryParsingTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/search/TestIndexSearcher.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/search/TestRangeQuery.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/servlet/SolrRequestParserTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/spelling/DirectSolrSpellCheckerTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/util/DateMathParserTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/util/SolrPluginUtilsTest.java
    lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-altdirectory.xml
    lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig-spellchecker.xml
    lucene/dev/branches/docvalues/solr/src/test/test-files/solr/conf/solrconfig.xml
    lucene/dev/branches/docvalues/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/   (props changed)
    lucene/dev/branches/docvalues/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java
    lucene/dev/branches/docvalues/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
    lucene/dev/branches/docvalues/solr/src/webapp/web/admin/index.jsp

Propchange: lucene/dev/branches/docvalues/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 20 12:44:28 2010
@@ -1,2 +1,3 @@
 /lucene/dev/branches/branch_3x:949730,957490,961612,979161,980654,982195,987811,988512
 /lucene/dev/branches/preflexfixes:967125-979432
+/lucene/dev/trunk:1021635-1024556,1025532-1025536

Propchange: lucene/dev/branches/docvalues/lucene/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 20 12:44:28 2010
@@ -1,5 +1,6 @@
 /lucene/dev/branches/branch_3x/lucene:943137,949730,957490,960490,961612,979161,980654,982195,987811,988512
 /lucene/dev/branches/preflexfixes/lucene:967125-979432
+/lucene/dev/trunk/lucene:1021635-1024556,1025532-1025536
 /lucene/java/branches/flex_1458:824912-931101
 /lucene/java/branches/lucene_2_4:748824
 /lucene/java/branches/lucene_2_9:817269-818600,829134,829881,831036,896850,909334,948516

Modified: lucene/dev/branches/docvalues/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/CHANGES.txt?rev=1025539&r1=1025538&r2=1025539&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/docvalues/lucene/CHANGES.txt Wed Oct 20 12:44:28 2010
@@ -147,8 +147,10 @@ API Changes
   you also override this method on upgrade.  (Robert Muir, Mike
   McCandless)
 
-* LUCENE-2691: IndexWriter.getReader() has been made package local and is now exposed via open and reopen methods on
-  IndexReader.  The semantics of the call is the same as it was prior to the API change.  (Grant Ingersoll, Mike McCandless)
+* LUCENE-2691: IndexWriter.getReader() has been made package local and is now
+  exposed via open and reopen methods on IndexReader.  The semantics of the
+  call is the same as it was prior to the API change.
+  (Grant Ingersoll, Mike McCandless)
 
 New features
 
@@ -265,6 +267,9 @@ New features
 * LUCENE-2692: Added several new SpanQuery classes for positional checking
   (match is in a range, payload is a specific value) (Grant Ingersoll)  
   
+* LUCENE-2690: MultiTermQuery boolean rewrites per segment.
+  (Uwe Schindler, Robert Muir, Mike McCandless, Simon Willnauer)
+
 Optimizations
 
 * LUCENE-2410: ~20% speedup on exact (slop=0) PhraseQuery matching.
@@ -740,6 +745,9 @@ Optimizations
 * LUCENE-2098: Improve the performance of BaseCharFilter, especially for
   large documents.  (Robin Wojciki, Koji Sekiguchi, Robert Muir)
 
+* LUCENE-2556: Improve memory usage after cloning (Char)TermAttribute.
+  (Adriano Crestani via Uwe Schindler)
+
 Build
 
 * LUCENE-2124: Moved the JDK-based collation support from contrib/collation 

Modified: lucene/dev/branches/docvalues/lucene/MIGRATE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/MIGRATE.txt?rev=1025539&r1=1025538&r2=1025539&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/MIGRATE.txt (original)
+++ lucene/dev/branches/docvalues/lucene/MIGRATE.txt Wed Oct 20 12:44:28 2010
@@ -312,3 +312,15 @@ LUCENE-1458, LUCENE-2111: Flexible Index
     - o.a.l.analysis.ReusableAnalyzerBase -> o.a.l.analysis.util.ReusableAnalyzerBase
     - o.a.l.analysis.StopwordAnalyzerBase -> o.a.l.analysis.util.StopwordAnalyzerBase
     - o.a.l.analysis.WordListLoader -> o.a.l.analysis.util.WordListLoader
+
+* LUCENE-2691: The near-real-time API has moved from IndexWriter to
+  IndexReader.  Instead of IndexWriter.getReader(), call
+  IndexReader.open(IndexWriter) or IndexReader.reopen(IndexWriter).
+
+* LUCENE-2690: MultiTermQuery boolean rewrites per segment.
+  Also MultiTermQuery.getTermsEnum() now takes an AttributeSource. FuzzyTermsEnum
+  is both consumer and producer of attributes: MTQ.BoostAttribute is
+  added to the FuzzyTermsEnum and MTQ's rewrite mode consumes it.
+  The other way round MTQ.TopTermsBooleanQueryRewrite supplys a
+  global AttributeSource to each segments TermsEnum. The TermsEnum is consumer
+  and gets the current minimum competitive boosts (MTQ.MaxNonCompetitiveBoostAttribute).

Modified: lucene/dev/branches/docvalues/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/build.xml?rev=1025539&r1=1025538&r2=1025539&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/build.xml (original)
+++ lucene/dev/branches/docvalues/lucene/build.xml Wed Oct 20 12:44:28 2010
@@ -209,6 +209,7 @@
           <packageset dir="contrib/benchmark/src/java"/>
           <packageset dir="contrib/db/bdb-je/src/java"/>
           <packageset dir="contrib/db/bdb/src/java"/>
+          <packageset dir="contrib/demo/src/java"/>
           <packageset dir="contrib/highlighter/src/java"/>
           <packageset dir="contrib/instantiated/src/java"/>
           <packageset dir="contrib/lucli/src/java"/>
@@ -299,7 +300,6 @@
       <tarfileset prefix="lucene-${version}" dir=".">
         <patternset refid="binary.root.dist.patterns"/>
       </tarfileset>
-      <tarfileset dir="${build.dir}" includes="build-demo.xml" fullpath="lucene-${version}/build.xml"/>
       <tarfileset prefix="lucene-${version}" dir="${build.dir}">
         <patternset refid="binary.build.dist.patterns"/>
       </tarfileset>
@@ -463,10 +463,13 @@
       <fileset dir="contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser" includes="*.java">
         <containsregexp expression="Generated.*By.*JavaCC"/>
       </fileset>
+      <fileset dir="contrib/demo/src/java/org/apache/lucene/demo/html" includes="*.java">
+        <containsregexp expression="Generated.*By.*JavaCC"/>
+      </fileset>
     </delete>
   </target>
 
-  <target name="javacc" depends="init,javacc-check,clean-javacc,javacc-QueryParser,javacc-contrib-queryparser"/>
+  <target name="javacc" depends="init,javacc-check,clean-javacc,javacc-QueryParser,javacc-contrib-queryparser,javacc-contrib-demo"/>
 
   <target name="javacc-QueryParser" depends="init,javacc-check" if="javacc.present">
     <sequential>
@@ -493,6 +496,13 @@
     />
   </target>
 
+  <target name="javacc-contrib-demo" depends="init,javacc-check" if="javacc.present">
+	<ant target="javacc"
+	  dir="contrib/demo"
+	  antfile="build.xml" 
+	/>
+  </target>
+
   <macrodef name="createLevAutomaton">
   	<attribute name="n"/>
   	<sequential>

Propchange: lucene/dev/branches/docvalues/lucene/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 20 12:44:28 2010
@@ -1,5 +1,6 @@
 /lucene/dev/branches/branch_3x/lucene/build.xml:943137,949730,957490,960490,961612,979161,980654,982195,987811,988512
 /lucene/dev/branches/preflexfixes/lucene/build.xml:967125-979432
+/lucene/dev/trunk/lucene/build.xml:1021635-1024556,1025532-1025536
 /lucene/java/branches/flex_1458/build.xml:824912-931101
 /lucene/java/branches/lucene_2_9/build.xml:909334,948516
 /lucene/java/trunk/build.xml:924483-924731,924781,925176-925462

Modified: lucene/dev/branches/docvalues/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/common-build.xml?rev=1025539&r1=1025538&r2=1025539&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/common-build.xml (original)
+++ lucene/dev/branches/docvalues/lucene/common-build.xml Wed Oct 20 12:44:28 2010
@@ -470,7 +470,7 @@
 	      <sysproperty key="lucene.version" value="${dev.version}"/>
               
               <sysproperty key="testmethod" value="${testmethod}"/>
-              <sysproperty key="jetty.insecurerandom" value="1"/>
+              <sysproperty key="jetty.testMode" value="1"/>
 	    	
 	      <formatter type="xml"/>
 	      <formatter classname="${junit.details.formatter}" usefile="false"/>

Propchange: lucene/dev/branches/docvalues/lucene/contrib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 20 12:44:28 2010
@@ -1,5 +1,6 @@
 /lucene/dev/branches/branch_3x/lucene/contrib:943137,949730,957490,960490,961612,979161,980654,982195,987811,988512
 /lucene/dev/branches/preflexfixes/lucene/contrib:967125-979432
+/lucene/dev/trunk/lucene/contrib:1021635-1024556,1025532-1025536
 /lucene/java/branches/flex_1458/contrib:824912-931101
 /lucene/java/branches/lucene_2_4/contrib:748824
 /lucene/java/branches/lucene_2_9/contrib:817269-818600,825998,829134,829816,829881,831036,896850,909334,948516

Modified: lucene/dev/branches/docvalues/lucene/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/CHANGES.txt?rev=1025539&r1=1025538&r2=1025539&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/CHANGES.txt (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/CHANGES.txt Wed Oct 20 12:44:28 2010
@@ -154,7 +154,15 @@ API Changes
 
  * LUCENE-2626: FastVectorHighlighter: enable FragListBuilder and FragmentsBuilder
    to be set per-field override. (Koji Sekiguchi)
-   
+
+ * LUCENE-2712: FieldBoostMapAttribute in contrib/queryparser was changed from 
+   a Map<CharSequence,Float> to a Map<String,Float>. Per the CharSequence javadoc,
+   CharSequence is inappropriate as a map key. (Robert Muir)
+
+ * LUCENE-1937: Add more methods to manipulate QueryNodeProcessorPipeline elements.
+   QueryNodeProcessorPipeline now implements the List interface, this is useful
+   if you want to extend or modify an existing pipeline. (Adriano Crestani via Robert Muir)
+    
 New features
 
  * LUCENE-2306: Add NumericRangeFilter and NumericRangeQuery support to XMLQueryParser.

Propchange: lucene/dev/branches/docvalues/lucene/contrib/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 20 12:44:28 2010
@@ -1,5 +1,6 @@
 /lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt:943137,949730,957490,960490,961612,979161,980654,982195,987811,988512
 /lucene/dev/branches/preflexfixes/lucene/contrib/CHANGES.txt:967125-979432
+/lucene/dev/trunk/lucene/contrib/CHANGES.txt:1021635-1024556,1025532-1025536
 /lucene/java/branches/flex_1458/contrib/CHANGES.txt:824912-931101
 /lucene/java/branches/lucene_2_4/contrib/CHANGES.txt:748824
 /lucene/java/branches/lucene_2_9/contrib/CHANGES.txt:817269-818600,825998,826775,829134,829816,829881,831036,896850,948516

Modified: lucene/dev/branches/docvalues/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTask.java?rev=1025539&r1=1025538&r2=1025539&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTask.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTask.java Wed Oct 20 12:44:28 2010
@@ -41,6 +41,7 @@ public class CommitIndexTask extends Per
   
   @Override
   public void setParams(String params) {
+    super.setParams(params);
     commitUserData = new HashMap<String,String>();
     commitUserData.put(OpenReaderTask.USER_DATA, params);
   }

Modified: lucene/dev/branches/docvalues/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetHighlightTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetHighlightTask.java?rev=1025539&r1=1025538&r2=1025539&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetHighlightTask.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetHighlightTask.java Wed Oct 20 12:44:28 2010
@@ -123,6 +123,9 @@ public class SearchTravRetHighlightTask 
 
   @Override
   public void setParams(String params) {
+    // can't call super because super doesn't understand our
+    // params syntax
+    this.params = params;
     String [] splits = params.split(",");
     for (int i = 0; i < splits.length; i++) {
       if (splits[i].startsWith("size[") == true){

Modified: lucene/dev/branches/docvalues/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetVectorHighlightTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetVectorHighlightTask.java?rev=1025539&r1=1025538&r2=1025539&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetVectorHighlightTask.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetVectorHighlightTask.java Wed Oct 20 12:44:28 2010
@@ -120,6 +120,7 @@ public class SearchTravRetVectorHighligh
 
   @Override
   public void setParams(String params) {
+    super.setParams(params);
     String [] splits = params.split(",");
     for (int i = 0; i < splits.length; i++) {
       if (splits[i].startsWith("size[") == true){

Modified: lucene/dev/branches/docvalues/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.java?rev=1025539&r1=1025538&r2=1025539&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.java Wed Oct 20 12:44:28 2010
@@ -142,9 +142,7 @@ public class WriteLineDocTask extends Pe
    */
   @Override
   public void setParams(String params) {
-    if (super.supportsParams()) {
-      super.setParams(params);
-    }
+    super.setParams(params);
     docSize = (int) Float.parseFloat(params); 
   }
 

Propchange: lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 20 12:44:28 2010
@@ -1,5 +1,6 @@
 /lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test:943137,949730,957490,960490,961612,979161,980654,982195,987811,988512
 /lucene/dev/branches/preflexfixes/lucene/contrib/highlighter/src/test:967125-979432
+/lucene/dev/trunk/lucene/contrib/highlighter/src/test:1021635-1024556,1025532-1025536
 /lucene/java/branches/flex_1458/contrib/highlighter/src/test:824912-931101
 /lucene/java/branches/lucene_2_4/contrib/highlighter/src/test:748824
 /lucene/java/branches/lucene_2_9/contrib/highlighter/src/test:817269-818600,825998,826775,829134,829816,829881,831036,896850,909334,948516

Propchange: lucene/dev/branches/docvalues/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 20 12:44:28 2010
@@ -1,5 +1,6 @@
 /lucene/dev/branches/branch_3x/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:943137,949730,957490,960490,961612,979161,980654,982195,987811,988512
 /lucene/dev/branches/preflexfixes/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:967125-979432
+/lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:1021635-1024556,1025532-1025536
 /lucene/java/branches/flex_1458/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:824912-931101
 /lucene/java/branches/lucene_2_9/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:909334,948516
 /lucene/java/trunk/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:924483-924731,924781,925176-925462

Modified: lucene/dev/branches/docvalues/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java?rev=1025539&r1=1025538&r2=1025539&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java Wed Oct 20 12:44:28 2010
@@ -886,7 +886,7 @@ public class MemoryIndex implements Seri
 
       @Override
       public int docFreq() {
-        return info.sortedTerms[termUpto].getValue().size();
+        return 1;
       }
 
       @Override

Modified: lucene/dev/branches/docvalues/lucene/contrib/queries/src/java/org/apache/lucene/search/FuzzyLikeThisQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queries/src/java/org/apache/lucene/search/FuzzyLikeThisQuery.java?rev=1025539&r1=1025538&r2=1025539&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queries/src/java/org/apache/lucene/search/FuzzyLikeThisQuery.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queries/src/java/org/apache/lucene/search/FuzzyLikeThisQuery.java Wed Oct 20 12:44:28 2010
@@ -29,6 +29,7 @@ import org.apache.lucene.analysis.TokenS
 import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.Term;
+import org.apache.lucene.util.AttributeSource;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.PriorityQueue;
 
@@ -199,7 +200,10 @@ public class FuzzyLikeThisQuery extends 
                   ScoreTermQueue variantsQ=new ScoreTermQueue(MAX_VARIANTS_PER_TERM); //maxNum variants considered for any one term
                   float minScore=0;
                   Term startTerm=internSavingTemplateTerm.createTerm(term);
-                  FuzzyTermsEnum fe = new FuzzyTermsEnum(reader, startTerm, f.minSimilarity, f.prefixLength);
+                  AttributeSource atts = new AttributeSource();
+                  MultiTermQuery.MaxNonCompetitiveBoostAttribute maxBoostAtt =
+                    atts.addAttribute(MultiTermQuery.MaxNonCompetitiveBoostAttribute.class);
+                  FuzzyTermsEnum fe = new FuzzyTermsEnum(reader, atts, startTerm, f.minSimilarity, f.prefixLength);
                   //store the df so all variants use same idf
                   int df = reader.docFreq(startTerm);
                   int numVariants=0;
@@ -217,7 +221,7 @@ public class FuzzyLikeThisQuery extends 
                           variantsQ.insertWithOverflow(st);
                           minScore = variantsQ.top().score; // maintain minScore
                         }
-                        boostAtt.setMaxNonCompetitiveBoost(variantsQ.size() >= MAX_VARIANTS_PER_TERM ? minScore : Float.NEGATIVE_INFINITY);
+                        maxBoostAtt.setMaxNonCompetitiveBoost(variantsQ.size() >= MAX_VARIANTS_PER_TERM ? minScore : Float.NEGATIVE_INFINITY);
                       }
                     }
 

Modified: lucene/dev/branches/docvalues/lucene/contrib/queries/src/java/org/apache/lucene/search/regex/RegexQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queries/src/java/org/apache/lucene/search/regex/RegexQuery.java?rev=1025539&r1=1025538&r2=1025539&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queries/src/java/org/apache/lucene/search/regex/RegexQuery.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queries/src/java/org/apache/lucene/search/regex/RegexQuery.java Wed Oct 20 12:44:28 2010
@@ -21,6 +21,7 @@ import org.apache.lucene.search.MultiTer
 import org.apache.lucene.search.FilteredTermsEnum;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.util.AttributeSource;
 import org.apache.lucene.util.ToStringUtils;
 
 import java.io.IOException;
@@ -60,7 +61,7 @@ public class RegexQuery extends MultiTer
   }
 
   @Override
-  protected FilteredTermsEnum getTermsEnum(IndexReader reader) throws IOException {
+  protected FilteredTermsEnum getTermsEnum(IndexReader reader, AttributeSource atts) throws IOException {
     return new RegexTermsEnum(reader, term, regexImpl);
   }
 

Modified: lucene/dev/branches/docvalues/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestRegexQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestRegexQuery.java?rev=1025539&r1=1025538&r2=1025539&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestRegexQuery.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestRegexQuery.java Wed Oct 20 12:44:28 2010
@@ -28,6 +28,7 @@ import org.apache.lucene.index.TermsEnum
 
 import org.apache.lucene.search.spans.SpanNearQuery;
 import org.apache.lucene.search.spans.SpanQuery;
+import org.apache.lucene.util.AttributeSource;
 import org.apache.lucene.util.LuceneTestCase;
 
 public class TestRegexQuery extends LuceneTestCase {
@@ -78,7 +79,7 @@ public class TestRegexQuery extends Luce
   }
 
   public void testMatchAll() throws Exception {
-    TermsEnum terms = new RegexQuery(new Term(FN, "jum.")).getTermsEnum(searcher.getIndexReader());
+    TermsEnum terms = new RegexQuery(new Term(FN, "jum.")).getTermsEnum(searcher.getIndexReader(), new AttributeSource() /*dummy*/);
     // no term should match
     assertNull(terms.next());
   }

Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/processors/QueryNodeProcessorPipeline.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/processors/QueryNodeProcessorPipeline.java?rev=1025539&r1=1025538&r2=1025539&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/processors/QueryNodeProcessorPipeline.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/processors/QueryNodeProcessorPipeline.java Wed Oct 20 12:44:28 2010
@@ -17,7 +17,11 @@ package org.apache.lucene.queryParser.co
  * limitations under the License.
  */
 
+import java.util.Collection;
+import java.util.Iterator;
 import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
 
 import org.apache.lucene.queryParser.core.QueryNodeException;
 import org.apache.lucene.queryParser.core.config.QueryConfigHandler;
@@ -33,11 +37,12 @@ import org.apache.lucene.queryParser.cor
  * processors were on the pipeline.
  * 
  * When a {@link QueryConfigHandler} object is set on a
- * {@link QueryNodeProcessorPipeline}, it takes care of also setting this
+ * {@link QueryNodeProcessorPipeline}, it also takes care of setting this
  * {@link QueryConfigHandler} on all processor on pipeline.
  * 
  */
-public class QueryNodeProcessorPipeline implements QueryNodeProcessor {
+public class QueryNodeProcessorPipeline implements QueryNodeProcessor,
+    List<QueryNodeProcessor> {
 
   private LinkedList<QueryNodeProcessor> processors = new LinkedList<QueryNodeProcessor>();
 
@@ -74,11 +79,10 @@ public class QueryNodeProcessorPipeline 
    * For reference about this method check:
    * {@link QueryNodeProcessor#process(QueryNode)}.
    * 
-   * @param queryTree
-   *          the query node tree to be processed
+   * @param queryTree the query node tree to be processed
    * 
-   * @throws QueryNodeException
-   *           if something goes wrong during the query node processing
+   * @throws QueryNodeException if something goes wrong during the query node
+   *         processing
    * 
    * @see QueryNode
    */
@@ -96,9 +100,12 @@ public class QueryNodeProcessorPipeline 
    * Adds a processor to the pipeline, it's always added to the end of the
    * pipeline.
    * 
-   * @param processor
-   *          the processor to be added
+   * @deprecated this class now conforms to {@link List} interface, so use
+   *             {@link #add(QueryNodeProcessor)} instead
+   * 
+   * @param processor the processor to be added
    */
+  @Deprecated
   public void addProcessor(QueryNodeProcessor processor) {
     this.processors.add(processor);
 
@@ -110,8 +117,7 @@ public class QueryNodeProcessorPipeline 
    * For reference about this method check:
    * {@link QueryNodeProcessor#setQueryConfigHandler(QueryConfigHandler)}.
    * 
-   * @param queryConfigHandler
-   *          the query configuration handler to be set.
+   * @param queryConfigHandler the query configuration handler to be set.
    * 
    * @see QueryNodeProcessor#getQueryConfigHandler()
    * @see QueryConfigHandler
@@ -125,4 +131,195 @@ public class QueryNodeProcessorPipeline 
 
   }
 
+  /**
+   * @see List#add(Object)
+   */
+  public boolean add(QueryNodeProcessor processor) {
+    boolean added = this.processors.add(processor);
+
+    if (added) {
+      processor.setQueryConfigHandler(this.queryConfig);
+    }
+
+    return added;
+
+  }
+
+  /**
+   * @see List#add(int, Object)
+   */
+  public void add(int index, QueryNodeProcessor processor) {
+    this.processors.add(index, processor);
+    processor.setQueryConfigHandler(this.queryConfig);
+
+  }
+
+  /**
+   * @see List#addAll(Collection)
+   */
+  public boolean addAll(Collection<? extends QueryNodeProcessor> c) {
+    boolean anyAdded = this.processors.addAll(c);
+
+    for (QueryNodeProcessor processor : c) {
+      processor.setQueryConfigHandler(this.queryConfig);
+    }
+
+    return anyAdded;
+
+  }
+
+  /**
+   * @see List#addAll(int, Collection)
+   */
+  public boolean addAll(int index, Collection<? extends QueryNodeProcessor> c) {
+    boolean anyAdded = this.processors.addAll(index, c);
+
+    for (QueryNodeProcessor processor : c) {
+      processor.setQueryConfigHandler(this.queryConfig);
+    }
+
+    return anyAdded;
+    
+  }
+
+  /**
+   * @see List#clear()
+   */
+  public void clear() {
+    this.processors.clear();
+  }
+
+  /**
+   * @see List#contains(Object)
+   */
+  public boolean contains(Object o) {
+    return this.processors.contains(o);
+  }
+
+  /**
+   * @see List#containsAll(Collection)
+   */
+  public boolean containsAll(Collection<?> c) {
+    return this.processors.containsAll(c);
+  }
+
+  /**
+   * @see List#get(int)
+   */
+  public QueryNodeProcessor get(int index) {
+    return this.processors.get(index);
+  }
+
+  /**
+   * @see List#indexOf(Object)
+   */
+  public int indexOf(Object o) {
+    return this.processors.indexOf(o);
+  }
+
+  /**
+   * @see List#isEmpty()
+   */
+  public boolean isEmpty() {
+    return this.processors.isEmpty();
+  }
+
+  /**
+   * @see List#iterator()
+   */
+  public Iterator<QueryNodeProcessor> iterator() {
+    return this.processors.iterator();
+  }
+
+  /**
+   * @see List#lastIndexOf(Object)
+   */
+  public int lastIndexOf(Object o) {
+    return this.processors.lastIndexOf(o);
+  }
+
+  /**
+   * @see List#listIterator()
+   */
+  public ListIterator<QueryNodeProcessor> listIterator() {
+    return this.processors.listIterator();
+  }
+
+  /**
+   * @see List#listIterator(int)
+   */
+  public ListIterator<QueryNodeProcessor> listIterator(int index) {
+    return this.processors.listIterator(index);
+  }
+
+  /**
+   * @see List#remove(Object)
+   */
+  public boolean remove(Object o) {
+    return this.processors.remove(o);
+  }
+
+  /**
+   * @see List#remove(int)
+   */
+  public QueryNodeProcessor remove(int index) {
+    return this.processors.remove(index);
+  }
+
+  /**
+   * @see List#removeAll(Collection)
+   */
+  public boolean removeAll(Collection<?> c) {
+    return this.processors.removeAll(c);
+  }
+
+  /**
+   * @see List#retainAll(Collection)
+   */
+  public boolean retainAll(Collection<?> c) {
+    return this.processors.retainAll(c);
+  }
+
+  /**
+   * @see List#set(int, Object)
+   */
+  public QueryNodeProcessor set(int index, QueryNodeProcessor processor) {
+    QueryNodeProcessor oldProcessor = this.processors.set(index, processor);
+    
+    if (oldProcessor != processor) {
+      processor.setQueryConfigHandler(this.queryConfig);
+    }
+    
+    return oldProcessor;
+    
+  }
+
+  /**
+   * @see List#size()
+   */
+  public int size() {
+    return this.processors.size();
+  }
+
+  /**
+   * @see List#subList(int, int)
+   */
+  public List<QueryNodeProcessor> subList(int fromIndex, int toIndex) {
+    return this.processors.subList(fromIndex, toIndex);
+  }
+
+  /**
+   * @see List#toArray(Object[])
+   */
+  public <T> T[] toArray(T[] array) {
+    return this.processors.toArray(array);
+  }
+
+  /**
+   * @see List#toArray()
+   */
+  public Object[] toArray() {
+    return this.processors.toArray();
+  }
+
 }

Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/MultiFieldQueryParserWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/MultiFieldQueryParserWrapper.java?rev=1025539&r1=1025538&r2=1025539&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/MultiFieldQueryParserWrapper.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/MultiFieldQueryParserWrapper.java Wed Oct 20 12:44:28 2010
@@ -74,8 +74,7 @@ public class MultiFieldQueryParserWrappe
    * what fields they appear.
    * </p>
    */
-  @SuppressWarnings("unchecked")
-public MultiFieldQueryParserWrapper(String[] fields, Analyzer analyzer, Map boosts) {
+public MultiFieldQueryParserWrapper(String[] fields, Analyzer analyzer, Map<String, Float> boosts) {
     this(fields, analyzer);
     StandardQueryParser qpHelper = getQueryParserHelper();
 

Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/QueryParserWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/QueryParserWrapper.java?rev=1025539&r1=1025538&r2=1025539&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/QueryParserWrapper.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/QueryParserWrapper.java Wed Oct 20 12:44:28 2010
@@ -49,6 +49,7 @@ import org.apache.lucene.queryParser.sta
 import org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler;
 import org.apache.lucene.queryParser.standard.parser.StandardSyntaxParser;
 import org.apache.lucene.queryParser.standard.processors.StandardQueryNodeProcessorPipeline;
+import org.apache.lucene.search.BooleanClause;
 import org.apache.lucene.search.FuzzyQuery;
 import org.apache.lucene.search.MultiTermQuery;
 import org.apache.lucene.search.Query;
@@ -462,8 +463,7 @@ public class QueryParserWrapper {
     throw new UnsupportedOperationException();
   }
 
-  @SuppressWarnings("unchecked")
-  protected Query getBooleanQuery(List clauses, boolean disableCoord)
+  protected Query getBooleanQuery(List<BooleanClause> clauses, boolean disableCoord)
       throws ParseException {
     throw new UnsupportedOperationException();
   }

Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/StandardQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/StandardQueryParser.java?rev=1025539&r1=1025538&r2=1025539&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/StandardQueryParser.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/StandardQueryParser.java Wed Oct 20 12:44:28 2010
@@ -413,7 +413,7 @@ public class StandardQueryParser extends
     attr.setFuzzyMinSimilarity(fuzzyMinSim);
   }
   
-  public void setFieldsBoost(Map<CharSequence, Float> boosts) {
+  public void setFieldsBoost(Map<String, Float> boosts) {
     FieldBoostMapAttribute attr = getQueryConfigHandler().addAttribute(FieldBoostMapAttribute.class);
     attr.setFieldBoostMap(boosts);
   }

Modified: lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldBoostMapAttribute.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldBoostMapAttribute.java?rev=1025539&r1=1025538&r2=1025539&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldBoostMapAttribute.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldBoostMapAttribute.java Wed Oct 20 12:44:28 2010
@@ -30,6 +30,6 @@ public interface FieldBoostMapAttribute 
   /**
    * @param boosts a mapping from field name to its default boost
    */
-  public void setFieldBoostMap(Map<CharSequence, Float> boosts);
-  public Map<CharSequence, Float> getFieldBoostMap();
+  public void setFieldBoostMap(Map<String, Float> boosts);
+  public Map<String, Float> getFieldBoostMap();
 }



Mime
View raw message