You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2012/11/23 13:01:26 UTC

svn commit: r1412849 [1/13] - in /lucene/dev/branches/LUCENE-2878: ./ dev-tools/ dev-tools/eclipse/ dev-tools/idea/.idea/libraries/ dev-tools/idea/solr/contrib/dataimporthandler/ dev-tools/maven/ dev-tools/maven/solr/contrib/dataimporthandler/ dev-tool...

Author: romseygeek
Date: Fri Nov 23 12:00:32 2012
New Revision: 1412849

URL: http://svn.apache.org/viewvc?rev=1412849&view=rev
Log:
Merge from trunk

Added:
    lucene/dev/branches/LUCENE-2878/dev-tools/idea/.idea/libraries/Derby.xml
      - copied unchanged from r1412805, lucene/dev/trunk/dev-tools/idea/.idea/libraries/Derby.xml
    lucene/dev/branches/LUCENE-2878/lucene/codecs/src/test/org/apache/lucene/codecs/compressing/TestFastDecompressionMode.java
      - copied unchanged from r1412805, lucene/dev/trunk/lucene/codecs/src/test/org/apache/lucene/codecs/compressing/TestFastDecompressionMode.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/codecs/compressing/
      - copied from r1412805, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsFormat.java
      - copied unchanged from r1412805, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsFormat.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsIndexReader.java
      - copied unchanged from r1412805, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsIndexReader.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsIndexWriter.java
      - copied unchanged from r1412805, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsIndexWriter.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsReader.java
      - copied unchanged from r1412805, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsReader.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsWriter.java
      - copied unchanged from r1412805, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsWriter.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressionMode.java
      - copied unchanged from r1412805, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressionMode.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/codecs/compressing/Compressor.java
      - copied unchanged from r1412805, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/Compressor.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/codecs/compressing/Decompressor.java
      - copied unchanged from r1412805, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/Decompressor.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/codecs/compressing/GrowableByteArrayDataOutput.java
      - copied unchanged from r1412805, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/GrowableByteArrayDataOutput.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/codecs/compressing/LZ4.java
      - copied unchanged from r1412805, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/LZ4.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/codecs/compressing/package.html
      - copied unchanged from r1412805, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/package.html
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41StoredFieldsFormat.java
      - copied unchanged from r1412805, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41StoredFieldsFormat.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/store/RateLimitedDirectoryWrapper.java
      - copied unchanged from r1412805, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/RateLimitedDirectoryWrapper.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/store/RateLimitedIndexOutput.java
      - copied unchanged from r1412805, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/RateLimitedIndexOutput.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/util/IntBlockPool.java
      - copied unchanged from r1412805, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/IntBlockPool.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/util/RecyclingIntBlockAllocator.java
      - copied unchanged from r1412805, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/RecyclingIntBlockAllocator.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/index/TestIntBlockPool.java
      - copied unchanged from r1412805, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIntBlockPool.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/util/TestRecyclingIntBlockAllocator.java
      - copied unchanged from r1412805, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestRecyclingIntBlockAllocator.java
    lucene/dev/branches/LUCENE-2878/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/ChildrenArrays.java
      - copied unchanged from r1412805, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/ChildrenArrays.java
    lucene/dev/branches/LUCENE-2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FuzzySuggester.java
      - copied unchanged from r1412805, lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FuzzySuggester.java
    lucene/dev/branches/LUCENE-2878/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/FuzzySuggesterTest.java
      - copied unchanged from r1412805, lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/FuzzySuggesterTest.java
    lucene/dev/branches/LUCENE-2878/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/DummyCompressingCodec.java
      - copied unchanged from r1412805, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/DummyCompressingCodec.java
    lucene/dev/branches/LUCENE-2878/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/FastCompressingCodec.java
      - copied unchanged from r1412805, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/FastCompressingCodec.java
    lucene/dev/branches/LUCENE-2878/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/FastDecompressionCompressingCodec.java
      - copied unchanged from r1412805, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/FastDecompressionCompressingCodec.java
    lucene/dev/branches/LUCENE-2878/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/HighCompressionCompressingCodec.java
      - copied unchanged from r1412805, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/HighCompressionCompressingCodec.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/package.html
      - copied unchanged from r1412805, lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/package.html
    lucene/dev/branches/LUCENE-2878/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/package.html
      - copied unchanged from r1412805, lucene/dev/trunk/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/package.html
    lucene/dev/branches/LUCENE-2878/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/package.html
      - copied unchanged from r1412805, lucene/dev/trunk/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/package.html
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/package.html
      - copied unchanged from r1412805, lucene/dev/trunk/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/package.html
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHProperties.java
      - copied unchanged from r1412805, lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHProperties.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DateFormatEvaluator.java
      - copied unchanged from r1412805, lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DateFormatEvaluator.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrQueryEscapingEvaluator.java
      - copied unchanged from r1412805, lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrQueryEscapingEvaluator.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SqlEscapingEvaluator.java
      - copied unchanged from r1412805, lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SqlEscapingEvaluator.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/UrlEvaluator.java
      - copied unchanged from r1412805, lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/UrlEvaluator.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/PropertyWriter.java
      - copied unchanged from r1412805, lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/PropertyWriter.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/package.html
      - copied unchanged from r1412805, lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/package.html
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/package.html
      - copied unchanged from r1412805, lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/package.html
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java
      - copied unchanged from r1412805, lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AddAColumnTransformer.java
      - copied unchanged from r1412805, lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AddAColumnTransformer.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestBuiltInEvaluators.java
      - copied unchanged from r1412805, lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestBuiltInEvaluators.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestNestedChildren.java
      - copied unchanged from r1412805, lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestNestedChildren.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestNonWritablePersistFile.java
      - copied unchanged from r1412805, lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestNonWritablePersistFile.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSimplePropertiesWriter.java
      - copied unchanged from r1412805, lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSimplePropertiesWriter.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TripleThreatTransformer.java
      - copied unchanged from r1412805, lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TripleThreatTransformer.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/package.html
      - copied unchanged from r1412805, lucene/dev/trunk/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/package.html
    lucene/dev/branches/LUCENE-2878/solr/contrib/langid/src/java/org/apache/solr/update/processor/package.html
      - copied unchanged from r1412805, lucene/dev/trunk/solr/contrib/langid/src/java/org/apache/solr/update/processor/package.html
    lucene/dev/branches/LUCENE-2878/solr/contrib/uima/src/java/org/apache/solr/uima/processor/package.html
      - copied unchanged from r1412805, lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/package.html
    lucene/dev/branches/LUCENE-2878/solr/contrib/velocity/src/java/org/apache/solr/response/package.html
      - copied unchanged from r1412805, lucene/dev/trunk/solr/contrib/velocity/src/java/org/apache/solr/response/package.html
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/search/similarities/package.html
      - copied unchanged from r1412805, lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/similarities/package.html
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/spelling/suggest/fst/FuzzyLookupFactory.java
      - copied unchanged from r1412805, lucene/dev/trunk/solr/core/src/java/org/apache/solr/spelling/suggest/fst/FuzzyLookupFactory.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/test-files/solr/collection1/conf/fuzzysuggest.txt
      - copied unchanged from r1412805, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/fuzzysuggest.txt
    lucene/dev/branches/LUCENE-2878/solr/core/src/test-files/solr/collection1/conf/schema-eff.xml
      - copied unchanged from r1412805, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-eff.xml
    lucene/dev/branches/LUCENE-2878/solr/core/src/test-files/solr/external_eff
      - copied unchanged from r1412805, lucene/dev/trunk/solr/core/src/test-files/solr/external_eff
    lucene/dev/branches/LUCENE-2878/solr/core/src/test-files/solr/solr-lots-of-cores.xml
      - copied unchanged from r1412805, lucene/dev/trunk/solr/core/src/test-files/solr/solr-lots-of-cores.xml
    lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/core/TestLazyCores.java
      - copied unchanged from r1412805, lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestLazyCores.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/schema/ExternalFileFieldSortTest.java
      - copied unchanged from r1412805, lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/ExternalFileFieldSortTest.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/spelling/suggest/TestFuzzyAnalyzedSuggestions.java
      - copied unchanged from r1412805, lucene/dev/trunk/solr/core/src/test/org/apache/solr/spelling/suggest/TestFuzzyAnalyzedSuggestions.java
    lucene/dev/branches/LUCENE-2878/solr/licenses/derby-10.9.1.0.jar.sha1
      - copied unchanged from r1412805, lucene/dev/trunk/solr/licenses/derby-10.9.1.0.jar.sha1
    lucene/dev/branches/LUCENE-2878/solr/licenses/derby-LICENSE-ASL.txt
      - copied unchanged from r1412805, lucene/dev/trunk/solr/licenses/derby-LICENSE-ASL.txt
    lucene/dev/branches/LUCENE-2878/solr/licenses/derby-NOTICE.txt
      - copied unchanged from r1412805, lucene/dev/trunk/solr/licenses/derby-NOTICE.txt
    lucene/dev/branches/LUCENE-2878/solr/licenses/jetty-continuation-8.1.7.v20120910.jar.sha1
      - copied unchanged from r1412805, lucene/dev/trunk/solr/licenses/jetty-continuation-8.1.7.v20120910.jar.sha1
    lucene/dev/branches/LUCENE-2878/solr/licenses/jetty-deploy-8.1.7.v20120910.jar.sha1
      - copied unchanged from r1412805, lucene/dev/trunk/solr/licenses/jetty-deploy-8.1.7.v20120910.jar.sha1
    lucene/dev/branches/LUCENE-2878/solr/licenses/jetty-http-8.1.7.v20120910.jar.sha1
      - copied unchanged from r1412805, lucene/dev/trunk/solr/licenses/jetty-http-8.1.7.v20120910.jar.sha1
    lucene/dev/branches/LUCENE-2878/solr/licenses/jetty-io-8.1.7.v20120910.jar.sha1
      - copied unchanged from r1412805, lucene/dev/trunk/solr/licenses/jetty-io-8.1.7.v20120910.jar.sha1
    lucene/dev/branches/LUCENE-2878/solr/licenses/jetty-jmx-8.1.7.v20120910.jar.sha1
      - copied unchanged from r1412805, lucene/dev/trunk/solr/licenses/jetty-jmx-8.1.7.v20120910.jar.sha1
    lucene/dev/branches/LUCENE-2878/solr/licenses/jetty-security-8.1.7.v20120910.jar.sha1
      - copied unchanged from r1412805, lucene/dev/trunk/solr/licenses/jetty-security-8.1.7.v20120910.jar.sha1
    lucene/dev/branches/LUCENE-2878/solr/licenses/jetty-server-8.1.7.v20120910.jar.sha1
      - copied unchanged from r1412805, lucene/dev/trunk/solr/licenses/jetty-server-8.1.7.v20120910.jar.sha1
    lucene/dev/branches/LUCENE-2878/solr/licenses/jetty-servlet-8.1.7.v20120910.jar.sha1
      - copied unchanged from r1412805, lucene/dev/trunk/solr/licenses/jetty-servlet-8.1.7.v20120910.jar.sha1
    lucene/dev/branches/LUCENE-2878/solr/licenses/jetty-util-8.1.7.v20120910.jar.sha1
      - copied unchanged from r1412805, lucene/dev/trunk/solr/licenses/jetty-util-8.1.7.v20120910.jar.sha1
    lucene/dev/branches/LUCENE-2878/solr/licenses/jetty-webapp-8.1.7.v20120910.jar.sha1
      - copied unchanged from r1412805, lucene/dev/trunk/solr/licenses/jetty-webapp-8.1.7.v20120910.jar.sha1
    lucene/dev/branches/LUCENE-2878/solr/licenses/jetty-xml-8.1.7.v20120910.jar.sha1
      - copied unchanged from r1412805, lucene/dev/trunk/solr/licenses/jetty-xml-8.1.7.v20120910.jar.sha1
    lucene/dev/branches/LUCENE-2878/solr/licenses/metrics-core-2.1.2.jar.sha1
      - copied unchanged from r1412805, lucene/dev/trunk/solr/licenses/metrics-core-2.1.2.jar.sha1
    lucene/dev/branches/LUCENE-2878/solr/licenses/metrics-core-LICENSE-ASL.txt
      - copied unchanged from r1412805, lucene/dev/trunk/solr/licenses/metrics-core-LICENSE-ASL.txt
    lucene/dev/branches/LUCENE-2878/solr/licenses/metrics-core-NOTICE.txt
      - copied unchanged from r1412805, lucene/dev/trunk/solr/licenses/metrics-core-NOTICE.txt
    lucene/dev/branches/LUCENE-2878/solr/licenses/zookeeper-3.4.5.jar.sha1
      - copied unchanged from r1412805, lucene/dev/trunk/solr/licenses/zookeeper-3.4.5.jar.sha1
    lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/noggit/package.html
      - copied unchanged from r1412805, lucene/dev/trunk/solr/solrj/src/java/org/apache/noggit/package.html
    lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/client/solrj/beans/package.html
      - copied unchanged from r1412805, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/beans/package.html
    lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/client/solrj/impl/package.html
      - copied unchanged from r1412805, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/package.html
    lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/client/solrj/package.html
      - copied unchanged from r1412805, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/package.html
    lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/client/solrj/request/package.html
      - copied unchanged from r1412805, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/request/package.html
    lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/client/solrj/response/package.html
      - copied unchanged from r1412805, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/response/package.html
    lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/client/solrj/util/package.html
      - copied unchanged from r1412805, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/util/package.html
    lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/cloud/package.html
      - copied unchanged from r1412805, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/package.html
    lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/luke/package.html
      - copied unchanged from r1412805, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/luke/package.html
    lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/package.html
      - copied unchanged from r1412805, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/package.html
    lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/params/package.html
      - copied unchanged from r1412805, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/params/package.html
    lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/util/package.html
      - copied unchanged from r1412805, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/package.html
    lucene/dev/branches/LUCENE-2878/solr/test-framework/src/java/org/apache/solr/analysis/package.html
      - copied unchanged from r1412805, lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/analysis/package.html
    lucene/dev/branches/LUCENE-2878/solr/test-framework/src/java/org/apache/solr/cloud/package.html
      - copied unchanged from r1412805, lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/package.html
    lucene/dev/branches/LUCENE-2878/solr/test-framework/src/java/org/apache/solr/core/package.html
      - copied unchanged from r1412805, lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/core/package.html
    lucene/dev/branches/LUCENE-2878/solr/test-framework/src/java/org/apache/solr/package.html
      - copied unchanged from r1412805, lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/package.html
    lucene/dev/branches/LUCENE-2878/solr/test-framework/src/java/org/apache/solr/update/processor/package.html
      - copied unchanged from r1412805, lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/update/processor/package.html
    lucene/dev/branches/LUCENE-2878/solr/test-framework/src/java/org/apache/solr/util/package.html
      - copied unchanged from r1412805, lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/package.html
