You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/12/10 17:37:54 UTC
svn commit: r1419570 [1/14] - in /lucene/dev/branches/lucene4547: ./
dev-tools/ dev-tools/eclipse/ dev-tools/idea/.idea/libraries/
dev-tools/idea/lucene/analysis/icu/
dev-tools/idea/solr/contrib/dataimporthandler/ dev-tools/maven/
dev-tools/maven/lucen...
Author: rmuir
Date: Mon Dec 10 16:36:47 2012
New Revision: 1419570
URL: http://svn.apache.org/viewvc?rev=1419570&view=rev
Log:
merge trunk (1407149:1419557)
Added:
lucene/dev/branches/lucene4547/dev-tools/idea/.idea/libraries/Derby.xml
- copied unchanged from r1419557, lucene/dev/trunk/dev-tools/idea/.idea/libraries/Derby.xml
lucene/dev/branches/lucene4547/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/KeywordTokenizer.rbbi
- copied unchanged from r1419557, lucene/dev/trunk/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/KeywordTokenizer.rbbi
lucene/dev/branches/lucene4547/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/Latin-break-only-on-whitespace.rbbi
- copied unchanged from r1419557, lucene/dev/trunk/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/Latin-break-only-on-whitespace.rbbi
lucene/dev/branches/lucene4547/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/Latin-dont-break-on-hyphens.rbbi
- copied unchanged from r1419557, lucene/dev/trunk/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/Latin-dont-break-on-hyphens.rbbi
lucene/dev/branches/lucene4547/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteEnwikiLineDocTask.java
- copied unchanged from r1419557, lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteEnwikiLineDocTask.java
lucene/dev/branches/lucene4547/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSourceTest.java
- copied unchanged from r1419557, lucene/dev/trunk/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSourceTest.java
lucene/dev/branches/lucene4547/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteEnwikiLineDocTaskTest.java
- copied unchanged from r1419557, lucene/dev/trunk/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteEnwikiLineDocTaskTest.java
lucene/dev/branches/lucene4547/lucene/classification/src/java/org/apache/lucene/classification/utils/
- copied from r1419557, lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/utils/
lucene/dev/branches/lucene4547/lucene/classification/src/test/org/apache/lucene/classification/utils/
- copied from r1419557, lucene/dev/trunk/lucene/classification/src/test/org/apache/lucene/classification/utils/
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/compressing/
- copied from r1419557, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41StoredFieldsFormat.java
- copied unchanged from r1419557, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41StoredFieldsFormat.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/search/doc-files/
- copied from r1419557, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/doc-files/
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/store/RateLimitedDirectoryWrapper.java
- copied unchanged from r1419557, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/RateLimitedDirectoryWrapper.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/store/RateLimitedIndexOutput.java
- copied unchanged from r1419557, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/RateLimitedIndexOutput.java
lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/codecs/compressing/
- copied from r1419557, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/compressing/
lucene/dev/branches/lucene4547/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/ParallelTaxonomyArrays.java
- copied unchanged from r1419557, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/ParallelTaxonomyArrays.java
lucene/dev/branches/lucene4547/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestConcurrentFacetedIndexing.java
- copied unchanged from r1419557, lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestConcurrentFacetedIndexing.java
lucene/dev/branches/lucene4547/lucene/licenses/asm-debug-all-4.1.jar.sha1
- copied unchanged from r1419557, lucene/dev/trunk/lucene/licenses/asm-debug-all-4.1.jar.sha1
lucene/dev/branches/lucene4547/lucene/licenses/junit4-ant-2.0.5.jar.sha1
- copied unchanged from r1419557, lucene/dev/trunk/lucene/licenses/junit4-ant-2.0.5.jar.sha1
lucene/dev/branches/lucene4547/lucene/licenses/nekohtml-1.9.17.jar.sha1
- copied unchanged from r1419557, lucene/dev/trunk/lucene/licenses/nekohtml-1.9.17.jar.sha1
lucene/dev/branches/lucene4547/lucene/licenses/randomizedtesting-runner-2.0.5.jar.sha1
- copied unchanged from r1419557, lucene/dev/trunk/lucene/licenses/randomizedtesting-runner-2.0.5.jar.sha1
lucene/dev/branches/lucene4547/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/SpatialOpRecursivePrefixTreeTest.java
- copied unchanged from r1419557, lucene/dev/trunk/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/SpatialOpRecursivePrefixTreeTest.java
lucene/dev/branches/lucene4547/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/DummyCompressingCodec.java
- copied unchanged from r1419557, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/DummyCompressingCodec.java
lucene/dev/branches/lucene4547/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/FastCompressingCodec.java
- copied unchanged from r1419557, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/FastCompressingCodec.java
lucene/dev/branches/lucene4547/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/FastDecompressionCompressingCodec.java
- copied unchanged from r1419557, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/FastDecompressionCompressingCodec.java
lucene/dev/branches/lucene4547/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/HighCompressionCompressingCodec.java
- copied unchanged from r1419557, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/HighCompressionCompressingCodec.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHProperties.java
- copied unchanged from r1419557, lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHProperties.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DateFormatEvaluator.java
- copied unchanged from r1419557, lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DateFormatEvaluator.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrQueryEscapingEvaluator.java
- copied unchanged from r1419557, lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrQueryEscapingEvaluator.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SqlEscapingEvaluator.java
- copied unchanged from r1419557, lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SqlEscapingEvaluator.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/UrlEvaluator.java
- copied unchanged from r1419557, lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/UrlEvaluator.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/PropertyWriter.java
- copied unchanged from r1419557, lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/PropertyWriter.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java
- copied unchanged from r1419557, lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestBuiltInEvaluators.java
- copied unchanged from r1419557, lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestBuiltInEvaluators.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestNestedChildren.java
- copied unchanged from r1419557, lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestNestedChildren.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSimplePropertiesWriter.java
- copied unchanged from r1419557, lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSimplePropertiesWriter.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestVariableResolverEndToEnd.java
- copied unchanged from r1419557, lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestVariableResolverEndToEnd.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/parser/
- copied from r1419557, lucene/dev/trunk/solr/core/src/java/org/apache/solr/parser/
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/search/SyntaxError.java
- copied unchanged from r1419557, lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SyntaxError.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/spelling/suggest/fst/FuzzyLookupFactory.java
- copied unchanged from r1419557, lucene/dev/trunk/solr/core/src/java/org/apache/solr/spelling/suggest/fst/FuzzyLookupFactory.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/util/PropertiesInputStream.java
- copied unchanged from r1419557, lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/PropertiesInputStream.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/util/PropertiesOutputStream.java
- copied unchanged from r1419557, lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/PropertiesOutputStream.java
lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/fuzzysuggest.txt
- copied unchanged from r1419557, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/fuzzysuggest.txt
lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/schema-behavior.xml
- copied unchanged from r1419557, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-behavior.xml
lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/schema-eff.xml
- copied unchanged from r1419557, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-eff.xml
lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/external_eff
- copied unchanged from r1419557, lucene/dev/trunk/solr/core/src/test-files/solr/external_eff
lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/cloud/ShardRoutingTest.java
- copied unchanged from r1419557, lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ShardRoutingTest.java
lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/schema/ExternalFileFieldSortTest.java
- copied unchanged from r1419557, lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/ExternalFileFieldSortTest.java
lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/schema/SchemaVersionSpecificBehaviorTest.java
- copied unchanged from r1419557, lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/SchemaVersionSpecificBehaviorTest.java
lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/spelling/suggest/TestFuzzyAnalyzedSuggestions.java
- copied unchanged from r1419557, lucene/dev/trunk/solr/core/src/test/org/apache/solr/spelling/suggest/TestFuzzyAnalyzedSuggestions.java
lucene/dev/branches/lucene4547/solr/example/solr-webapp/.gitignore
- copied unchanged from r1419557, lucene/dev/trunk/solr/example/solr-webapp/.gitignore
lucene/dev/branches/lucene4547/solr/licenses/derby-10.9.1.0.jar.sha1
- copied unchanged from r1419557, lucene/dev/trunk/solr/licenses/derby-10.9.1.0.jar.sha1
lucene/dev/branches/lucene4547/solr/licenses/derby-LICENSE-ASL.txt
- copied unchanged from r1419557, lucene/dev/trunk/solr/licenses/derby-LICENSE-ASL.txt
lucene/dev/branches/lucene4547/solr/licenses/derby-NOTICE.txt
- copied unchanged from r1419557, lucene/dev/trunk/solr/licenses/derby-NOTICE.txt
lucene/dev/branches/lucene4547/solr/licenses/guava-13.0.1.jar.sha1
- copied unchanged from r1419557, lucene/dev/trunk/solr/licenses/guava-13.0.1.jar.sha1
lucene/dev/branches/lucene4547/solr/licenses/jetty-continuation-8.1.8.v20121106.jar.sha1
- copied unchanged from r1419557, lucene/dev/trunk/solr/licenses/jetty-continuation-8.1.8.v20121106.jar.sha1
lucene/dev/branches/lucene4547/solr/licenses/jetty-deploy-8.1.8.v20121106.jar.sha1
- copied unchanged from r1419557, lucene/dev/trunk/solr/licenses/jetty-deploy-8.1.8.v20121106.jar.sha1
lucene/dev/branches/lucene4547/solr/licenses/jetty-http-8.1.8.v20121106.jar.sha1
- copied unchanged from r1419557, lucene/dev/trunk/solr/licenses/jetty-http-8.1.8.v20121106.jar.sha1
lucene/dev/branches/lucene4547/solr/licenses/jetty-io-8.1.8.v20121106.jar.sha1
- copied unchanged from r1419557, lucene/dev/trunk/solr/licenses/jetty-io-8.1.8.v20121106.jar.sha1
lucene/dev/branches/lucene4547/solr/licenses/jetty-jmx-8.1.8.v20121106.jar.sha1
- copied unchanged from r1419557, lucene/dev/trunk/solr/licenses/jetty-jmx-8.1.8.v20121106.jar.sha1
lucene/dev/branches/lucene4547/solr/licenses/jetty-security-8.1.8.v20121106.jar.sha1
- copied unchanged from r1419557, lucene/dev/trunk/solr/licenses/jetty-security-8.1.8.v20121106.jar.sha1
lucene/dev/branches/lucene4547/solr/licenses/jetty-server-8.1.8.v20121106.jar.sha1
- copied unchanged from r1419557, lucene/dev/trunk/solr/licenses/jetty-server-8.1.8.v20121106.jar.sha1
lucene/dev/branches/lucene4547/solr/licenses/jetty-servlet-8.1.8.v20121106.jar.sha1
- copied unchanged from r1419557, lucene/dev/trunk/solr/licenses/jetty-servlet-8.1.8.v20121106.jar.sha1
lucene/dev/branches/lucene4547/solr/licenses/jetty-util-8.1.8.v20121106.jar.sha1
- copied unchanged from r1419557, lucene/dev/trunk/solr/licenses/jetty-util-8.1.8.v20121106.jar.sha1
lucene/dev/branches/lucene4547/solr/licenses/jetty-webapp-8.1.8.v20121106.jar.sha1
- copied unchanged from r1419557, lucene/dev/trunk/solr/licenses/jetty-webapp-8.1.8.v20121106.jar.sha1
lucene/dev/branches/lucene4547/solr/licenses/jetty-xml-8.1.8.v20121106.jar.sha1
- copied unchanged from r1419557, lucene/dev/trunk/solr/licenses/jetty-xml-8.1.8.v20121106.jar.sha1
lucene/dev/branches/lucene4547/solr/licenses/junit4-ant-2.0.5.jar.sha1
- copied unchanged from r1419557, lucene/dev/trunk/solr/licenses/junit4-ant-2.0.5.jar.sha1
lucene/dev/branches/lucene4547/solr/licenses/randomizedtesting-runner-2.0.5.jar.sha1
- copied unchanged from r1419557, lucene/dev/trunk/solr/licenses/randomizedtesting-runner-2.0.5.jar.sha1
lucene/dev/branches/lucene4547/solr/licenses/zookeeper-3.4.5.jar.sha1
- copied unchanged from r1419557, lucene/dev/trunk/solr/licenses/zookeeper-3.4.5.jar.sha1
lucene/dev/branches/lucene4547/solr/solrj/src/java/org/apache/solr/common/cloud/CompositeIdRouter.java
- copied unchanged from r1419557, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/CompositeIdRouter.java
lucene/dev/branches/lucene4547/solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java
- copied unchanged from r1419557, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java
lucene/dev/branches/lucene4547/solr/solrj/src/java/org/apache/solr/common/cloud/DocRouter.java
- copied unchanged from r1419557, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/DocRouter.java
lucene/dev/branches/lucene4547/solr/solrj/src/java/org/apache/solr/common/cloud/HashBasedRouter.java
- copied unchanged from r1419557, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/HashBasedRouter.java
lucene/dev/branches/lucene4547/solr/solrj/src/java/org/apache/solr/common/cloud/ImplicitDocRouter.java
- copied unchanged from r1419557, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ImplicitDocRouter.java
lucene/dev/branches/lucene4547/solr/solrj/src/java/org/apache/solr/common/cloud/PlainIdRouter.java
- copied unchanged from r1419557, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/PlainIdRouter.java
Removed:
lucene/dev/branches/lucene4547/lucene/codecs/src/java/org/apache/lucene/codecs/compressing/
lucene/dev/branches/lucene4547/lucene/codecs/src/test/org/apache/lucene/codecs/compressing/
lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/util/TestBitUtil.java
lucene/dev/branches/lucene4547/lucene/facet/src/java/org/apache/lucene/facet/index/categorypolicy/DefaultOrdinalPolicy.java
lucene/dev/branches/lucene4547/lucene/facet/src/java/org/apache/lucene/facet/index/categorypolicy/DefaultPathPolicy.java
lucene/dev/branches/lucene4547/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/InconsistentTaxonomyException.java
lucene/dev/branches/lucene4547/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/ParentArray.java
lucene/dev/branches/lucene4547/lucene/licenses/asm-debug-all-4.0.jar.sha1
lucene/dev/branches/lucene4547/lucene/licenses/junit4-ant-2.0.4.jar.sha1
lucene/dev/branches/lucene4547/lucene/licenses/nekohtml-1.9.15.jar.sha1
lucene/dev/branches/lucene4547/lucene/licenses/randomizedtesting-runner-2.0.4.jar.sha1
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHPropertiesWriter.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/EvaluatorBag.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/TemplateString.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/VariableResolverImpl.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestEvaluatorBag.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessor2.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestTemplateString.java
lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/solr-lots-of-cores.xml
lucene/dev/branches/lucene4547/solr/licenses/guava-r05.jar.sha1
lucene/dev/branches/lucene4547/solr/licenses/jetty-continuation-8.1.7.v20120910.jar.sha1
lucene/dev/branches/lucene4547/solr/licenses/jetty-deploy-8.1.7.v20120910.jar.sha1
lucene/dev/branches/lucene4547/solr/licenses/jetty-http-8.1.7.v20120910.jar.sha1
lucene/dev/branches/lucene4547/solr/licenses/jetty-io-8.1.7.v20120910.jar.sha1
lucene/dev/branches/lucene4547/solr/licenses/jetty-jmx-8.1.7.v20120910.jar.sha1
lucene/dev/branches/lucene4547/solr/licenses/jetty-security-8.1.7.v20120910.jar.sha1
lucene/dev/branches/lucene4547/solr/licenses/jetty-server-8.1.7.v20120910.jar.sha1
lucene/dev/branches/lucene4547/solr/licenses/jetty-servlet-8.1.7.v20120910.jar.sha1
lucene/dev/branches/lucene4547/solr/licenses/jetty-util-8.1.7.v20120910.jar.sha1
lucene/dev/branches/lucene4547/solr/licenses/jetty-webapp-8.1.7.v20120910.jar.sha1
lucene/dev/branches/lucene4547/solr/licenses/jetty-xml-8.1.7.v20120910.jar.sha1
lucene/dev/branches/lucene4547/solr/licenses/junit4-ant-2.0.4.jar.sha1
lucene/dev/branches/lucene4547/solr/licenses/randomizedtesting-runner-2.0.4.jar.sha1
lucene/dev/branches/lucene4547/solr/licenses/zookeeper-3.3.6.jar.sha1
lucene/dev/branches/lucene4547/solr/solrj/src/java/org/apache/solr/common/cloud/HashPartitioner.java
Modified:
lucene/dev/branches/lucene4547/ (props changed)
lucene/dev/branches/lucene4547/build.xml
lucene/dev/branches/lucene4547/dev-tools/ (props changed)
lucene/dev/branches/lucene4547/dev-tools/eclipse/dot.classpath
lucene/dev/branches/lucene4547/dev-tools/eclipse/dot.project
lucene/dev/branches/lucene4547/dev-tools/idea/.idea/libraries/JUnit.xml
lucene/dev/branches/lucene4547/dev-tools/idea/lucene/analysis/icu/icu.iml
lucene/dev/branches/lucene4547/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml
lucene/dev/branches/lucene4547/dev-tools/maven/lucene/benchmark/pom.xml.template
lucene/dev/branches/lucene4547/dev-tools/maven/pom.xml.template
lucene/dev/branches/lucene4547/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template
lucene/dev/branches/lucene4547/dev-tools/maven/solr/solrj/src/java/pom.xml.template
lucene/dev/branches/lucene4547/extra-targets.xml
lucene/dev/branches/lucene4547/lucene/ (props changed)
lucene/dev/branches/lucene4547/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene4547/lucene/analysis/ (props changed)
lucene/dev/branches/lucene4547/lucene/analysis/common/ (props changed)
lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountAnalyzer.java
lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountFilter.java
lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountFilterFactory.java
lucene/dev/branches/lucene4547/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java
lucene/dev/branches/lucene4547/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java
lucene/dev/branches/lucene4547/lucene/analysis/icu/build.xml
lucene/dev/branches/lucene4547/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizerFactory.java
lucene/dev/branches/lucene4547/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizerFactory.java
lucene/dev/branches/lucene4547/lucene/analysis/uima/build.xml
lucene/dev/branches/lucene4547/lucene/benchmark/ (props changed)
lucene/dev/branches/lucene4547/lucene/benchmark/build.xml
lucene/dev/branches/lucene4547/lucene/benchmark/conf/extractWikipedia.alg
lucene/dev/branches/lucene4547/lucene/benchmark/ivy.xml
lucene/dev/branches/lucene4547/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DemoHTMLParser.java
lucene/dev/branches/lucene4547/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.java
lucene/dev/branches/lucene4547/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTask.java
lucene/dev/branches/lucene4547/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.java
lucene/dev/branches/lucene4547/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTaskTest.java
lucene/dev/branches/lucene4547/lucene/classification/ (props changed)
lucene/dev/branches/lucene4547/lucene/classification/src/java/org/apache/lucene/classification/KNearestNeighborClassifier.java
lucene/dev/branches/lucene4547/lucene/classification/src/java/org/apache/lucene/classification/SimpleNaiveBayesClassifier.java
lucene/dev/branches/lucene4547/lucene/classification/src/test/org/apache/lucene/classification/ClassificationTestBase.java
lucene/dev/branches/lucene4547/lucene/codecs/ (props changed)
lucene/dev/branches/lucene4547/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
lucene/dev/branches/lucene4547/lucene/common-build.xml (contents, props changed)
lucene/dev/branches/lucene4547/lucene/core/ (props changed)
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsReader.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/VarStraightBytesImpl.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41Codec.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/IndexCommit.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/LiveIndexWriterConfig.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/TwoPhaseCommit.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/TwoPhaseCommitTool.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/search/CachingWrapperFilter.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/search/NRTManager.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/search/NumericRangeQuery.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/search/ReferenceManager.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/store/FSDirectory.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/store/RateLimiter.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/BitUtil.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/FixedBitSet.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/OpenBitSet.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/PagedBytes.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/fst/Builder.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java
lucene/dev/branches/lucene4547/lucene/core/src/java/overview.html
lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestBagOfPositions.java
lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestBagOfPostings.java
lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java
lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDeletionPolicy.java
lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReaderReopen.java
lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java
lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java
lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java
lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java
lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestTwoPhaseCommitTool.java
lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestNRTManager.java
lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java
lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestShardSearching.java
lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/util/TestPagedBytes.java
lucene/dev/branches/lucene4547/lucene/facet/ (props changed)
lucene/dev/branches/lucene4547/lucene/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleSearcher.java
lucene/dev/branches/lucene4547/lucene/facet/src/java/org/apache/lucene/facet/enhancements/EnhancementsPayloadIterator.java
lucene/dev/branches/lucene4547/lucene/facet/src/java/org/apache/lucene/facet/index/categorypolicy/OrdinalPolicy.java
lucene/dev/branches/lucene4547/lucene/facet/src/java/org/apache/lucene/facet/index/categorypolicy/PathPolicy.java
lucene/dev/branches/lucene4547/lucene/facet/src/java/org/apache/lucene/facet/index/params/DefaultFacetIndexingParams.java
lucene/dev/branches/lucene4547/lucene/facet/src/java/org/apache/lucene/facet/search/DrillDown.java
lucene/dev/branches/lucene4547/lucene/facet/src/java/org/apache/lucene/facet/search/PayloadIntDecodingIterator.java
lucene/dev/branches/lucene4547/lucene/facet/src/java/org/apache/lucene/facet/search/PayloadIterator.java
lucene/dev/branches/lucene4547/lucene/facet/src/java/org/apache/lucene/facet/search/TopKFacetResultsHandler.java
lucene/dev/branches/lucene4547/lucene/facet/src/java/org/apache/lucene/facet/search/TopKInEachNodeHandler.java
lucene/dev/branches/lucene4547/lucene/facet/src/java/org/apache/lucene/facet/search/params/FacetRequest.java
lucene/dev/branches/lucene4547/lucene/facet/src/java/org/apache/lucene/facet/search/sampling/SamplingParams.java
lucene/dev/branches/lucene4547/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyReader.java
lucene/dev/branches/lucene4547/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyWriter.java
lucene/dev/branches/lucene4547/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/Consts.java
lucene/dev/branches/lucene4547/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java
lucene/dev/branches/lucene4547/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java
lucene/dev/branches/lucene4547/lucene/facet/src/java/org/apache/lucene/util/collections/LRUHashMap.java
lucene/dev/branches/lucene4547/lucene/facet/src/test/org/apache/lucene/facet/FacetTestBase.java
lucene/dev/branches/lucene4547/lucene/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java
lucene/dev/branches/lucene4547/lucene/facet/src/test/org/apache/lucene/facet/index/categorypolicy/OrdinalPolicyTest.java
lucene/dev/branches/lucene4547/lucene/facet/src/test/org/apache/lucene/facet/index/categorypolicy/PathPolicyTest.java
lucene/dev/branches/lucene4547/lucene/facet/src/test/org/apache/lucene/facet/index/params/DefaultFacetIndexingParamsTest.java
lucene/dev/branches/lucene4547/lucene/facet/src/test/org/apache/lucene/facet/search/BaseTestTopK.java
lucene/dev/branches/lucene4547/lucene/facet/src/test/org/apache/lucene/facet/search/DrillDownTest.java
lucene/dev/branches/lucene4547/lucene/facet/src/test/org/apache/lucene/facet/search/TestMultipleCategoryLists.java
lucene/dev/branches/lucene4547/lucene/facet/src/test/org/apache/lucene/facet/search/TestTopKResultsHandler.java
lucene/dev/branches/lucene4547/lucene/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCounts.java
lucene/dev/branches/lucene4547/lucene/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java
lucene/dev/branches/lucene4547/lucene/facet/src/test/org/apache/lucene/facet/search/params/MultiIteratorsPerCLParamsTest.java
lucene/dev/branches/lucene4547/lucene/facet/src/test/org/apache/lucene/facet/search/sampling/BaseSampleTestTopK.java
lucene/dev/branches/lucene4547/lucene/facet/src/test/org/apache/lucene/facet/search/sampling/OversampleWithDepthTest.java
lucene/dev/branches/lucene4547/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyCombined.java
lucene/dev/branches/lucene4547/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyReader.java
lucene/dev/branches/lucene4547/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyWriter.java
lucene/dev/branches/lucene4547/lucene/grouping/ (props changed)
lucene/dev/branches/lucene4547/lucene/grouping/src/java/org/apache/lucene/search/grouping/GroupingSearch.java
lucene/dev/branches/lucene4547/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupingSearchTest.java
lucene/dev/branches/lucene4547/lucene/licenses/ (props changed)
lucene/dev/branches/lucene4547/lucene/queries/ (props changed)
lucene/dev/branches/lucene4547/lucene/queries/src/java/org/apache/lucene/queries/TermsFilter.java
lucene/dev/branches/lucene4547/lucene/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java
lucene/dev/branches/lucene4547/lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java
lucene/dev/branches/lucene4547/lucene/spatial/ (props changed)
lucene/dev/branches/lucene4547/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PointPrefixTreeFieldCacheProvider.java
lucene/dev/branches/lucene4547/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/RecursivePrefixTreeFilter.java
lucene/dev/branches/lucene4547/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/GeohashPrefixTree.java
lucene/dev/branches/lucene4547/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/Node.java
lucene/dev/branches/lucene4547/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/QuadPrefixTree.java
lucene/dev/branches/lucene4547/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTree.java
lucene/dev/branches/lucene4547/lucene/spatial/src/java/org/apache/lucene/spatial/query/SpatialOperation.java
lucene/dev/branches/lucene4547/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialExample.java
lucene/dev/branches/lucene4547/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialTestCase.java
lucene/dev/branches/lucene4547/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialTestQuery.java
lucene/dev/branches/lucene4547/lucene/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java
lucene/dev/branches/lucene4547/lucene/spatial/src/test/org/apache/lucene/spatial/TestTestFramework.java
lucene/dev/branches/lucene4547/lucene/suggest/ (props changed)
lucene/dev/branches/lucene4547/lucene/suggest/src/java/org/apache/lucene/search/spell/WordBreakSpellChecker.java
lucene/dev/branches/lucene4547/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggester.java
lucene/dev/branches/lucene4547/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FuzzySuggester.java
lucene/dev/branches/lucene4547/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletion.java
lucene/dev/branches/lucene4547/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java
lucene/dev/branches/lucene4547/lucene/suggest/src/test/org/apache/lucene/search/spell/TestWordBreakSpellChecker.java
lucene/dev/branches/lucene4547/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggesterTest.java
lucene/dev/branches/lucene4547/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/FuzzySuggesterTest.java
lucene/dev/branches/lucene4547/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/WFSTCompletionTest.java
lucene/dev/branches/lucene4547/lucene/test-framework/ (props changed)
lucene/dev/branches/lucene4547/lucene/test-framework/ivy.xml
lucene/dev/branches/lucene4547/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/CompressingCodec.java
lucene/dev/branches/lucene4547/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java
lucene/dev/branches/lucene4547/lucene/test-framework/src/java/org/apache/lucene/store/MockIndexOutputWrapper.java
lucene/dev/branches/lucene4547/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
lucene/dev/branches/lucene4547/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.Codec
lucene/dev/branches/lucene4547/lucene/tools/ (props changed)
lucene/dev/branches/lucene4547/lucene/tools/build.xml
lucene/dev/branches/lucene4547/lucene/tools/custom-tasks.xml
lucene/dev/branches/lucene4547/lucene/tools/forbiddenApis/commons-io.txt
lucene/dev/branches/lucene4547/lucene/tools/forbiddenApis/executors.txt
lucene/dev/branches/lucene4547/lucene/tools/forbiddenApis/jdk-deprecated.txt
lucene/dev/branches/lucene4547/lucene/tools/forbiddenApis/jdk.txt
lucene/dev/branches/lucene4547/lucene/tools/forbiddenApis/system-out.txt
lucene/dev/branches/lucene4547/lucene/tools/forbiddenApis/tests.txt
lucene/dev/branches/lucene4547/lucene/tools/ivy.xml
lucene/dev/branches/lucene4547/lucene/tools/src/java/org/apache/lucene/validation/ForbiddenApisCheckTask.java
lucene/dev/branches/lucene4547/solr/ (props changed)
lucene/dev/branches/lucene4547/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene4547/solr/build.xml (contents, props changed)
lucene/dev/branches/lucene4547/solr/cloud-dev/ (props changed)
lucene/dev/branches/lucene4547/solr/cloud-dev/functions.sh
lucene/dev/branches/lucene4547/solr/common-build.xml (contents, props changed)
lucene/dev/branches/lucene4547/solr/contrib/ (props changed)
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/build.xml
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/ContextImpl.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DateFormatTransformer.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DebugLogger.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/EntityProcessorWrapper.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/Evaluator.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/FieldReaderDataSource.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/FileDataSource.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/FileListEntityProcessor.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/JdbcDataSource.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/NumberFormatTransformer.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SimplePropertiesWriter.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/TemplateTransformer.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/VariableResolver.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/ZKPropertiesWriter.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/ConfigNameConstants.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/DIHConfiguration.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHCacheTestCase.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHJdbcTestCase.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTestCase.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestClobTransformer.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContextImpl.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDateFormatTransformer.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder2.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFileListEntityProcessor.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFileListWithLineEntityProcessor.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestLineEntityProcessor.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestNumberFormatTransformer.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestRegexTransformer.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessor.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestTemplateTransformer.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestURLDataSource.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestVariableResolver.java
lucene/dev/branches/lucene4547/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java
lucene/dev/branches/lucene4547/solr/core/ (props changed)
lucene/dev/branches/lucene4547/solr/core/build.xml
lucene/dev/branches/lucene4547/solr/core/ivy.xml
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/SolrLogFormatter.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/cloud/AssignShard.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/cloud/DistributedQueue.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/cloud/Overseer.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/cloud/ZkController.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/core/CoreContainer.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/core/DirectoryFactory.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/core/NRTCachingDirectoryFactory.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/core/SolrCore.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/handler/SnapShooter.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/handler/component/PivotFacetHelper.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/response/CSVResponseWriter.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/response/JSONResponseWriter.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/schema/CurrencyField.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/schema/ExternalFileField.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/schema/FieldProperties.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/schema/FieldType.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/schema/LatLonType.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/schema/PointType.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/schema/PrimitiveFieldType.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/schema/SchemaField.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/schema/TextField.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/search/BoostQParserPlugin.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/search/DisMaxQParser.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/search/ExtendedQueryBase.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/search/FunctionQParser.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/search/Grouping.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/search/LuceneQParserPlugin.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/search/NestedQParserPlugin.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/search/QParser.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/search/QueryParsing.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/search/ReturnFields.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/search/SolrConstantScoreQuery.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/search/SolrQueryParser.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/search/SpatialFilterQParser.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/search/SurroundQParserPlugin.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/search/ValueSourceParser.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/search/grouping/CommandHandler.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/QueryCommand.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/update/SplitIndexCommand.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
lucene/dev/branches/lucene4547/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java
lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/schema12.xml
lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml
lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
lucene/dev/branches/lucene4547/solr/core/src/test-files/solr/solr.xml
lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java
lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/cloud/ClusterStateTest.java
lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java
lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java
lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/cloud/TestHashPartitioner.java
lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java
lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java
lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/core/DummyValueSourceParser.java
lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java
lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/core/TestConfig.java
lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/core/TestLazyCores.java
lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/response/TestCSVResponseWriter.java
lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/search/FooQParserPlugin.java
lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/search/TestFoldingMultitermQuery.java
lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/search/TestPseudoReturnFields.java
lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java
lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/search/TestValueSourceCache.java
lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/search/function/NvlValueSourceParser.java
lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java
lucene/dev/branches/lucene4547/solr/core/src/test/org/apache/solr/util/DateMathParserTest.java
lucene/dev/branches/lucene4547/solr/example/ (props changed)
lucene/dev/branches/lucene4547/solr/example/build.xml
lucene/dev/branches/lucene4547/solr/example/example-DIH/ivy.xml
lucene/dev/branches/lucene4547/solr/example/ivy.xml
lucene/dev/branches/lucene4547/solr/example/solr/collection1/conf/solrconfig.xml
lucene/dev/branches/lucene4547/solr/licenses/ (props changed)
lucene/dev/branches/lucene4547/solr/licenses/start.jar.sha1
lucene/dev/branches/lucene4547/solr/solrj/ (props changed)
lucene/dev/branches/lucene4547/solr/solrj/ivy.xml
lucene/dev/branches/lucene4547/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java
lucene/dev/branches/lucene4547/solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.java
lucene/dev/branches/lucene4547/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java
lucene/dev/branches/lucene4547/solr/solrj/src/java/org/apache/solr/common/cloud/Replica.java
lucene/dev/branches/lucene4547/solr/solrj/src/java/org/apache/solr/common/cloud/Slice.java
lucene/dev/branches/lucene4547/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
lucene/dev/branches/lucene4547/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZooKeeper.java
lucene/dev/branches/lucene4547/solr/solrj/src/java/org/apache/solr/common/cloud/ZkNodeProps.java
lucene/dev/branches/lucene4547/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
lucene/dev/branches/lucene4547/solr/solrj/src/java/org/apache/solr/common/params/MoreLikeThisParams.java
lucene/dev/branches/lucene4547/solr/solrj/src/java/org/apache/solr/common/params/ShardParams.java
lucene/dev/branches/lucene4547/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java
lucene/dev/branches/lucene4547/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java
lucene/dev/branches/lucene4547/solr/test-framework/ (props changed)
lucene/dev/branches/lucene4547/solr/test-framework/ivy.xml
lucene/dev/branches/lucene4547/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
lucene/dev/branches/lucene4547/solr/test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.java
lucene/dev/branches/lucene4547/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
lucene/dev/branches/lucene4547/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java
lucene/dev/branches/lucene4547/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java
lucene/dev/branches/lucene4547/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
lucene/dev/branches/lucene4547/solr/test-framework/src/java/org/apache/solr/core/MockDirectoryFactory.java
lucene/dev/branches/lucene4547/solr/test-framework/src/java/org/apache/solr/util/RevertDefaultThreadHandlerRule.java
Modified: lucene/dev/branches/lucene4547/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/build.xml?rev=1419570&r1=1419569&r2=1419570&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/build.xml (original)
+++ lucene/dev/branches/lucene4547/build.xml Mon Dec 10 16:36:47 2012
@@ -298,7 +298,7 @@
<antcall>
<param name="run.clover" value="true"/>
<!-- must be 1, as clover does not like parallel test runs: -->
- <param name="tests.jvms" value="1"/>
+ <param name="tests.jvms.override" value="1"/>
<!-- Also override some other props to be fast: -->
<param name="tests.multiplier" value="1"/>
<param name="tests.nightly" value="false"/>
Modified: lucene/dev/branches/lucene4547/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/dev-tools/eclipse/dot.classpath?rev=1419570&r1=1419569&r2=1419570&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/lucene4547/dev-tools/eclipse/dot.classpath Mon Dec 10 16:36:47 2012
@@ -109,7 +109,7 @@
<classpathentry kind="lib" path="lucene/analysis/morfologik/lib/morfologik-stemming-1.5.3.jar"/>
<classpathentry kind="lib" path="lucene/benchmark/lib/commons-compress-1.4.1.jar"/>
<classpathentry kind="lib" path="lucene/benchmark/lib/xercesImpl-2.9.1.jar"/>
- <classpathentry kind="lib" path="lucene/benchmark/lib/nekohtml-1.9.15.jar"/>
+ <classpathentry kind="lib" path="lucene/benchmark/lib/nekohtml-1.9.17.jar"/>
<classpathentry kind="lib" path="solr/core/lib/commons-fileupload-1.2.1.jar"/>
<classpathentry kind="lib" path="solr/core/lib/commons-cli-1.2.jar"/>
<classpathentry kind="lib" path="solr/solrj/lib/httpclient-4.1.3.jar"/>
@@ -118,25 +118,25 @@
<classpathentry kind="lib" path="solr/solrj/lib/commons-io-2.1.jar"/>
<classpathentry kind="lib" path="solr/core/lib/commons-lang-2.6.jar"/>
<classpathentry kind="lib" path="solr/core/lib/easymock-2.2.jar"/>
- <classpathentry kind="lib" path="solr/core/lib/guava-r05.jar"/>
+ <classpathentry kind="lib" path="solr/core/lib/guava-13.0.1.jar"/>
<classpathentry kind="lib" path="solr/core/lib/metrics-core-2.1.2.jar"/>
<classpathentry kind="lib" path="solr/solrj/lib/jcl-over-slf4j-1.6.4.jar"/>
<classpathentry kind="lib" path="solr/solrj/lib/log4j-over-slf4j-1.6.4.jar"/>
<classpathentry kind="lib" path="solr/solrj/lib/slf4j-api-1.6.4.jar"/>
<classpathentry kind="lib" path="solr/solrj/lib/slf4j-jdk14-1.6.4.jar"/>
<classpathentry kind="lib" path="solr/solrj/lib/wstx-asl-3.2.7.jar"/>
- <classpathentry kind="lib" path="solr/solrj/lib/zookeeper-3.3.6.jar"/>
- <classpathentry kind="lib" path="solr/example/lib/jetty-continuation-8.1.7.v20120910.jar"/>
- <classpathentry kind="lib" path="solr/example/lib/jetty-deploy-8.1.7.v20120910.jar"/>
- <classpathentry kind="lib" path="solr/example/lib/jetty-http-8.1.7.v20120910.jar"/>
- <classpathentry kind="lib" path="solr/example/lib/jetty-io-8.1.7.v20120910.jar"/>
- <classpathentry kind="lib" path="solr/example/lib/jetty-jmx-8.1.7.v20120910.jar"/>
- <classpathentry kind="lib" path="solr/example/lib/jetty-security-8.1.7.v20120910.jar"/>
- <classpathentry kind="lib" path="solr/example/lib/jetty-server-8.1.7.v20120910.jar"/>
- <classpathentry kind="lib" path="solr/example/lib/jetty-servlet-8.1.7.v20120910.jar"/>
- <classpathentry kind="lib" path="solr/example/lib/jetty-util-8.1.7.v20120910.jar"/>
- <classpathentry kind="lib" path="solr/example/lib/jetty-webapp-8.1.7.v20120910.jar"/>
- <classpathentry kind="lib" path="solr/example/lib/jetty-xml-8.1.7.v20120910.jar"/>
+ <classpathentry kind="lib" path="solr/solrj/lib/zookeeper-3.4.5.jar"/>
+ <classpathentry kind="lib" path="solr/example/lib/jetty-continuation-8.1.8.v20121106.jar"/>
+ <classpathentry kind="lib" path="solr/example/lib/jetty-deploy-8.1.8.v20121106.jar"/>
+ <classpathentry kind="lib" path="solr/example/lib/jetty-http-8.1.8.v20121106.jar"/>
+ <classpathentry kind="lib" path="solr/example/lib/jetty-io-8.1.8.v20121106.jar"/>
+ <classpathentry kind="lib" path="solr/example/lib/jetty-jmx-8.1.8.v20121106.jar"/>
+ <classpathentry kind="lib" path="solr/example/lib/jetty-security-8.1.8.v20121106.jar"/>
+ <classpathentry kind="lib" path="solr/example/lib/jetty-server-8.1.8.v20121106.jar"/>
+ <classpathentry kind="lib" path="solr/example/lib/jetty-servlet-8.1.8.v20121106.jar"/>
+ <classpathentry kind="lib" path="solr/example/lib/jetty-util-8.1.8.v20121106.jar"/>
+ <classpathentry kind="lib" path="solr/example/lib/jetty-webapp-8.1.8.v20121106.jar"/>
+ <classpathentry kind="lib" path="solr/example/lib/jetty-xml-8.1.8.v20121106.jar"/>
<classpathentry kind="lib" path="solr/example/lib/servlet-api-3.0.jar"/>
<classpathentry kind="lib" path="solr/contrib/clustering/lib/carrot2-core-3.5.0.jar"/>
<classpathentry kind="lib" path="solr/contrib/clustering/lib/hppc-0.3.3.jar"/>
@@ -147,6 +147,8 @@
<classpathentry kind="lib" path="solr/contrib/clustering/lib/simple-xml-2.4.1.jar"/>
<classpathentry kind="lib" path="solr/contrib/dataimporthandler/lib/activation-1.1.jar"/>
<classpathentry kind="lib" path="solr/contrib/dataimporthandler/lib/mail-1.4.1.jar"/>
+ <classpathentry kind="lib" path="solr/example/example-DIH/solr/db/lib/derby-10.9.1.0.jar"/>
+ <classpathentry kind="lib" path="solr/example/example-DIH/solr/db/lib/hsqldb-1.8.0.10.jar"/>
<classpathentry kind="lib" path="solr/contrib/extraction/lib/bcmail-jdk15-1.45.jar"/>
<classpathentry kind="lib" path="solr/contrib/extraction/lib/bcprov-jdk15-1.45.jar"/>
<classpathentry kind="lib" path="solr/contrib/extraction/lib/boilerpipe-1.1.0.jar"/>
@@ -169,7 +171,7 @@
<classpathentry kind="lib" path="solr/contrib/velocity/lib/commons-beanutils-1.7.0.jar"/>
<classpathentry kind="lib" path="solr/contrib/velocity/lib/commons-collections-3.2.1.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="lucene/test-framework/lib/randomizedtesting-runner-2.0.4.jar"/>
+ <classpathentry kind="lib" path="lucene/test-framework/lib/randomizedtesting-runner-2.0.5.jar"/>
<classpathentry kind="lib" path="solr/contrib/extraction/lib/apache-mime4j-core-0.7.2.jar"/>
<classpathentry kind="lib" path="solr/contrib/extraction/lib/apache-mime4j-dom-0.7.2.jar"/>
<classpathentry kind="lib" path="solr/contrib/extraction/lib/fontbox-1.7.0.jar"/>
Modified: lucene/dev/branches/lucene4547/dev-tools/eclipse/dot.project
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/dev-tools/eclipse/dot.project?rev=1419570&r1=1419569&r2=1419570&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/dev-tools/eclipse/dot.project (original)
+++ lucene/dev/branches/lucene4547/dev-tools/eclipse/dot.project Mon Dec 10 16:36:47 2012
@@ -14,4 +14,51 @@
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1353353379237</id>
+ <name></name>
+ <type>30</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-false-false-lucene/build</arguments>
+ </matcher>
+ </filter>
+ <filter>
+ <id>1353353379238</id>
+ <name></name>
+ <type>30</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-false-false-solr/build</arguments>
+ </matcher>
+ </filter>
+ <filter>
+ <id>1353353379240</id>
+ <name></name>
+ <type>30</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-false-false-lucene/dist</arguments>
+ </matcher>
+ </filter>
+ <filter>
+ <id>1353353379242</id>
+ <name></name>
+ <type>30</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-false-false-solr/package</arguments>
+ </matcher>
+ </filter>
+ <filter>
+ <id>1353353379244</id>
+ <name></name>
+ <type>30</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-projectRelativePath-matches-false-false-solr/dist</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
Modified: lucene/dev/branches/lucene4547/dev-tools/idea/.idea/libraries/JUnit.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/dev-tools/idea/.idea/libraries/JUnit.xml?rev=1419570&r1=1419569&r2=1419570&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/dev-tools/idea/.idea/libraries/JUnit.xml (original)
+++ lucene/dev/branches/lucene4547/dev-tools/idea/.idea/libraries/JUnit.xml Mon Dec 10 16:36:47 2012
@@ -2,7 +2,7 @@
<library name="JUnit">
<CLASSES>
<root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/junit-4.10.jar!/" />
- <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/randomizedtesting-runner-2.0.4.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/randomizedtesting-runner-2.0.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: lucene/dev/branches/lucene4547/dev-tools/idea/lucene/analysis/icu/icu.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/dev-tools/idea/lucene/analysis/icu/icu.iml?rev=1419570&r1=1419569&r2=1419570&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/dev-tools/idea/lucene/analysis/icu/icu.iml (original)
+++ lucene/dev/branches/lucene4547/dev-tools/idea/lucene/analysis/icu/icu.iml Mon Dec 10 16:36:47 2012
@@ -9,6 +9,7 @@
<sourceFolder url="file://$MODULE_DIR$/src/tools/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/resources" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test-files" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
Modified: lucene/dev/branches/lucene4547/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml?rev=1419570&r1=1419569&r2=1419570&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml (original)
+++ lucene/dev/branches/lucene4547/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml Mon Dec 10 16:36:47 2012
@@ -14,6 +14,7 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
<orderEntry type="library" scope="TEST" name="HSQLDB" level="project" />
+ <orderEntry type="library" scope="TEST" name="Derby" level="project" />
<orderEntry type="library" name="Solr core library" level="project" />
<orderEntry type="library" name="Solrj library" level="project" />
<orderEntry type="library" name="Solr DIH library" level="project" />
Modified: lucene/dev/branches/lucene4547/dev-tools/maven/lucene/benchmark/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/dev-tools/maven/lucene/benchmark/pom.xml.template?rev=1419570&r1=1419569&r2=1419570&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/dev-tools/maven/lucene/benchmark/pom.xml.template (original)
+++ lucene/dev/branches/lucene4547/dev-tools/maven/lucene/benchmark/pom.xml.template Mon Dec 10 16:36:47 2012
@@ -86,7 +86,7 @@
<dependency>
<groupId>net.sourceforge.nekohtml</groupId>
<artifactId>nekohtml</artifactId>
- <version>1.9.15</version>
+ <version>1.9.17</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Modified: lucene/dev/branches/lucene4547/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/dev-tools/maven/pom.xml.template?rev=1419570&r1=1419569&r2=1419570&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/lucene4547/dev-tools/maven/pom.xml.template Mon Dec 10 16:36:47 2012
@@ -45,7 +45,7 @@
<base.specification.version>5.0.0</base.specification.version>
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
<java.compat.version>1.6</java.compat.version>
- <jetty.version>8.1.7.v20120910</jetty.version>
+ <jetty.version>8.1.8.v20121106</jetty.version>
<slf4j.version>1.6.4</slf4j.version>
<tika.version>1.2</tika.version>
<httpcomponents.version>4.1.3</httpcomponents.version>
@@ -147,7 +147,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>r05</version>
+ <version>13.0.1</version>
</dependency>
<dependency>
<groupId>com.yammer.metrics</groupId>
@@ -274,6 +274,11 @@
<version>1.1-20120112</version>
</dependency>
<dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.9.1.0</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
<version>${tika.version}</version>
@@ -343,7 +348,7 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.3.6</version>
+ <version>3.4.5</version>
</dependency>
<dependency>
<groupId>org.carrot2</groupId>
@@ -439,7 +444,7 @@
<dependency>
<groupId>com.carrotsearch.randomizedtesting</groupId>
<artifactId>randomizedtesting-runner</artifactId>
- <version>2.0.4</version>
+ <version>2.0.5</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -540,7 +545,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.12</version>
+ <version>2.12.4</version>
<configuration>
<runOrder>random</runOrder>
<reportFormat>plain</reportFormat>
@@ -548,6 +553,7 @@
<argLine>-Xmx512M</argLine>
<systemPropertyVariables>
<tempDir>.</tempDir>
+ <java.awt.headless>true</java.awt.headless>
<!-- See <http://wiki.apache.org/lucene-java/RunningTests>
for a description of the tests.* system properties. -->
Modified: lucene/dev/branches/lucene4547/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template?rev=1419570&r1=1419569&r2=1419570&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template (original)
+++ lucene/dev/branches/lucene4547/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template Mon Dec 10 16:36:47 2012
@@ -72,6 +72,11 @@
<artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<sourceDirectory>${module-path}/src/java</sourceDirectory>
Modified: lucene/dev/branches/lucene4547/dev-tools/maven/solr/solrj/src/java/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/dev-tools/maven/solr/solrj/src/java/pom.xml.template?rev=1419570&r1=1419569&r2=1419570&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/dev-tools/maven/solr/solrj/src/java/pom.xml.template (original)
+++ lucene/dev/branches/lucene4547/dev-tools/maven/solr/solrj/src/java/pom.xml.template Mon Dec 10 16:36:47 2012
@@ -63,6 +63,10 @@
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
</exclusion>
Modified: lucene/dev/branches/lucene4547/extra-targets.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/extra-targets.xml?rev=1419570&r1=1419569&r2=1419570&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/extra-targets.xml (original)
+++ lucene/dev/branches/lucene4547/extra-targets.xml Mon Dec 10 16:36:47 2012
@@ -60,7 +60,7 @@
</target>
<target xmlns:ivy="antlib:org.apache.ivy.ant" name="-check-svn-working-copy" depends="ivy-availability-check,ivy-fail,ivy-configure,resolve-groovy">
- <ivy:cachepath organisation="org.tmatesoft.svnkit" module="svnkit" revision="1.7.5-v1"
+ <ivy:cachepath organisation="org.tmatesoft.svnkit" module="svnkit" revision="1.7.6"
inline="true" conf="default" type="jar" transitive="true" pathid="svnkit.classpath"/>
<script language="groovy" taskname="svn">
<classpath>
Modified: lucene/dev/branches/lucene4547/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/CHANGES.txt?rev=1419570&r1=1419569&r2=1419570&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/lucene4547/lucene/CHANGES.txt Mon Dec 10 16:36:47 2012
@@ -34,11 +34,57 @@ Changes in backwards compatibility polic
Override lengthNorm and/or encode/decodeNormValue to change the specifics,
like Lucene 3.x. (Robert Muir)
+* LUCENE-3441: The facet module now supports NRT. As a result, the following
+ changes were made:
+ - DirectoryTaxonomyReader has a new constructor which takes a
+ DirectoryTaxonomyWriter. You should use that constructor in order to get
+ the NRT support (or the old one for non-NRT).
+ - TaxonomyReader.refresh() removed in exchange for TaxonomyReader.openIfChanged
+ static method. Similar to DirectoryReader, the method either returns null
+ if no changes were made to the taxonomy, or a new TR instance otherwise.
+ Instead of calling refresh(), you should write similar code to how you reopen
+ a regular DirectoryReader.
+ - TaxonomyReader.openIfChanged (previously refresh()) no longer throws
+ IncosistentTaxonomyException, and supports recreate. InconsistentTaxoEx
+ was removed.
+ - ChildrenArrays was pulled out of TaxonomyReader into a top-level class.
+ - TaxonomyReader was made an abstract class (instead of an interface), with
+ methods such as close() and reference counting management pulled from
+ DirectoryTaxonomyReader, and made final. The rest of the methods, remained
+ abstract.
+ (Shai Erera, Gilad Barkai)
+
+* LUCENE-4576: Remove CachingWrapperFilter(Filter, boolean). This recacheDeletes
+ option gave less than 1% speedup at the expense of cache churn (filters were
+ invalidated on reopen if even a single delete was posted against the segment).
+ (Robert Muir)
+
+* LUCENE-4575: Replace IndexWriter's commit/prepareCommit versions that take
+ commitData with setCommitData(). That allows committing changes to IndexWriter
+ even if the commitData is the only thing that changes.
+ (Shai Erera, Michael McCandless)
+
+* LUCENE-4565: TaxonomyReader.getParentArray and .getChildrenArrays consolidated
+ into one getParallelTaxonomyArrays(). You can obtain the 3 arrays that the
+ previous two methods returned by calling parents(), children() or siblings()
+ on the returned ParallelTaxonomyArrays. (Shai Erera)
+
+* LUCENE-4585: Spatial PrefixTree based Strategies (either TermQuery or
+ RecursivePrefix based) MAY want to re-index if used for point data. If a
+ re-index is not done, then an indexed point is ~1/2 the smallest grid cell
+ larger and as such is slightly more likely to match a query shape.
+ (David Smiley)
+
+* LUCENE-4604: DefaultOrdinalPolicy removed in favor of OrdinalPolicy.ALL_PARENTS.
+ Same for DefaultPathPolicy (now PathPolicy.ALL_CATEGORIES). In addition, you
+ can use OrdinalPolicy.NO_PARENTS to never write any parent category ordinal
+ to the fulltree posting payload (but note that you need a special
+ FacetsAccumulator - see javadocs). (Shai Erera)
+
New Features
-* LUCENE-4226: New experimental StoredFieldsFormat (in lucene/codecs) that
- compresses chunks of documents together in order to improve the compression
- ratio. (Adrien Grand)
+* LUCENE-4226: New experimental StoredFieldsFormat that compresses chunks of
+ documents together in order to improve the compression ratio. (Adrien Grand)
* LUCENE-4426: New ValueSource implementations (in lucene/queries) for
DocValues fields. (Adrien Grand)
@@ -77,6 +123,22 @@ New Features
you only need a few bits per-document, or where you might want exact
document length, and so on. (Robert Muir)
+* LUCENE-4489: Added consumeAllTokens option to LimitTokenCountFilter
+ (hossman, Robert Muir)
+
+* LUCENE-4566: Add NRT/SearcherManager.RefreshListener/addListener to
+ be notified whenever a new searcher was opened. (selckin via Shai
+ Erera, Mike McCandless)
+
+* SOLR-4123: Add per-script customizability to ICUTokenizerFactory via
+ rule files in the ICU RuleBasedBreakIterator format.
+ (Shawn Heisey, Robert Muir, Steve Rowe)
+
+* LUCENE-4590: Added WriteEnwikiLineDocTask - a benchmark task for writing
+ Wikipedia category pages and non-category pages into separate line files.
+ extractWikipedia.alg was changed to use this task, so now it creates two
+ files. (Doron Cohen)
+
API Changes
* LUCENE-4399: Deprecated AppendingCodec. Lucene's term dictionaries
@@ -95,7 +157,14 @@ API Changes
* LUCENE-4520: ValueSource.getSortField no longer throws IOExceptions
(Alan Woodward)
+
+* LUCENE-4537: RateLimiter is now separated from FSDirectory and exposed via
+ RateLimitingDirectoryWrapper. Any Directory can now be rate-limited.
+ (Simon Willnauer)
+* LUCENE-4591: CompressingStoredFields{Writer,Reader} now accept a segment
+ suffix as a constructor parameter. (Renaud Delbru via Adrien Grand)
+
Bug Fixes
* LUCENE-1822: BaseFragListBuilder hard-coded 6 char margin is too naive.
@@ -140,8 +209,60 @@ Bug Fixes
not synced. Instead, it now tracks an 'epoch' version, which is incremented
whenever the taxonomy is re-created, or replaced. (Shai Erera)
+* LUCENE-4544: Fixed off-by-1 in ConcurrentMergeScheduler that would
+ allow 1+maxMergeCount merges threads to be created, instead of just
+ maxMergeCount (Radim Kolar, Mike McCandless)
+
+* LUCENE-4567: Fixed NullPointerException in analzying, fuzzy, and
+ WFST suggesters when no suggestions were added (selckin via Mike
+ McCandless)
+
+* LUCENE-4568: Fixed integer overflow in
+ PagedBytes.PagedBytesData{In,Out}put.getPosition. (Adrien Grand)
+
+* LUCENE-4581: GroupingSearch.setAllGroups(true) was failing to
+ actually compute allMatchingGroups (dizh@neusoft.com via Mike
+ McCandless)
+
+* LUCENE-4009: Improve TermsFilter.toString (Tim Costermans via Chris
+ Male, Mike McCandless)
+
+* LUCENE-4588: Benchmark's EnwikiContentSource was discarding last wiki
+ document and had leaking threads in 'forever' mode. (Doron Cohen)
+
+* LUCENE-4585: Spatial RecursivePrefixTreeFilter had some bugs that only
+ occurred when shapes were indexed. In what appears to be rare circumstances,
+ documents with shapes near a query shape were erroneously considered a match.
+ In addition, it wasn't possible to index a shape representing the entire
+ globe.
+
+* LUCENE-4595: EnwikiContentSource had a thread safety problem (NPE) in
+ 'forever' mode (Doron Cohen)
+
+* LUCENE-4587: fix WordBreakSpellChecker to not throw AIOOBE when presented
+ with 2-char codepoints, and to correctly break/combine terms containing
+ non-latin characters. (James Dyer, Andreas Hubold)
+
+* LUCENE-4596: fix a concurrency bug in DirectoryTaxonomyWriter.
+ (Shai Erera)
+
+Changes in Runtime Behavior
+
+* LUCENE-4586: Change default ResultMode of FacetRequest to PER_NODE_IN_TREE.
+ This only affects requests with depth>1. If you execute such requests and
+ rely on the facet results being returned flat (i.e. no hierarchy), you should
+ set the ResultMode to GLOBAL_FLAT. (Shai Erera, Gilad Barkai)
+
Optimizations
+* LUCENE-2221: oal.util.BitUtil was modified to use Long.bitCount and
+ Long.numberOfTrailingZeros (which are intrinsics since Java 6u18) instead of
+ pure java bit twiddling routines in order to improve performance on modern
+ JVMs/hardware. (Dawid Weiss, Adrien Grand)
+
+* LUCENE-4509: Enable stored fields compression by default in the Lucene 4.1
+ default codec. (Adrien Grand)
+
* LUCENE-4536: PackedInts on-disk format is now byte-aligned (it used to be
long-aligned), saving up to 7 bytes per array of values.
(Adrien Grand, Mike McCandless)
@@ -183,7 +304,13 @@ Optimizations
* LUCENE-4538: DocValues now caches direct sources in a ThreadLocal exposed via SourceCache.
Users of this API can now simply obtain an instance via DocValues#getDirectSource per thread.
(Simon Willnauer)
+
+* LUCENE-4580: DrillDown.query variants return a ConstantScoreQuery with boost set to 0.0f
+ so that documents scores are not affected by running a drill-down query. (Shai Erera)
+* LUCENE-4598: PayloadIterator no longer uses top-level IndexReader to iterate on the
+ posting's payload. (Shai Erera, Michael McCandless)
+
Documentation
* LUCENE-4483: Refer to BytesRef.deepCopyOf in Term's constructor that takes BytesRef.
@@ -191,6 +318,9 @@ Documentation
Build
+* LUCENE-4603: Upgrade randomized testing to version 2.0.5: print forked
+ JVM PIDs on heartbeat from hung tests (Dawid Weiss)
+
* Upgrade randomized testing to version 2.0.4: avoid hangs on shutdown
hooks hanging forever by calling Runtime.halt() in addition to
Runtime.exit() after a short delay to allow graceful shutdown (Dawid Weiss)
@@ -199,6 +329,13 @@ Build
RandomizedContext.contexts static map. Upgrade randomized testing
to version 2.0.2 (Mike McCandless, Dawid Weiss)
+* LUCENE-4589: Upgraded benchmark module's Nekohtml dependency to version
+ 1.9.17, removing the workaround in Lucene's HTML parser for the
+ Turkish locale. (Uwe Schindler)
+
+* LUCENE-4601: Fix ivy availability check to use typefound, so it works
+ if called from another build file. (Ryan Ernst via Robert Muir)
+
======================= Lucene 4.0.0 =======================
Modified: lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountAnalyzer.java?rev=1419570&r1=1419569&r2=1419570&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountAnalyzer.java (original)
+++ lucene/dev/branches/lucene4547/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountAnalyzer.java Mon Dec 10 16:36:47 2012
@@ -23,17 +23,32 @@ import org.apache.lucene.analysis.Analyz
/**
* This Analyzer limits the number of tokens while indexing. It is
* a replacement for the maximum field length setting inside {@link org.apache.lucene.index.IndexWriter}.
+ * @see LimitTokenCountFilter
*/
public final class LimitTokenCountAnalyzer extends AnalyzerWrapper {
private final Analyzer delegate;
private final int maxTokenCount;
+ private final boolean consumeAllTokens;
/**
* Build an analyzer that limits the maximum number of tokens per field.
+ * This analyzer will not consume any tokens beyond the maxTokenCount limit
+ *
+ * @see #LimitTokenCountAnalyzer(Analyzer,int,boolean)
*/
public LimitTokenCountAnalyzer(Analyzer delegate, int maxTokenCount) {
+ this(delegate, maxTokenCount, false);
+ }
+ /**
+ * Build an analyzer that limits the maximum number of tokens per field.
+ * @param delegate the analyzer to wrap
+ * @param maxTokenCount max number of tokens to produce
+ * @param consumeAllTokens whether all tokens from the delegate should be consumed even if maxTokenCount is reached.
+ */
+ public LimitTokenCountAnalyzer(Analyzer delegate, int maxTokenCount, boolean consumeAllTokens) {
this.delegate = delegate;
this.maxTokenCount = maxTokenCount;
+ this.consumeAllTokens = consumeAllTokens;
}
@Override
@@ -44,11 +59,11 @@ public final class LimitTokenCountAnalyz
@Override
protected TokenStreamComponents wrapComponents(String fieldName, TokenStreamComponents components) {
return new TokenStreamComponents(components.getTokenizer(),
- new LimitTokenCountFilter(components.getTokenStream(), maxTokenCount));
+ new LimitTokenCountFilter(components.getTokenStream(), maxTokenCount, consumeAllTokens));
}
@Override
public String toString() {
- return "LimitTokenCountAnalyzer(" + delegate.toString() + ", maxTokenCount=" + maxTokenCount + ")";
+ return "LimitTokenCountAnalyzer(" + delegate.toString() + ", maxTokenCount=" + maxTokenCount + ", consumeAllTokens=" + consumeAllTokens + ")";
}
}