Removed:
    lucene/dev/branches/LUCENE-2878/lucene/codecs/src/java/org/apache/lucene/codecs/compressing/
    lucene/dev/branches/LUCENE-2878/lucene/codecs/src/test/org/apache/lucene/codecs/compressing/TestFastUncompressionMode.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/index/IntBlockPool.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/PhraseScorer.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/util/TestBitUtil.java
    lucene/dev/branches/LUCENE-2878/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/InconsistentTaxonomyException.java
Modified:
    lucene/dev/branches/LUCENE-2878/   (props changed)
    lucene/dev/branches/LUCENE-2878/build.xml
    lucene/dev/branches/LUCENE-2878/dev-tools/   (props changed)
    lucene/dev/branches/LUCENE-2878/dev-tools/eclipse/dot.classpath
    lucene/dev/branches/LUCENE-2878/dev-tools/eclipse/dot.project
    lucene/dev/branches/LUCENE-2878/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml
    lucene/dev/branches/LUCENE-2878/dev-tools/maven/pom.xml.template
    lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template
    lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/core/src/java/pom.xml.template
    lucene/dev/branches/LUCENE-2878/dev-tools/scripts/smokeTestRelease.py
    lucene/dev/branches/LUCENE-2878/lucene/   (props changed)
    lucene/dev/branches/LUCENE-2878/lucene/BUILD.txt   (props changed)
    lucene/dev/branches/LUCENE-2878/lucene/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/LUCENE-2878/lucene/JRE_VERSION_MIGRATION.txt   (props changed)
    lucene/dev/branches/LUCENE-2878/lucene/LICENSE.txt   (props changed)
    lucene/dev/branches/LUCENE-2878/lucene/MIGRATE.txt   (contents, props changed)
    lucene/dev/branches/LUCENE-2878/lucene/NOTICE.txt   (props changed)
    lucene/dev/branches/LUCENE-2878/lucene/README.txt   (props changed)
    lucene/dev/branches/LUCENE-2878/lucene/SYSTEM_REQUIREMENTS.txt   (props changed)
    lucene/dev/branches/LUCENE-2878/lucene/analysis/   (props changed)
    lucene/dev/branches/LUCENE-2878/lucene/analysis/common/   (props changed)
    lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountAnalyzer.java
    lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountFilter.java
    lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountFilterFactory.java
    lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java
    lucene/dev/branches/LUCENE-2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java
    lucene/dev/branches/LUCENE-2878/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikFilter.java
    lucene/dev/branches/LUCENE-2878/lucene/backwards/   (props changed)
    lucene/dev/branches/LUCENE-2878/lucene/benchmark/   (props changed)
    lucene/dev/branches/LUCENE-2878/lucene/build.xml   (props changed)
    lucene/dev/branches/LUCENE-2878/lucene/classification/   (props changed)
    lucene/dev/branches/LUCENE-2878/lucene/classification/src/java/org/apache/lucene/classification/KNearestNeighborClassifier.java
    lucene/dev/branches/LUCENE-2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextPerDocProducer.java
    lucene/dev/branches/LUCENE-2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
    lucene/dev/branches/LUCENE-2878/lucene/codecs/src/test/org/apache/lucene/codecs/compressing/AbstractTestCompressionMode.java
    lucene/dev/branches/LUCENE-2878/lucene/codecs/src/test/org/apache/lucene/codecs/compressing/TestCompressingStoredFieldsFormat.java
    lucene/dev/branches/LUCENE-2878/lucene/common-build.xml   (contents, props changed)
    lucene/dev/branches/LUCENE-2878/lucene/core/   (props changed)
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/analysis/TokenStreamToAutomaton.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsReader.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/Bytes.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/FixedDerefBytesImpl.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/FixedSortedBytesImpl.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/FixedStraightBytesImpl.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/Floats.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/Ints.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/PackedIntValues.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/VarDerefBytesImpl.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/VarSortedBytesImpl.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/VarStraightBytesImpl.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/codecs/lucene41/ForUtil.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41Codec.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/document/Document.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/index/ByteSliceReader.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/index/DocFieldProcessor.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/index/DocValues.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/index/IndexDocument.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/index/LiveIndexWriterConfig.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/index/Norm.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/index/Term.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/index/TermsHash.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/index/TermsHashPerField.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/BooleanScorer.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/BooleanScorer2.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/CachingCollector.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ConjunctionScorer.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ConjunctionTermScorer.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxScorer.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/DisjunctionSumScorer.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ExactPhraseScorer.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/FilteredQuery.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/MatchAllDocsQuery.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/PhraseQuery.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ReferenceManager.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ReqExclScorer.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ReqOptSumScorer.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/ScoreCachingWrappingScorer.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/Scorer.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/SloppyPhraseScorer.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/TermScorer.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/IntervalFilterQuery.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/intervals/NonOverlappingQuery.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/similarities/DefaultSimilarity.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/similarities/TFIDFSimilarity.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/spans/SpanScorer.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/spans/SpanWeight.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/store/FSDirectory.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/store/RateLimiter.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/util/BitUtil.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/util/ByteBlockPool.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/util/BytesRefHash.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/util/FilterIterator.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/util/FixedBitSet.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/util/OpenBitSet.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/util/PagedBytes.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/util/RecyclingByteBlockAllocator.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/util/automaton/BasicAutomata.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/util/automaton/LevenshteinAutomata.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/util/fst/Builder.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/util/fst/Util.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperation.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/util/packed/Direct16.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/util/packed/Direct32.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/util/packed/Direct64.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/util/packed/Direct8.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/util/packed/DirectPackedReader.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/util/packed/Packed16ThreeBlocks.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/util/packed/Packed64.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/util/packed/Packed8ThreeBlocks.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/util/packed/PackedReaderIterator.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/util/packed/PackedWriter.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/util/packed/gen_Direct.py
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/util/packed/gen_PackedThreeBlocks.py
    lucene/dev/branches/LUCENE-2878/lucene/core/src/java/overview.html
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/codecs/lucene40/values/TestDocValues.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/index/TestBagOfPositions.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/index/TestBagOfPostings.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/index/TestByteSlices.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/index/TestCustomNorms.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/index/TestNorms.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/JustCompileSearch.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestCachingCollector.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestShardSearching.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestSimilarity.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/util/TestByteBlockPool.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/util/TestFilterIterator.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/util/TestPagedBytes.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/util/TestRecyclingByteBlockAllocator.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java
    lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/util/packed/TestPackedInts.java
    lucene/dev/branches/LUCENE-2878/lucene/demo/   (props changed)
    lucene/dev/branches/LUCENE-2878/lucene/facet/   (props changed)
    lucene/dev/branches/LUCENE-2878/lucene/facet/src/java/org/apache/lucene/facet/search/TopKFacetResultsHandler.java
    lucene/dev/branches/LUCENE-2878/lucene/facet/src/java/org/apache/lucene/facet/search/TopKInEachNodeHandler.java
    lucene/dev/branches/LUCENE-2878/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyReader.java
    lucene/dev/branches/LUCENE-2878/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/Consts.java
    lucene/dev/branches/LUCENE-2878/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java
    lucene/dev/branches/LUCENE-2878/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java
    lucene/dev/branches/LUCENE-2878/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/ParentArray.java
    lucene/dev/branches/LUCENE-2878/lucene/facet/src/java/org/apache/lucene/util/collections/LRUHashMap.java
    lucene/dev/branches/LUCENE-2878/lucene/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java
    lucene/dev/branches/LUCENE-2878/lucene/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCounts.java
    lucene/dev/branches/LUCENE-2878/lucene/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java
    lucene/dev/branches/LUCENE-2878/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyCombined.java
    lucene/dev/branches/LUCENE-2878/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyReader.java
    lucene/dev/branches/LUCENE-2878/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyWriter.java
    lucene/dev/branches/LUCENE-2878/lucene/grouping/   (props changed)
    lucene/dev/branches/LUCENE-2878/lucene/grouping/src/java/org/apache/lucene/search/grouping/BlockGroupingCollector.java
    lucene/dev/branches/LUCENE-2878/lucene/highlighter/   (props changed)
    lucene/dev/branches/LUCENE-2878/lucene/ivy-settings.xml   (props changed)
    lucene/dev/branches/LUCENE-2878/lucene/join/   (props changed)
    lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java
    lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java
    lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java
    lucene/dev/branches/LUCENE-2878/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java
    lucene/dev/branches/LUCENE-2878/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
    lucene/dev/branches/LUCENE-2878/lucene/licenses/   (props changed)
    lucene/dev/branches/LUCENE-2878/lucene/memory/   (props changed)
    lucene/dev/branches/LUCENE-2878/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
    lucene/dev/branches/LUCENE-2878/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndexNormDocValues.java
    lucene/dev/branches/LUCENE-2878/lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java
    lucene/dev/branches/LUCENE-2878/lucene/misc/   (props changed)
    lucene/dev/branches/LUCENE-2878/lucene/misc/src/java/org/apache/lucene/misc/SweetSpotSimilarity.java
    lucene/dev/branches/LUCENE-2878/lucene/module-build.xml   (props changed)
    lucene/dev/branches/LUCENE-2878/lucene/queries/   (props changed)
    lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java
    lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/TermsFilter.java
    lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java
    lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java
    lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSource.java
    lucene/dev/branches/LUCENE-2878/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSourceScorer.java
    lucene/dev/branches/LUCENE-2878/lucene/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java
    lucene/dev/branches/LUCENE-2878/lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java
    lucene/dev/branches/LUCENE-2878/lucene/queryparser/   (props changed)
    lucene/dev/branches/LUCENE-2878/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermsFilterBuilder.java
    lucene/dev/branches/LUCENE-2878/lucene/sandbox/   (props changed)
    lucene/dev/branches/LUCENE-2878/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowCollationMethods.java
    lucene/dev/branches/LUCENE-2878/lucene/site/   (props changed)
    lucene/dev/branches/LUCENE-2878/lucene/spatial/   (props changed)
    lucene/dev/branches/LUCENE-2878/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/TermQueryPrefixTreeStrategy.java
    lucene/dev/branches/LUCENE-2878/lucene/suggest/   (props changed)
    lucene/dev/branches/LUCENE-2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/BytesRefList.java
    lucene/dev/branches/LUCENE-2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/SortedTermFreqIteratorWrapper.java
    lucene/dev/branches/LUCENE-2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggester.java
    lucene/dev/branches/LUCENE-2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FSTUtil.java
    lucene/dev/branches/LUCENE-2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletion.java
    lucene/dev/branches/LUCENE-2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java
    lucene/dev/branches/LUCENE-2878/lucene/suggest/src/test/org/apache/lucene/search/suggest/LookupBenchmarkTest.java
    lucene/dev/branches/LUCENE-2878/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestTermFreqIterator.java
    lucene/dev/branches/LUCENE-2878/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggesterTest.java
    lucene/dev/branches/LUCENE-2878/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/WFSTCompletionTest.java
    lucene/dev/branches/LUCENE-2878/lucene/test-framework/   (props changed)
    lucene/dev/branches/LUCENE-2878/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/CompressingCodec.java
    lucene/dev/branches/LUCENE-2878/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterAtomicReader.java
    lucene/dev/branches/LUCENE-2878/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java
    lucene/dev/branches/LUCENE-2878/lucene/test-framework/src/java/org/apache/lucene/store/MockIndexOutputWrapper.java
    lucene/dev/branches/LUCENE-2878/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
    lucene/dev/branches/LUCENE-2878/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.Codec
    lucene/dev/branches/LUCENE-2878/lucene/tools/   (props changed)
    lucene/dev/branches/LUCENE-2878/lucene/tools/forbiddenApis/commons-io.txt
    lucene/dev/branches/LUCENE-2878/lucene/tools/forbiddenApis/executors.txt
    lucene/dev/branches/LUCENE-2878/lucene/tools/forbiddenApis/jdk-deprecated.txt
    lucene/dev/branches/LUCENE-2878/lucene/tools/forbiddenApis/jdk.txt
    lucene/dev/branches/LUCENE-2878/lucene/tools/forbiddenApis/system-out.txt
    lucene/dev/branches/LUCENE-2878/lucene/tools/forbiddenApis/tests.txt
    lucene/dev/branches/LUCENE-2878/solr/   (props changed)
    lucene/dev/branches/LUCENE-2878/solr/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/LUCENE-2878/solr/LICENSE.txt   (props changed)
    lucene/dev/branches/LUCENE-2878/solr/NOTICE.txt   (props changed)
    lucene/dev/branches/LUCENE-2878/solr/README.txt   (props changed)
    lucene/dev/branches/LUCENE-2878/solr/SYSTEM_REQUIREMENTS.txt   (props changed)
    lucene/dev/branches/LUCENE-2878/solr/build.xml
    lucene/dev/branches/LUCENE-2878/solr/cloud-dev/   (props changed)
    lucene/dev/branches/LUCENE-2878/solr/common-build.xml   (props changed)
    lucene/dev/branches/LUCENE-2878/solr/contrib/   (props changed)
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/ContextImpl.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DateFormatTransformer.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DebugLogger.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/EntityProcessorWrapper.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/Evaluator.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/FieldReaderDataSource.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/FileDataSource.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/FileListEntityProcessor.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/JdbcDataSource.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/NumberFormatTransformer.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SimplePropertiesWriter.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/TemplateTransformer.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/VariableResolver.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/ZKPropertiesWriter.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/ConfigNameConstants.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/DIHConfiguration.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHCacheTestCase.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHJdbcTestCase.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTestCase.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestClobTransformer.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContextImpl.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDateFormatTransformer.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder2.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFileListEntityProcessor.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFileListWithLineEntityProcessor.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestLineEntityProcessor.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestNumberFormatTransformer.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestRegexTransformer.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessor.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessor2.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestTemplateTransformer.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestURLDataSource.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestVariableResolver.java
    lucene/dev/branches/LUCENE-2878/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java
    lucene/dev/branches/LUCENE-2878/solr/core/   (props changed)
    lucene/dev/branches/LUCENE-2878/solr/core/ivy.xml
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/cloud/DistributedQueue.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/cloud/Overseer.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/cloud/ZkController.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/core/CoreContainer.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/core/CoreDescriptor.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/core/MMapDirectoryFactory.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/core/SolrCore.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/handler/component/FieldFacetStats.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/response/BinaryQueryResponseWriter.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/response/CSVResponseWriter.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/response/JSONResponseWriter.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/schema/CurrencyField.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/schema/ExternalFileField.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/schema/FieldProperties.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/schema/FieldType.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/schema/LatLonType.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/schema/OpenExchangeRatesOrgProvider.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/schema/PointType.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/schema/SchemaField.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/search/DisMaxQParser.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/search/ExtendedQueryBase.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/search/QueryParsing.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/search/SolrConstantScoreQuery.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/search/SolrFieldCacheMBean.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/search/SolrQueryParser.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/search/SurroundQParserPlugin.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/search/ValueSourceParser.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/test-files/solr/collection1/conf/schema12.xml
    lucene/dev/branches/LUCENE-2878/solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml
    lucene/dev/branches/LUCENE-2878/solr/core/src/test-files/solr/solr.xml
    lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/core/CoreContainerCoreInitFailuresTest.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/core/RequestHandlersTest.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/core/TestConfig.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/response/TestCSVResponseWriter.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/search/TestFoldingMultitermQuery.java
    lucene/dev/branches/LUCENE-2878/solr/core/src/test/org/apache/solr/search/TestPseudoReturnFields.java
    lucene/dev/branches/LUCENE-2878/solr/example/   (props changed)
    lucene/dev/branches/LUCENE-2878/solr/example/build.xml
    lucene/dev/branches/LUCENE-2878/solr/example/example-DIH/ivy.xml
    lucene/dev/branches/LUCENE-2878/solr/example/ivy.xml
    lucene/dev/branches/LUCENE-2878/solr/licenses/   (props changed)
    lucene/dev/branches/LUCENE-2878/solr/licenses/start.jar.sha1
    lucene/dev/branches/LUCENE-2878/solr/scripts/   (props changed)
    lucene/dev/branches/LUCENE-2878/solr/site/   (props changed)
    lucene/dev/branches/LUCENE-2878/solr/solrj/   (props changed)
    lucene/dev/branches/LUCENE-2878/solr/solrj/ivy.xml
    lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/client/solrj/request/ContentStreamUpdateRequest.java
    lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/client/solrj/request/SolrPing.java
    lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/SolrException.java
    lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
    lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZooKeeper.java
    lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
    lucene/dev/branches/LUCENE-2878/solr/solrj/src/java/org/apache/solr/common/params/FacetParams.java
    lucene/dev/branches/LUCENE-2878/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
    lucene/dev/branches/LUCENE-2878/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
    lucene/dev/branches/LUCENE-2878/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServer.java
    lucene/dev/branches/LUCENE-2878/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java
    lucene/dev/branches/LUCENE-2878/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerTest.java
    lucene/dev/branches/LUCENE-2878/solr/test-framework/   (props changed)
    lucene/dev/branches/LUCENE-2878/solr/test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java
    lucene/dev/branches/LUCENE-2878/solr/test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.java
    lucene/dev/branches/LUCENE-2878/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
    lucene/dev/branches/LUCENE-2878/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java
    lucene/dev/branches/LUCENE-2878/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
    lucene/dev/branches/LUCENE-2878/solr/test-framework/src/java/org/apache/solr/util/RevertDefaultThreadHandlerRule.java
    lucene/dev/branches/LUCENE-2878/solr/testlogging.properties   (props changed)
    lucene/dev/branches/LUCENE-2878/solr/webapp/   (props changed)

Modified: lucene/dev/branches/LUCENE-2878/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/build.xml?rev=1412849&r1=1412848&r2=1412849&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/build.xml (original)
+++ lucene/dev/branches/LUCENE-2878/build.xml Fri Nov 23 12:00:32 2012
@@ -38,7 +38,9 @@
   <target name="test" description="Test both Lucene and Solr">
     <subant target="test" inheritall="false" failonerror="true">
       <fileset dir="lucene" includes="build.xml" />
+      <!-- enable again when solr tests are passing
       <fileset dir="solr" includes="build.xml" />
+      -->
     </subant>
   </target>
 

Modified: lucene/dev/branches/LUCENE-2878/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/eclipse/dot.classpath?rev=1412849&r1=1412848&r2=1412849&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/eclipse/dot.classpath Fri Nov 23 12:00:32 2012
@@ -119,23 +119,24 @@
   <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/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.2.v20120308.jar"/>
-  <classpathentry kind="lib" path="solr/example/lib/jetty-deploy-8.1.2.v20120308.jar"/>
-  <classpathentry kind="lib" path="solr/example/lib/jetty-http-8.1.2.v20120308.jar"/>
-  <classpathentry kind="lib" path="solr/example/lib/jetty-io-8.1.2.v20120308.jar"/>
-  <classpathentry kind="lib" path="solr/example/lib/jetty-jmx-8.1.2.v20120308.jar"/>
-  <classpathentry kind="lib" path="solr/example/lib/jetty-security-8.1.2.v20120308.jar"/>
-  <classpathentry kind="lib" path="solr/example/lib/jetty-server-8.1.2.v20120308.jar"/>
-  <classpathentry kind="lib" path="solr/example/lib/jetty-servlet-8.1.2.v20120308.jar"/>
-  <classpathentry kind="lib" path="solr/example/lib/jetty-util-8.1.2.v20120308.jar"/>
-  <classpathentry kind="lib" path="solr/example/lib/jetty-webapp-8.1.2.v20120308.jar"/>
-  <classpathentry kind="lib" path="solr/example/lib/jetty-xml-8.1.2.v20120308.jar"/>
+  <classpathentry kind="lib" path="solr/solrj/lib/zookeeper-3.4.5.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/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"/>
@@ -146,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"/>

Modified: lucene/dev/branches/LUCENE-2878/dev-tools/eclipse/dot.project
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/eclipse/dot.project?rev=1412849&r1=1412848&r2=1412849&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/eclipse/dot.project (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/eclipse/dot.project Fri Nov 23 12:00:32 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/LUCENE-2878/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml?rev=1412849&r1=1412848&r2=1412849&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml Fri Nov 23 12:00:32 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/LUCENE-2878/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/pom.xml.template?rev=1412849&r1=1412848&r2=1412849&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/pom.xml.template Fri Nov 23 12:00:32 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.2.v20120308</jetty.version>
+    <jetty.version>8.1.7.v20120910</jetty.version>
     <slf4j.version>1.6.4</slf4j.version>
     <tika.version>1.2</tika.version>
     <httpcomponents.version>4.1.3</httpcomponents.version>
@@ -150,6 +150,11 @@
         <version>r05</version>
       </dependency>
       <dependency>
+        <groupId>com.yammer.metrics</groupId>
+        <artifactId>metrics-core</artifactId>
+        <version>2.1.2</version>
+      </dependency>
+      <dependency>
         <groupId>commons-codec</groupId>
         <artifactId>commons-codec</artifactId>
         <version>1.7</version>
@@ -269,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>
@@ -338,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>

Modified: lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template?rev=1412849&r1=1412848&r2=1412849&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template Fri Nov 23 12:00:32 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/LUCENE-2878/dev-tools/maven/solr/core/src/java/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/core/src/java/pom.xml.template?rev=1412849&r1=1412848&r2=1412849&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/core/src/java/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/maven/solr/core/src/java/pom.xml.template Fri Nov 23 12:00:32 2012
@@ -196,6 +196,10 @@
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpmime</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.yammer.metrics</groupId>
+      <artifactId>metrics-core</artifactId>
+    </dependency>
   </dependencies>
   <build>
     <sourceDirectory>${module-path}</sourceDirectory>

Modified: lucene/dev/branches/LUCENE-2878/dev-tools/scripts/smokeTestRelease.py
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/dev-tools/scripts/smokeTestRelease.py?rev=1412849&r1=1412848&r2=1412849&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/dev-tools/scripts/smokeTestRelease.py (original)
+++ lucene/dev/branches/LUCENE-2878/dev-tools/scripts/smokeTestRelease.py Fri Nov 23 12:00:32 2012
@@ -64,7 +64,7 @@ def javaExe(version):
     raise RuntimeError("unknown Java version '%s'" % version)
   if cygwin:
     path = os.popen('cygpath -u "%s"' % path).read().strip()
-  return 'export JAVA_HOME="%s" PATH="%s/bin:$PATH"' % (path, path)
+  return 'export JAVA_HOME="%s" PATH="%s/bin:$PATH" JAVACMD="%s/bin/java"' % (path, path, path)
 
 def verifyJavaVersion(version):
   s = os.popen('%s; java -version 2>&1' % javaExe(version)).read()
@@ -77,11 +77,13 @@ try:
   JAVA6_HOME = env['JAVA6_HOME']
 except KeyError:
   JAVA6_HOME = '/usr/local/jdk1.6.0_27'
+print('JAVA6_HOME is %s' % JAVA6_HOME)
 
 try:
   JAVA7_HOME = env['JAVA7_HOME']
 except KeyError:
   JAVA7_HOME = '/usr/local/jdk1.7.0_01'
+print('JAVA7_HOME is %s' % JAVA7_HOME)
 
 verifyJavaVersion('1.6')
 verifyJavaVersion('1.7')
@@ -461,27 +463,29 @@ def cygwinifyPaths(command):
   if '; ant ' in command: command = reUnixPath.sub(unix2win, command)
   return command
 
+def printFileContents(fileName):
+
+  # Assume log file was written in system's default encoding, but
+  # even if we are wrong, we replace errors ... the ASCII chars
+  # (which is what we mostly care about eg for the test seed) should
+  # still survive:
+  txt = codecs.open(fileName, 'r', encoding=sys.getdefaultencoding(), errors='replace').read()
+
+  # Encode to our output encoding (likely also system's default
+  # encoding):
+  bytes = txt.encode(sys.stdout.encoding, errors='replace')
+
+  # Decode back to string and print... we should hit no exception here
+  # since all errors have been replaced:
+  print(codecs.getdecoder(sys.stdout.encoding)(bytes)[0])
+  print()
+
 def run(command, logFile):
   if cygwin: command = cygwinifyPaths(command)
   if os.system('%s > %s 2>&1' % (command, logFile)):
     logPath = os.path.abspath(logFile)
     print('\ncommand "%s" failed:' % command)
-
-    # Assume log file was written in system's default encoding, but
-    # even if we are wrong, we replace errors ... the ASCII chars
-    # (which is what we mostly care about eg for the test seed) should
-    # still survive:
-    txt = codecs.open(logPath, 'r', encoding=sys.getdefaultencoding(), errors='replace').read()
-
-    # Encode to our output encoding (likely also system's default
-    # encoding):
-    bytes = txt.encode(sys.stdout.encoding, errors='replace')
-
-    # Decode back to string and print... we should hit no exception here
-    # since all errors have been replaced:
-    print(codecs.getdecoder(sys.stdout.encoding)(bytes)[0])
-    print()
-
+    printFileContents(logFile)
     raise RuntimeError('command "%s" failed; see log file %s' % (command, logPath))
     
 def verifyDigests(artifact, urlString, tmpDir):
@@ -760,19 +764,29 @@ def readSolrOutput(p, startupEvent, fail
   f = open(logFile, 'wb')
   try:
     while True:
-      line = p.readline()
+      line = p.stderr.readline()
       if len(line) == 0:
+        p.poll()
+        if not startupEvent.isSet():
+          failureEvent.set()
+          startupEvent.set()
         break
       f.write(line)
       f.flush()
-      # print 'SOLR: %s' % line.strip()
-      if not startupEvent.isSet() and line.find(b'Started SocketConnector@0.0.0.0:8983') != -1:
-        startupEvent.set()
+      #print('SOLR: %s' % line.strip())
+      if not startupEvent.isSet():
+        if line.find(b'Started SocketConnector@0.0.0.0:8983') != -1:
+          startupEvent.set()
+        elif p.poll() is not None:
+          failureEvent.set()
+          startupEvent.set()
+          break
   except:
     print()
     print('Exception reading Solr output:')
     traceback.print_exc()
     failureEvent.set()
+    startupEvent.set()
   finally:
     f.close()
     
@@ -784,16 +798,24 @@ def testSolrExample(unpackPath, javaPath
   env.update(os.environ)
   env['JAVA_HOME'] = javaPath
   env['PATH'] = '%s/bin:%s' % (javaPath, env['PATH'])
-  server = subprocess.Popen(['java', '-jar', 'start.jar'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env)
+  server = subprocess.Popen(['java', '-jar', 'start.jar'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE, env=env)
 
   startupEvent = threading.Event()
   failureEvent = threading.Event()
-  serverThread = threading.Thread(target=readSolrOutput, args=(server.stderr, startupEvent, failureEvent, logFile))
+  serverThread = threading.Thread(target=readSolrOutput, args=(server, startupEvent, failureEvent, logFile))
   serverThread.setDaemon(True)
   serverThread.start()
 
   # Make sure Solr finishes startup:
-  startupEvent.wait()
+  if not startupEvent.wait(1800):
+    raise RuntimeError('startup took more than 30 minutes')
+  if failureEvent.isSet():
+    logFile = os.path.abspath(logFile)
+    print
+    print('Startup failed; see log %s' % logFile)
+    printFileContents(logFile)
+    raise RuntimeError('failure on startup; see log %s' % logFile)
+    
   print('      startup done')
   
   try: