You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jp...@apache.org on 2014/09/01 13:37:07 UTC

svn commit: r1621751 - in /lucene/dev/branches/lucene5858: ./ lucene/ lucene/backward-codecs/ lucene/backward-codecs/src/ lucene/backward-codecs/src/java/ lucene/backward-codecs/src/java/org/ lucene/backward-codecs/src/java/org/apache/ lucene/backward-...

Author: jpountz
Date: Mon Sep  1 11:37:03 2014
New Revision: 1621751

URL: http://svn.apache.org/r1621751
Log:
LUCENE-5858: First iteration.

Tests pass but the rest (eg. javadocs) might be completely broken.

Added:
    lucene/dev/branches/lucene5858/lucene/backward-codecs/
    lucene/dev/branches/lucene5858/lucene/backward-codecs/build.xml   (with props)
    lucene/dev/branches/lucene5858/lucene/backward-codecs/ivy.xml   (with props)
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/java/
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/java/org/
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/java/org/apache/
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/java/org/apache/lucene/
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/java/org/apache/lucene/codecs/
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/
      - copied from r1621688, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene40/
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene41/
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene41/Lucene41Codec.java
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41Codec.java
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene42/
      - copied from r1621688, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene42/
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene45/
      - copied from r1621688, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene45/
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene46/
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene46/Lucene46Codec.java
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene46/Lucene46Codec.java
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene49/
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene49/Lucene49Codec.java
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene49/Lucene49Codec.java
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene49/Lucene49DocValuesConsumer.java
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene49/Lucene49DocValuesConsumer.java
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene49/Lucene49DocValuesFormat.java
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene49/Lucene49DocValuesFormat.java
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene49/Lucene49DocValuesProducer.java
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene49/Lucene49DocValuesProducer.java
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/resources/
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/resources/META-INF/
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/resources/META-INF/services/
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/resources/META-INF/services/org.apache.lucene.codecs.Codec
      - copied, changed from r1621688, lucene/dev/trunk/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.Codec
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat
      - copied, changed from r1621688, lucene/dev/trunk/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat
      - copied, changed from r1621688, lucene/dev/trunk/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test-resources/
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test-resources/META-INF/
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test-resources/META-INF/services/
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test-resources/META-INF/services/org.apache.lucene.codecs.Codec
      - copied, changed from r1621688, lucene/dev/trunk/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.Codec
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test-resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat
      - copied, changed from r1621688, lucene/dev/trunk/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test-resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat
      - copied, changed from r1621688, lucene/dev/trunk/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/codecs/
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/
      - copied from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene40/
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/Lucene40DocValuesWriter.java
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene40/Lucene40DocValuesWriter.java
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/Lucene40FieldInfosWriter.java
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene40/Lucene40FieldInfosWriter.java
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/Lucene40PostingsWriter.java
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene40/Lucene40PostingsWriter.java
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/Lucene40RWCodec.java
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene40/Lucene40RWCodec.java
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/Lucene40RWDocValuesFormat.java
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene40/Lucene40RWDocValuesFormat.java
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/Lucene40RWNormsFormat.java
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene40/Lucene40RWNormsFormat.java
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/Lucene40RWPostingsFormat.java
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene40/Lucene40RWPostingsFormat.java
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/Lucene40RWStoredFieldsFormat.java
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene40/Lucene40RWStoredFieldsFormat.java
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/Lucene40RWTermVectorsFormat.java
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene40/Lucene40RWTermVectorsFormat.java
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/Lucene40SkipListWriter.java
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene40/Lucene40SkipListWriter.java
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/Lucene40StoredFieldsWriter.java
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene40/Lucene40StoredFieldsWriter.java
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsWriter.java
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsWriter.java
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene41/
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene41/Lucene41RWCodec.java
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene41/Lucene41RWCodec.java
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene42/
      - copied from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene42/
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene42/Lucene42DocValuesConsumer.java
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene42/Lucene42DocValuesConsumer.java
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene42/Lucene42FieldInfosWriter.java
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene42/Lucene42FieldInfosWriter.java
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene42/Lucene42NormsConsumer.java
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene42/Lucene42NormsConsumer.java
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene42/Lucene42RWCodec.java
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene42/Lucene42RWCodec.java
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene42/Lucene42RWDocValuesFormat.java
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene42/Lucene42RWDocValuesFormat.java
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene42/Lucene42RWNormsFormat.java
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene42/Lucene42RWNormsFormat.java
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene45/
      - copied from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene45/
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene45/Lucene45RWCodec.java
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene45/Lucene45RWCodec.java
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene45/Lucene45RWDocValuesFormat.java
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene45/Lucene45RWDocValuesFormat.java
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene46/
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene46/Lucene46RWCodec.java
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene46/Lucene46RWCodec.java
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene49/
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene49/Lucene49RWCodec.java
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene49/Lucene49RWCodec.java
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene49/Lucene49RWDocValuesFormat.java
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene49/Lucene49RWDocValuesFormat.java
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene49/TestLucene49DocValuesFormat.java
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene49/TestLucene49DocValuesFormat.java
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
      - copied, changed from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/dvupdates.48.zip
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/dvupdates.48.zip
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/index.40.cfs.zip
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/index.40.cfs.zip
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/index.40.nocfs.zip
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/index.40.nocfs.zip
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/index.40.optimized.cfs.zip
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.cfs.zip
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/index.40.optimized.nocfs.zip
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.nocfs.zip
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/index.41.cfs.zip
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/index.41.cfs.zip
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/index.41.nocfs.zip
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/index.41.nocfs.zip
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/index.42.cfs.zip
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/index.42.cfs.zip
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/index.42.nocfs.zip
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/index.42.nocfs.zip
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/index.45.cfs.zip
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/index.45.cfs.zip
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/index.45.nocfs.zip
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/index.45.nocfs.zip
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/index.461.cfs.zip
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/index.461.cfs.zip
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/index.461.nocfs.zip
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/index.461.nocfs.zip
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/index.49.cfs.zip
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/index.49.cfs.zip
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/index.49.nocfs.zip
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/index.49.nocfs.zip
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/moreterms.40.zip
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/moreterms.40.zip
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.19.cfs.zip
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/unsupported.19.cfs.zip
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.19.nocfs.zip
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/unsupported.19.nocfs.zip
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.20.cfs.zip
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/unsupported.20.cfs.zip
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.20.nocfs.zip
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/unsupported.20.nocfs.zip
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.21.cfs.zip
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/unsupported.21.cfs.zip
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.21.nocfs.zip
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/unsupported.21.nocfs.zip
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.22.cfs.zip
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/unsupported.22.cfs.zip
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.22.nocfs.zip
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/unsupported.22.nocfs.zip
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.23.cfs.zip
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/unsupported.23.cfs.zip
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.23.nocfs.zip
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/unsupported.23.nocfs.zip
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.24.cfs.zip
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/unsupported.24.cfs.zip
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.24.nocfs.zip
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/unsupported.24.nocfs.zip
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.29.cfs.zip
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/unsupported.29.cfs.zip
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.29.nocfs.zip
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/unsupported.29.nocfs.zip
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.30.cfs.zip
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/unsupported.30.cfs.zip
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.30.nocfs.zip
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/unsupported.30.nocfs.zip
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.31.cfs.zip
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/unsupported.31.cfs.zip
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.31.nocfs.zip
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/unsupported.31.nocfs.zip
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.32.cfs.zip
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/unsupported.32.cfs.zip
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.32.nocfs.zip
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/unsupported.32.nocfs.zip
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.34.cfs.zip
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/unsupported.34.cfs.zip
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.34.nocfs.zip
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/unsupported.34.nocfs.zip
    lucene/dev/branches/lucene5858/lucene/core/src/java/org/apache/lucene/codecs/lucene40/
    lucene/dev/branches/lucene5858/lucene/core/src/java/org/apache/lucene/codecs/lucene40/BitVector.java
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene40/BitVector.java
    lucene/dev/branches/lucene5858/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40LiveDocsFormat.java
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40LiveDocsFormat.java
    lucene/dev/branches/lucene5858/lucene/core/src/java/org/apache/lucene/codecs/lucene40/package.html
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene40/package.html
    lucene/dev/branches/lucene5858/lucene/core/src/java/org/apache/lucene/codecs/lucene42/
    lucene/dev/branches/lucene5858/lucene/core/src/java/org/apache/lucene/codecs/lucene42/Lucene42TermVectorsFormat.java
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene42/Lucene42TermVectorsFormat.java
    lucene/dev/branches/lucene5858/lucene/core/src/java/org/apache/lucene/codecs/lucene42/package.html
      - copied unchanged from r1621688, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene42/package.html
Removed:
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/BitVector.java
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/Lucene40LiveDocsFormat.java
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/package.html
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene42/Lucene42TermVectorsFormat.java
    lucene/dev/branches/lucene5858/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene42/package.html
    lucene/dev/branches/lucene5858/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41Codec.java
    lucene/dev/branches/lucene5858/lucene/core/src/java/org/apache/lucene/codecs/lucene45/
    lucene/dev/branches/lucene5858/lucene/core/src/java/org/apache/lucene/codecs/lucene46/Lucene46Codec.java
    lucene/dev/branches/lucene5858/lucene/core/src/java/org/apache/lucene/codecs/lucene49/Lucene49Codec.java
    lucene/dev/branches/lucene5858/lucene/core/src/java/org/apache/lucene/codecs/lucene49/Lucene49DocValuesConsumer.java
    lucene/dev/branches/lucene5858/lucene/core/src/java/org/apache/lucene/codecs/lucene49/Lucene49DocValuesFormat.java
    lucene/dev/branches/lucene5858/lucene/core/src/java/org/apache/lucene/codecs/lucene49/Lucene49DocValuesProducer.java
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/codecs/lucene40/
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/codecs/lucene42/
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/codecs/lucene45/
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/codecs/lucene49/TestLucene49DocValuesFormat.java
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/dvupdates.48.zip
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/index.40.cfs.zip
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/index.40.nocfs.zip
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.cfs.zip
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.nocfs.zip
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/index.41.cfs.zip
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/index.41.nocfs.zip
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/index.42.cfs.zip
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/index.42.nocfs.zip
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/index.45.cfs.zip
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/index.45.nocfs.zip
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/index.461.cfs.zip
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/index.461.nocfs.zip
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/index.49.cfs.zip
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/index.49.nocfs.zip
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/moreterms.40.zip
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/unsupported.19.cfs.zip
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/unsupported.19.nocfs.zip
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/unsupported.20.cfs.zip
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/unsupported.20.nocfs.zip
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/unsupported.21.cfs.zip
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/unsupported.21.nocfs.zip
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/unsupported.22.cfs.zip
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/unsupported.22.nocfs.zip
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/unsupported.23.cfs.zip
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/unsupported.23.nocfs.zip
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/unsupported.24.cfs.zip
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/unsupported.24.nocfs.zip
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/unsupported.29.cfs.zip
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/unsupported.29.nocfs.zip
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/unsupported.30.cfs.zip
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/unsupported.30.nocfs.zip
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/unsupported.31.cfs.zip
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/unsupported.31.nocfs.zip
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/unsupported.32.cfs.zip
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/unsupported.32.nocfs.zip
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/unsupported.34.cfs.zip
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/unsupported.34.nocfs.zip
    lucene/dev/branches/lucene5858/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene40/
    lucene/dev/branches/lucene5858/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene41/
    lucene/dev/branches/lucene5858/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene42/
    lucene/dev/branches/lucene5858/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene45/
    lucene/dev/branches/lucene5858/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene46/
    lucene/dev/branches/lucene5858/lucene/test-framework/src/java/org/apache/lucene/codecs/lucene49/
Modified:
    lucene/dev/branches/lucene5858/build.xml
    lucene/dev/branches/lucene5858/lucene/common-build.xml
    lucene/dev/branches/lucene5858/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsFormat.java
    lucene/dev/branches/lucene5858/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41StoredFieldsFormat.java
    lucene/dev/branches/lucene5858/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.Codec
    lucene/dev/branches/lucene5858/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat
    lucene/dev/branches/lucene5858/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/codecs/lucene41/TestLucene41StoredFieldsFormat.java
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/codecs/lucene49/TestLucene49NormsFormat.java
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/TestBinaryDocValuesUpdates.java
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java
    lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java
    lucene/dev/branches/lucene5858/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheVsDocValues.java
    lucene/dev/branches/lucene5858/lucene/module-build.xml
    lucene/dev/branches/lucene5858/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java
    lucene/dev/branches/lucene5858/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.Codec
    lucene/dev/branches/lucene5858/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat
    lucene/dev/branches/lucene5858/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat
    lucene/dev/branches/lucene5858/solr/common-build.xml

Modified: lucene/dev/branches/lucene5858/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5858/build.xml?rev=1621751&r1=1621750&r2=1621751&view=diff
==============================================================================
--- lucene/dev/branches/lucene5858/build.xml (original)
+++ lucene/dev/branches/lucene5858/build.xml Mon Sep  1 11:37:03 2014
@@ -260,8 +260,8 @@
     </copy>
     
     <pathconvert property="eclipse.fileset.sourcefolders" pathsep="|" dirsep="/">
-      <dirset dir="${basedir}/lucene" includes="**/src/java, **/src/resources, **/src/test, **/src/test-files, **/src/examples" excludes="tools/**, build/**, backwards/**" />
-      <dirset dir="${basedir}/solr" includes="**/src/java, **/src/resources, **/src/test, **/src/test-files, **/src/examples" excludes="build/**" />
+      <dirset dir="${basedir}/lucene" includes="**/src/java, **/src/resources, **/src/test, **/src/test-resources, **/src/test-files, **/src/examples" excludes="tools/**, build/**, backwards/**" />
+      <dirset dir="${basedir}/solr" includes="**/src/java, **/src/resources, **/src/test, **/src/test-resources, **/src/test-files, **/src/examples" excludes="build/**" />
       <map from="${basedir}/" to=""/>
     </pathconvert>
     <!-- TODO: find a better way to exclude duplicate JAR files & fix the servlet-api mess! -->

Added: lucene/dev/branches/lucene5858/lucene/backward-codecs/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5858/lucene/backward-codecs/build.xml?rev=1621751&view=auto
==============================================================================
--- lucene/dev/branches/lucene5858/lucene/backward-codecs/build.xml (added)
+++ lucene/dev/branches/lucene5858/lucene/backward-codecs/build.xml Mon Sep  1 11:37:03 2014
@@ -0,0 +1,26 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<project name="backward-codecs" default="default">
+
+  <description>
+    Codecs for older versions of Lucene.
+  </description>
+
+  <import file="../module-build.xml"/>
+
+</project>

Added: lucene/dev/branches/lucene5858/lucene/backward-codecs/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5858/lucene/backward-codecs/ivy.xml?rev=1621751&view=auto
==============================================================================
--- lucene/dev/branches/lucene5858/lucene/backward-codecs/ivy.xml (added)
+++ lucene/dev/branches/lucene5858/lucene/backward-codecs/ivy.xml Mon Sep  1 11:37:03 2014
@@ -0,0 +1,21 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.    
+-->
+<ivy-module version="2.0">
+    <info organisation="org.apache.lucene" module="backward-codecs"/>
+</ivy-module>

Copied: lucene/dev/branches/lucene5858/lucene/backward-codecs/src/resources/META-INF/services/org.apache.lucene.codecs.Codec (from r1621688, lucene/dev/trunk/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.Codec)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5858/lucene/backward-codecs/src/resources/META-INF/services/org.apache.lucene.codecs.Codec?p2=lucene/dev/branches/lucene5858/lucene/backward-codecs/src/resources/META-INF/services/org.apache.lucene.codecs.Codec&p1=lucene/dev/trunk/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.Codec&r1=1621688&r2=1621751&rev=1621751&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.Codec (original)
+++ lucene/dev/branches/lucene5858/lucene/backward-codecs/src/resources/META-INF/services/org.apache.lucene.codecs.Codec Mon Sep  1 11:37:03 2014
@@ -19,4 +19,3 @@ org.apache.lucene.codecs.lucene42.Lucene
 org.apache.lucene.codecs.lucene45.Lucene45Codec
 org.apache.lucene.codecs.lucene46.Lucene46Codec
 org.apache.lucene.codecs.lucene49.Lucene49Codec
-org.apache.lucene.codecs.lucene410.Lucene410Codec

Copied: lucene/dev/branches/lucene5858/lucene/backward-codecs/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat (from r1621688, lucene/dev/trunk/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5858/lucene/backward-codecs/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat?p2=lucene/dev/branches/lucene5858/lucene/backward-codecs/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat&p1=lucene/dev/trunk/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat&r1=1621688&r2=1621751&rev=1621751&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat (original)
+++ lucene/dev/branches/lucene5858/lucene/backward-codecs/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat Mon Sep  1 11:37:03 2014
@@ -16,4 +16,3 @@
 org.apache.lucene.codecs.lucene42.Lucene42DocValuesFormat
 org.apache.lucene.codecs.lucene45.Lucene45DocValuesFormat
 org.apache.lucene.codecs.lucene49.Lucene49DocValuesFormat
-org.apache.lucene.codecs.lucene410.Lucene410DocValuesFormat

Copied: lucene/dev/branches/lucene5858/lucene/backward-codecs/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat (from r1621688, lucene/dev/trunk/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5858/lucene/backward-codecs/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat?p2=lucene/dev/branches/lucene5858/lucene/backward-codecs/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat&p1=lucene/dev/trunk/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat&r1=1621688&r2=1621751&rev=1621751&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat (original)
+++ lucene/dev/branches/lucene5858/lucene/backward-codecs/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat Mon Sep  1 11:37:03 2014
@@ -14,4 +14,3 @@
 #  limitations under the License.
 
 org.apache.lucene.codecs.lucene40.Lucene40PostingsFormat
-org.apache.lucene.codecs.lucene41.Lucene41PostingsFormat

Copied: lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test-resources/META-INF/services/org.apache.lucene.codecs.Codec (from r1621688, lucene/dev/trunk/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.Codec)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test-resources/META-INF/services/org.apache.lucene.codecs.Codec?p2=lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test-resources/META-INF/services/org.apache.lucene.codecs.Codec&p1=lucene/dev/trunk/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.Codec&r1=1621688&r2=1621751&rev=1621751&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.Codec (original)
+++ lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test-resources/META-INF/services/org.apache.lucene.codecs.Codec Mon Sep  1 11:37:03 2014
@@ -13,12 +13,6 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-org.apache.lucene.codecs.asserting.AssertingCodec
-org.apache.lucene.codecs.cheapbastard.CheapBastardCodec
-org.apache.lucene.codecs.compressing.FastCompressingCodec
-org.apache.lucene.codecs.compressing.FastDecompressionCompressingCodec
-org.apache.lucene.codecs.compressing.HighCompressionCompressingCodec
-org.apache.lucene.codecs.compressing.dummy.DummyCompressingCodec
 org.apache.lucene.codecs.lucene40.Lucene40RWCodec
 org.apache.lucene.codecs.lucene41.Lucene41RWCodec
 org.apache.lucene.codecs.lucene42.Lucene42RWCodec

Copied: lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test-resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat (from r1621688, lucene/dev/trunk/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test-resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat?p2=lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test-resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat&p1=lucene/dev/trunk/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat&r1=1621688&r2=1621751&rev=1621751&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat (original)
+++ lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test-resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat Mon Sep  1 11:37:03 2014
@@ -13,5 +13,4 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-org.apache.lucene.codecs.asserting.AssertingDocValuesFormat
 org.apache.lucene.codecs.lucene42.Lucene42RWDocValuesFormat

Copied: lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test-resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat (from r1621688, lucene/dev/trunk/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test-resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat?p2=lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test-resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat&p1=lucene/dev/trunk/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat&r1=1621688&r2=1621751&rev=1621751&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat (original)
+++ lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test-resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat Mon Sep  1 11:37:03 2014
@@ -13,12 +13,4 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-org.apache.lucene.codecs.mockrandom.MockRandomPostingsFormat
-org.apache.lucene.codecs.nestedpulsing.NestedPulsingPostingsFormat
-org.apache.lucene.codecs.ramonly.RAMOnlyPostingsFormat
-org.apache.lucene.codecs.lucene41ords.Lucene41WithOrds
-org.apache.lucene.codecs.lucene41vargap.Lucene41VarGapFixedInterval
-org.apache.lucene.codecs.lucene41vargap.Lucene41VarGapDocFreqInterval
-org.apache.lucene.codecs.bloom.TestBloomFilteredLucene41Postings
-org.apache.lucene.codecs.asserting.AssertingPostingsFormat
 org.apache.lucene.codecs.lucene40.Lucene40RWPostingsFormat

Copied: lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (from r1621688, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java?p2=lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java&p1=lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java&r1=1621688&r2=1621751&rev=1621751&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (original)
+++ lucene/dev/branches/lucene5858/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java Mon Sep  1 11:37:03 2014
@@ -167,8 +167,8 @@ public class TestBackwardsCompatibility 
   }
   
   private void updateBinary(IndexWriter writer, String id, String f, String cf, long value) throws IOException {
-    writer.updateBinaryDocValue(new Term("id", id), f, TestBinaryDocValuesUpdates.toBytes(value));
-    writer.updateBinaryDocValue(new Term("id", id), cf, TestBinaryDocValuesUpdates.toBytes(value*2));
+    writer.updateBinaryDocValue(new Term("id", id), f, TestDocValuesUpdatesOnOldSegments.toBytes(value));
+    writer.updateBinaryDocValue(new Term("id", id), cf, TestDocValuesUpdatesOnOldSegments.toBytes(value*2));
   }
 
 /*  // Creates an index with DocValues updates
@@ -191,10 +191,10 @@ public class TestBackwardsCompatibility 
       doc.add(new NumericDocValuesField("ndv1_c", i*2));
       doc.add(new NumericDocValuesField("ndv2", i*3));
       doc.add(new NumericDocValuesField("ndv2_c", i*6));
-      doc.add(new BinaryDocValuesField("bdv1", TestBinaryDocValuesUpdates.toBytes(i)));
-      doc.add(new BinaryDocValuesField("bdv1_c", TestBinaryDocValuesUpdates.toBytes(i*2)));
-      doc.add(new BinaryDocValuesField("bdv2", TestBinaryDocValuesUpdates.toBytes(i*3)));
-      doc.add(new BinaryDocValuesField("bdv2_c", TestBinaryDocValuesUpdates.toBytes(i*6)));
+      doc.add(new BinaryDocValuesField("bdv1", TestDocValuesUpdatesOnOldSegments.toBytes(i)));
+      doc.add(new BinaryDocValuesField("bdv1_c", TestDocValuesUpdatesOnOldSegments.toBytes(i*2)));
+      doc.add(new BinaryDocValuesField("bdv2", TestDocValuesUpdatesOnOldSegments.toBytes(i*3)));
+      doc.add(new BinaryDocValuesField("bdv2_c", TestDocValuesUpdatesOnOldSegments.toBytes(i*6)));
       writer.addDocument(doc);
       if ((i+1) % 10 == 0) {
         writer.commit(); // flush every 10 docs
@@ -1085,7 +1085,7 @@ public class TestBackwardsCompatibility 
     BinaryDocValues bdvf = r.getBinaryDocValues(f);
     BinaryDocValues bdvcf = r.getBinaryDocValues(cf);
     for (int i = 0; i < r.maxDoc(); i++) {
-      assertEquals(TestBinaryDocValuesUpdates.getValue(bdvcf, i), TestBinaryDocValuesUpdates.getValue(bdvf, i)*2);
+      assertEquals(TestDocValuesUpdatesOnOldSegments.getValue(bdvcf, i), TestDocValuesUpdatesOnOldSegments.getValue(bdvf, i)*2);
     }
   }
   

Modified: lucene/dev/branches/lucene5858/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5858/lucene/common-build.xml?rev=1621751&r1=1621750&r2=1621751&view=diff
==============================================================================
--- lucene/dev/branches/lucene5858/lucene/common-build.xml (original)
+++ lucene/dev/branches/lucene5858/lucene/common-build.xml Mon Sep  1 11:37:03 2014
@@ -227,6 +227,7 @@
   <property name="src.dir" location="src/java"/>
   <property name="resources.dir" location="${src.dir}/../resources"/>
   <property name="tests.src.dir" location="src/test"/>
+  <property name="tests.resources.dir" location="${tests.src.dir}/../test-resources"/>
   <available property="module.has.tests" type="dir" file="${tests.src.dir}"/>
   <property name="build.dir" location="build"/>
   <!-- Needed in case a module needs the original build, also for compile-tools to be called from a module -->
@@ -794,10 +795,14 @@
   </target>
 
   <target name="compile-test" depends="compile-core,compile-test-framework">
-  	<compile-test-macro srcdir="${tests.src.dir}" destdir="${build.dir}/classes/test"
-  						test.classpath="test.classpath"/>
+    <compile-test-macro srcdir="${tests.src.dir}" destdir="${build.dir}/classes/test" test.classpath="test.classpath"/>
+
+    <!-- Copy the resources folder (if existent) -->
+    <copy todir="${build.dir}/classes/test">
+      <fileset dir="${tests.resources.dir}" erroronmissingdir="no"/>
+    </copy>
   </target>
-	
+
   <macrodef name="compile-test-macro" description="Compiles junit tests.">
   	<attribute name="srcdir"/>
   	<attribute name="destdir"/>
@@ -1720,6 +1725,7 @@ ${ant.project.name}.test.dependencies=${
 
       <!-- TODO: Check all resource files. Currently not all stopword and similar files have no header! -->
       <fileset dir="${resources.dir}" includes="META-INF/**" erroronmissingdir="false"/>
+      <fileset dir="${tests.resources.dir}" includes="META-INF/**" erroronmissingdir="false"/>
       
       <!-- BSD 4-clause stuff (is disallowed below) -->
       <rat:substringMatcher licenseFamilyCategory="BSD4 "

Modified: lucene/dev/branches/lucene5858/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5858/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsFormat.java?rev=1621751&r1=1621750&r2=1621751&view=diff
==============================================================================
--- lucene/dev/branches/lucene5858/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsFormat.java (original)
+++ lucene/dev/branches/lucene5858/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsFormat.java Mon Sep  1 11:37:03 2014
@@ -23,7 +23,6 @@ import org.apache.lucene.codecs.CodecUti
 import org.apache.lucene.codecs.StoredFieldsFormat;
 import org.apache.lucene.codecs.StoredFieldsReader;
 import org.apache.lucene.codecs.StoredFieldsWriter;
-import org.apache.lucene.codecs.lucene40.Lucene40StoredFieldsFormat;
 import org.apache.lucene.index.FieldInfos;
 import org.apache.lucene.index.MergePolicy;
 import org.apache.lucene.index.SegmentInfo;
@@ -32,14 +31,12 @@ import org.apache.lucene.store.IOContext
 
 
 /**
- * A {@link StoredFieldsFormat} that is very similar to
- * {@link Lucene40StoredFieldsFormat} but compresses documents in chunks in
+ * A {@link StoredFieldsFormat} that compresses documents in chunks in
  * order to improve the compression ratio.
  * <p>
  * For a chunk size of <tt>chunkSize</tt> bytes, this {@link StoredFieldsFormat}
  * does not support documents larger than (<tt>2<sup>31</sup> - chunkSize</tt>)
- * bytes. In case this is a problem, you should use another format, such as
- * {@link Lucene40StoredFieldsFormat}.
+ * bytes.
  * <p>
  * For optimal performance, you should use a {@link MergePolicy} that returns
  * segments that have the biggest byte size first.
@@ -81,8 +78,6 @@ public class CompressingStoredFieldsForm
    * <p>
    * <code>chunkSize</code> is the minimum byte size of a chunk of documents.
    * A value of <code>1</code> can make sense if there is redundancy across
-   * fields. In that case, both performance and compression ratio should be
-   * better than with {@link Lucene40StoredFieldsFormat} with compressed
    * fields.
    * <p>
    * Higher values of <code>chunkSize</code> should improve the compression

Modified: lucene/dev/branches/lucene5858/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41StoredFieldsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5858/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41StoredFieldsFormat.java?rev=1621751&r1=1621750&r2=1621751&view=diff
==============================================================================
--- lucene/dev/branches/lucene5858/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41StoredFieldsFormat.java (original)
+++ lucene/dev/branches/lucene5858/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41StoredFieldsFormat.java Mon Sep  1 11:37:03 2014
@@ -22,7 +22,6 @@ import org.apache.lucene.codecs.StoredFi
 import org.apache.lucene.codecs.compressing.CompressingStoredFieldsFormat;
 import org.apache.lucene.codecs.compressing.CompressingStoredFieldsIndexWriter;
 import org.apache.lucene.codecs.compressing.CompressionMode;
-import org.apache.lucene.codecs.lucene40.Lucene40StoredFieldsFormat;
 import org.apache.lucene.index.StoredFieldVisitor;
 import org.apache.lucene.store.DataOutput;
 import org.apache.lucene.util.packed.PackedInts;
@@ -112,9 +111,7 @@ import org.apache.lucene.util.packed.Pac
  * </ol>
  * <p><b>Known limitations</b></p>
  * <p>This {@link StoredFieldsFormat} does not support individual documents
- * larger than (<tt>2<sup>31</sup> - 2<sup>14</sup></tt>) bytes. In case this
- * is a problem, you should use another format, such as
- * {@link Lucene40StoredFieldsFormat}.</p>
+ * larger than (<tt>2<sup>31</sup> - 2<sup>14</sup></tt>) bytes.</p>
  * @lucene.experimental
  */
 public final class Lucene41StoredFieldsFormat extends CompressingStoredFieldsFormat {

Modified: lucene/dev/branches/lucene5858/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.Codec
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5858/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.Codec?rev=1621751&r1=1621750&r2=1621751&view=diff
==============================================================================
--- lucene/dev/branches/lucene5858/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.Codec (original)
+++ lucene/dev/branches/lucene5858/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.Codec Mon Sep  1 11:37:03 2014
@@ -13,10 +13,4 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-org.apache.lucene.codecs.lucene40.Lucene40Codec
-org.apache.lucene.codecs.lucene41.Lucene41Codec
-org.apache.lucene.codecs.lucene42.Lucene42Codec
-org.apache.lucene.codecs.lucene45.Lucene45Codec
-org.apache.lucene.codecs.lucene46.Lucene46Codec
-org.apache.lucene.codecs.lucene49.Lucene49Codec
 org.apache.lucene.codecs.lucene410.Lucene410Codec

Modified: lucene/dev/branches/lucene5858/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5858/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat?rev=1621751&r1=1621750&r2=1621751&view=diff
==============================================================================
--- lucene/dev/branches/lucene5858/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat (original)
+++ lucene/dev/branches/lucene5858/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat Mon Sep  1 11:37:03 2014
@@ -13,7 +13,4 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-org.apache.lucene.codecs.lucene42.Lucene42DocValuesFormat
-org.apache.lucene.codecs.lucene45.Lucene45DocValuesFormat
-org.apache.lucene.codecs.lucene49.Lucene49DocValuesFormat
 org.apache.lucene.codecs.lucene410.Lucene410DocValuesFormat

Modified: lucene/dev/branches/lucene5858/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5858/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat?rev=1621751&r1=1621750&r2=1621751&view=diff
==============================================================================
--- lucene/dev/branches/lucene5858/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat (original)
+++ lucene/dev/branches/lucene5858/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat Mon Sep  1 11:37:03 2014
@@ -13,5 +13,4 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-org.apache.lucene.codecs.lucene40.Lucene40PostingsFormat
 org.apache.lucene.codecs.lucene41.Lucene41PostingsFormat

Modified: lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/codecs/lucene41/TestLucene41StoredFieldsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/codecs/lucene41/TestLucene41StoredFieldsFormat.java?rev=1621751&r1=1621750&r2=1621751&view=diff
==============================================================================
--- lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/codecs/lucene41/TestLucene41StoredFieldsFormat.java (original)
+++ lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/codecs/lucene41/TestLucene41StoredFieldsFormat.java Mon Sep  1 11:37:03 2014
@@ -18,18 +18,12 @@ package org.apache.lucene.codecs.lucene4
  */
 
 import org.apache.lucene.codecs.Codec;
+import org.apache.lucene.codecs.lucene410.Lucene410Codec;
 import org.apache.lucene.index.BaseStoredFieldsFormatTestCase;
-import org.junit.BeforeClass;
 
 public class TestLucene41StoredFieldsFormat extends BaseStoredFieldsFormatTestCase {
-  
-  @BeforeClass
-  public static void beforeClass() {
-    OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec
-  }
-  
   @Override
   protected Codec getCodec() {
-    return new Lucene41RWCodec();
+    return new Lucene410Codec();
   }
 }

Modified: lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/codecs/lucene49/TestLucene49NormsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/codecs/lucene49/TestLucene49NormsFormat.java?rev=1621751&r1=1621750&r2=1621751&view=diff
==============================================================================
--- lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/codecs/lucene49/TestLucene49NormsFormat.java (original)
+++ lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/codecs/lucene49/TestLucene49NormsFormat.java Mon Sep  1 11:37:03 2014
@@ -18,19 +18,14 @@ package org.apache.lucene.codecs.lucene4
  */
 
 import org.apache.lucene.codecs.Codec;
+import org.apache.lucene.codecs.lucene410.Lucene410Codec;
 import org.apache.lucene.index.BaseNormsFormatTestCase;
-import org.junit.BeforeClass;
 
 /**
  * Tests Lucene49NormsFormat
  */
 public class TestLucene49NormsFormat extends BaseNormsFormatTestCase {
-  private final Codec codec = new Lucene49RWCodec();
-  
-  @BeforeClass
-  public static void beforeClass() {
-    OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec
-  }
+  private final Codec codec = new Lucene410Codec();
   
   @Override
   protected Codec getCodec() {

Modified: lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/TestBinaryDocValuesUpdates.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/TestBinaryDocValuesUpdates.java?rev=1621751&r1=1621750&r2=1621751&view=diff
==============================================================================
--- lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/TestBinaryDocValuesUpdates.java (original)
+++ lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/TestBinaryDocValuesUpdates.java Mon Sep  1 11:37:03 2014
@@ -9,13 +9,8 @@ import java.util.concurrent.atomic.Atomi
 
 import org.apache.lucene.analysis.MockAnalyzer;
 import org.apache.lucene.analysis.MockTokenizer;
-import org.apache.lucene.codecs.Codec;
 import org.apache.lucene.codecs.DocValuesFormat;
 import org.apache.lucene.codecs.asserting.AssertingDocValuesFormat;
-import org.apache.lucene.codecs.lucene40.Lucene40RWCodec;
-import org.apache.lucene.codecs.lucene41.Lucene41RWCodec;
-import org.apache.lucene.codecs.lucene42.Lucene42RWCodec;
-import org.apache.lucene.codecs.lucene45.Lucene45RWCodec;
 import org.apache.lucene.codecs.lucene410.Lucene410Codec;
 import org.apache.lucene.codecs.lucene410.Lucene410DocValuesFormat;
 import org.apache.lucene.document.BinaryDocValuesField;
@@ -32,7 +27,6 @@ import org.apache.lucene.util.Bits;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.IOUtils;
 import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
 import org.apache.lucene.util.TestUtil;
 import org.junit.Test;
 
@@ -55,8 +49,6 @@ import com.carrotsearch.randomizedtestin
  * limitations under the License.
  */
 
-@SuppressCodecs({"Lucene40","Lucene41","Lucene42","Lucene45"})
-@SuppressWarnings("resource")
 public class TestBinaryDocValuesUpdates extends LuceneTestCase {
 
   static long getValue(BinaryDocValues bdv, int idx) {
@@ -861,38 +853,6 @@ public class TestBinaryDocValuesUpdates 
     dir.close();
   }
   
-  public void testUpdateOldSegments() throws Exception {
-    Codec[] oldCodecs = new Codec[] { new Lucene40RWCodec(), new Lucene41RWCodec(), new Lucene42RWCodec(), new Lucene45RWCodec() };
-    Directory dir = newDirectory();
-    
-    boolean oldValue = OLD_FORMAT_IMPERSONATION_IS_ACTIVE;
-    // create a segment with an old Codec
-    IndexWriterConfig conf = newIndexWriterConfig(new MockAnalyzer(random()));
-    conf.setCodec(oldCodecs[random().nextInt(oldCodecs.length)]);
-    OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true;
-    IndexWriter writer = new IndexWriter(dir, conf);
-    Document doc = new Document();
-    doc.add(new StringField("id", "doc", Store.NO));
-    doc.add(new BinaryDocValuesField("f", toBytes(5L)));
-    writer.addDocument(doc);
-    writer.close();
-    
-    conf = newIndexWriterConfig(new MockAnalyzer(random()));
-    writer = new IndexWriter(dir, conf);
-    writer.updateBinaryDocValue(new Term("id", "doc"), "f", toBytes(4L));
-    OLD_FORMAT_IMPERSONATION_IS_ACTIVE = false;
-    try {
-      writer.close();
-      fail("should not have succeeded to update a segment written with an old Codec");
-    } catch (UnsupportedOperationException e) {
-      writer.rollback(); 
-    } finally {
-      OLD_FORMAT_IMPERSONATION_IS_ACTIVE = oldValue;
-    }
-    
-    dir.close();
-  }
-  
   public void testStressMultiThreading() throws Exception {
     final Directory dir = newDirectory();
     IndexWriterConfig conf = newIndexWriterConfig(new MockAnalyzer(random()));

Modified: lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java?rev=1621751&r1=1621750&r2=1621751&view=diff
==============================================================================
--- lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java (original)
+++ lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java Mon Sep  1 11:37:03 2014
@@ -27,9 +27,6 @@ import org.apache.lucene.analysis.MockAn
 import org.apache.lucene.codecs.Codec;
 import org.apache.lucene.codecs.FieldsConsumer;
 import org.apache.lucene.codecs.FieldsProducer;
-import org.apache.lucene.codecs.lucene40.Lucene40RWCodec;
-import org.apache.lucene.codecs.lucene41.Lucene41RWCodec;
-import org.apache.lucene.codecs.lucene42.Lucene42RWCodec;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field.Store;
 import org.apache.lucene.document.NumericDocValuesField;
@@ -850,29 +847,4 @@ public class TestCodecs extends LuceneTe
     dir.close();
   }
   
-  public void testDisableImpersonation() throws Exception {
-    Codec[] oldCodecs = new Codec[] { new Lucene40RWCodec(), new Lucene41RWCodec(), new Lucene42RWCodec() };
-    Directory dir = newDirectory();
-    IndexWriterConfig conf = newIndexWriterConfig(new MockAnalyzer(random()));
-    conf.setCodec(oldCodecs[random().nextInt(oldCodecs.length)]);
-    IndexWriter writer = new IndexWriter(dir, conf);
-    
-    Document doc = new Document();
-    doc.add(new StringField("f", "bar", Store.YES));
-    doc.add(new NumericDocValuesField("n", 18L));
-    
-    OLD_FORMAT_IMPERSONATION_IS_ACTIVE = false;
-    try {
-      writer.addDocument(doc);
-      writer.close();
-      fail("should not have succeeded to impersonate an old format!");
-    } catch (UnsupportedOperationException e) {
-      writer.rollback();
-    } finally {
-      OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true;
-    }
-    
-    dir.close();
-  }
-  
 }

Modified: lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java?rev=1621751&r1=1621750&r2=1621751&view=diff
==============================================================================
--- lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java (original)
+++ lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java Mon Sep  1 11:37:03 2014
@@ -12,10 +12,6 @@ import org.apache.lucene.analysis.MockTo
 import org.apache.lucene.codecs.Codec;
 import org.apache.lucene.codecs.DocValuesFormat;
 import org.apache.lucene.codecs.asserting.AssertingDocValuesFormat;
-import org.apache.lucene.codecs.lucene40.Lucene40RWCodec;
-import org.apache.lucene.codecs.lucene41.Lucene41RWCodec;
-import org.apache.lucene.codecs.lucene42.Lucene42RWCodec;
-import org.apache.lucene.codecs.lucene45.Lucene45RWCodec;
 import org.apache.lucene.codecs.lucene410.Lucene410DocValuesFormat;
 import org.apache.lucene.codecs.lucene410.Lucene410Codec;
 import org.apache.lucene.document.BinaryDocValuesField;
@@ -854,39 +850,6 @@ public class TestNumericDocValuesUpdates
   }
   
   @Test
-  public void testUpdateOldSegments() throws Exception {
-    Codec[] oldCodecs = new Codec[] { new Lucene40RWCodec(), new Lucene41RWCodec(), new Lucene42RWCodec(), new Lucene45RWCodec() };
-    Directory dir = newDirectory();
-    
-    boolean oldValue = OLD_FORMAT_IMPERSONATION_IS_ACTIVE;
-    // create a segment with an old Codec
-    IndexWriterConfig conf = newIndexWriterConfig(new MockAnalyzer(random()));
-    conf.setCodec(oldCodecs[random().nextInt(oldCodecs.length)]);
-    OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true;
-    IndexWriter writer = new IndexWriter(dir, conf);
-    Document doc = new Document();
-    doc.add(new StringField("id", "doc", Store.NO));
-    doc.add(new NumericDocValuesField("f", 5));
-    writer.addDocument(doc);
-    writer.close();
-    
-    conf = newIndexWriterConfig(new MockAnalyzer(random()));
-    writer = new IndexWriter(dir, conf);
-    writer.updateNumericDocValue(new Term("id", "doc"), "f", 4L);
-    OLD_FORMAT_IMPERSONATION_IS_ACTIVE = false;
-    try {
-      writer.close();
-      fail("should not have succeeded to update a segment written with an old Codec");
-    } catch (UnsupportedOperationException e) {
-      writer.rollback(); 
-    } finally {
-      OLD_FORMAT_IMPERSONATION_IS_ACTIVE = oldValue;
-    }
-    
-    dir.close();
-  }
-  
-  @Test
   public void testStressMultiThreading() throws Exception {
     final Directory dir = newDirectory();
     IndexWriterConfig conf = newIndexWriterConfig(new MockAnalyzer(random()));

Modified: lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java?rev=1621751&r1=1621750&r2=1621751&view=diff
==============================================================================
--- lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java (original)
+++ lucene/dev/branches/lucene5858/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java Mon Sep  1 11:37:03 2014
@@ -55,7 +55,7 @@ public class TestFileSwitchDirectory ext
     IndexWriter writer = new IndexWriter(
         fsd,
         new IndexWriterConfig(new MockAnalyzer(random())).
-            setMergePolicy(newLogMergePolicy(false)).setCodec(Codec.forName("Lucene40")).setUseCompoundFile(false)
+            setMergePolicy(newLogMergePolicy(false)).setCodec(Codec.forName("Lucene410")).setUseCompoundFile(false)
     );
     TestIndexWriterReader.createIndexNoClose(true, "ram", writer);
     IndexReader reader = DirectoryReader.open(writer, true);

Modified: lucene/dev/branches/lucene5858/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheVsDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5858/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheVsDocValues.java?rev=1621751&r1=1621750&r2=1621751&view=diff
==============================================================================
--- lucene/dev/branches/lucene5858/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheVsDocValues.java (original)
+++ lucene/dev/branches/lucene5858/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheVsDocValues.java Mon Sep  1 11:37:03 2014
@@ -25,7 +25,6 @@ import java.util.List;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.codecs.lucene42.Lucene42DocValuesFormat;
 import org.apache.lucene.document.BinaryDocValuesField;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
@@ -211,6 +210,8 @@ public class TestFieldCacheVsDocValues e
     d.close();
   }
 
+  private static final int LARGE_BINARY_FIELD_LENGTH = (1 << 15) - 2;
+
   // TODO: get this out of here and into the deprecated codecs (4.0, 4.2)
   public void testHugeBinaryValueLimit() throws Exception {
     // We only test DVFormats that have a limit
@@ -226,7 +227,7 @@ public class TestFieldCacheVsDocValues e
       // Sometimes make all values fixed length since some
       // codecs have different code paths for this:
       numDocs = TestUtil.nextInt(random(), 10, 20);
-      fixedLength = Lucene42DocValuesFormat.MAX_BINARY_FIELD_LENGTH;
+      fixedLength = LARGE_BINARY_FIELD_LENGTH;
     } else {
       numDocs = TestUtil.nextInt(random(), 100, 200);
     }
@@ -243,9 +244,9 @@ public class TestFieldCacheVsDocValues e
       if (doFixed) {
         numBytes = fixedLength;
       } else if (docID == 0 || random().nextInt(5) == 3) {
-        numBytes = Lucene42DocValuesFormat.MAX_BINARY_FIELD_LENGTH;
+        numBytes = LARGE_BINARY_FIELD_LENGTH;
       } else {
-        numBytes = TestUtil.nextInt(random(), 1, Lucene42DocValuesFormat.MAX_BINARY_FIELD_LENGTH);
+        numBytes = TestUtil.nextInt(random(), 1, LARGE_BINARY_FIELD_LENGTH);
       }
       totalBytes += numBytes;
       if (totalBytes > 5 * 1024*1024) {

Modified: lucene/dev/branches/lucene5858/lucene/module-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5858/lucene/module-build.xml?rev=1621751&r1=1621750&r2=1621751&view=diff
==============================================================================
--- lucene/dev/branches/lucene5858/lucene/module-build.xml (original)
+++ lucene/dev/branches/lucene5858/lucene/module-build.xml Mon Sep  1 11:37:03 2014
@@ -433,6 +433,28 @@
     <property name="codecs-javadocs.uptodate" value="true"/>
   </target>
 
+  <property name="backward-codecs.jar" value="${common.dir}/build/backward-codecs/lucene-backward-codecs-${version}.jar"/>
+  <target name="check-backward-codecs-uptodate" unless="backward-codecs.uptodate">
+    <module-uptodate name="backward-codecs" jarfile="${backward-codecs.jar}" property="backward-codecs.uptodate"/>
+  </target>
+  <target name="jar-backward-codecs" unless="backward-codecs.uptodate" depends="check-backward-codecs-uptodate">
+    <ant dir="${common.dir}/backward-codecs" target="jar-core" inheritall="false">
+      <propertyset refid="uptodate.and.compiled.properties"/>
+    </ant>
+    <property name="backward-codecs.uptodate" value="true"/>
+  </target>
+
+  <property name="backward-codecs-javadoc.jar" value="${common.dir}/build/backward-codecs/lucene-backward-codecs-${version}-javadoc.jar"/>
+  <target name="check-backward-codecs-javadocs-uptodate" unless="backward-codecs-javadocs.uptodate">
+    <module-uptodate name="backward-codecs" jarfile="${backward-codecs-javadoc.jar}" property="backward-codecs-javadocs.uptodate"/>
+  </target>
+  <target name="javadocs-backward-codecs" unless="backward-codecs-javadocs.uptodate" depends="check-backward-codecs-javadocs-uptodate">
+    <ant dir="${common.dir}/backward-codecs" target="javadocs" inheritAll="false">
+      <propertyset refid="uptodate.and.compiled.properties"/>
+    </ant>
+    <property name="backward-codecs-javadocs.uptodate" value="true"/>
+  </target>
+
   <property name="expressions.jar" value="${common.dir}/build/expressions/lucene-expressions-${version}.jar"/>
   <target name="check-expressions-uptodate" unless="expressions.uptodate">
     <module-uptodate name="expressions" jarfile="${expressions.jar}" property="expressions.uptodate"/>

Modified: lucene/dev/branches/lucene5858/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5858/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java?rev=1621751&r1=1621750&r2=1621751&view=diff
==============================================================================
--- lucene/dev/branches/lucene5858/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java (original)
+++ lucene/dev/branches/lucene5858/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java Mon Sep  1 11:37:03 2014
@@ -34,14 +34,7 @@ import org.apache.lucene.codecs.Postings
 import org.apache.lucene.codecs.asserting.AssertingCodec;
 import org.apache.lucene.codecs.cheapbastard.CheapBastardCodec;
 import org.apache.lucene.codecs.compressing.CompressingCodec;
-import org.apache.lucene.codecs.lucene40.Lucene40RWCodec;
-import org.apache.lucene.codecs.lucene40.Lucene40RWPostingsFormat;
-import org.apache.lucene.codecs.lucene41.Lucene41RWCodec;
 import org.apache.lucene.codecs.lucene410.Lucene410Codec;
-import org.apache.lucene.codecs.lucene42.Lucene42RWCodec;
-import org.apache.lucene.codecs.lucene45.Lucene45RWCodec;
-import org.apache.lucene.codecs.lucene46.Lucene46RWCodec;
-import org.apache.lucene.codecs.lucene49.Lucene49RWCodec;
 import org.apache.lucene.codecs.mockrandom.MockRandomPostingsFormat;
 import org.apache.lucene.codecs.simpletext.SimpleTextCodec;
 import org.apache.lucene.index.RandomCodec;
@@ -160,56 +153,7 @@ final class TestRuleSetupAndRestoreClass
     
     savedCodec = Codec.getDefault();
     int randomVal = random.nextInt(11);
-    if ("Lucene40".equals(TEST_CODEC) || ("random".equals(TEST_CODEC) &&
-                                          "random".equals(TEST_POSTINGSFORMAT) &&
-                                          "random".equals(TEST_DOCVALUESFORMAT) &&
-                                          randomVal == 0 &&
-                                          !shouldAvoidCodec("Lucene40"))) {
-      codec = Codec.forName("Lucene40");
-      LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true;
-      assert codec instanceof Lucene40RWCodec : "fix your classpath to have tests-framework.jar before lucene-core.jar";
-      assert (PostingsFormat.forName("Lucene40") instanceof Lucene40RWPostingsFormat) : "fix your classpath to have tests-framework.jar before lucene-core.jar";
-    } else if ("Lucene41".equals(TEST_CODEC) || ("random".equals(TEST_CODEC) &&
-                                                 "random".equals(TEST_POSTINGSFORMAT) &&
-                                                 "random".equals(TEST_DOCVALUESFORMAT) &&
-                                                 randomVal == 1 &&
-                                                 !shouldAvoidCodec("Lucene41"))) { 
-      codec = Codec.forName("Lucene41");
-      LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true;
-      assert codec instanceof Lucene41RWCodec : "fix your classpath to have tests-framework.jar before lucene-core.jar";
-    } else if ("Lucene42".equals(TEST_CODEC) || ("random".equals(TEST_CODEC) &&
-                                                 "random".equals(TEST_POSTINGSFORMAT) &&
-                                                 "random".equals(TEST_DOCVALUESFORMAT) &&
-                                                  randomVal == 2 &&
-                                                  !shouldAvoidCodec("Lucene42"))) { 
-      codec = Codec.forName("Lucene42");
-      LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true;
-      assert codec instanceof Lucene42RWCodec : "fix your classpath to have tests-framework.jar before lucene-core.jar";
-    } else if ("Lucene45".equals(TEST_CODEC) || ("random".equals(TEST_CODEC) &&
-                                                 "random".equals(TEST_POSTINGSFORMAT) &&
-                                                 "random".equals(TEST_DOCVALUESFORMAT) &&
-                                                  randomVal == 3 &&
-                                                  !shouldAvoidCodec("Lucene45"))) { 
-      codec = Codec.forName("Lucene45");
-      LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true;
-      assert codec instanceof Lucene45RWCodec : "fix your classpath to have tests-framework.jar before lucene-core.jar";
-    } else if ("Lucene46".equals(TEST_CODEC) || ("random".equals(TEST_CODEC) &&
-                                                 "random".equals(TEST_POSTINGSFORMAT) &&
-                                                 "random".equals(TEST_DOCVALUESFORMAT) &&
-                                                  randomVal == 4 &&
-                                                  !shouldAvoidCodec("Lucene46"))) { 
-      codec = Codec.forName("Lucene46");
-      LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true;
-      assert codec instanceof Lucene46RWCodec : "fix your classpath to have tests-framework.jar before lucene-core.jar";
-    } else if ("Lucene49".equals(TEST_CODEC) || ("random".equals(TEST_CODEC) &&
-                                                 "random".equals(TEST_POSTINGSFORMAT) &&
-                                                 "random".equals(TEST_DOCVALUESFORMAT) &&
-                                                  randomVal == 5 &&
-                                                  !shouldAvoidCodec("Lucene49"))) { 
-      codec = Codec.forName("Lucene49");
-      LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true;
-      assert codec instanceof Lucene49RWCodec : "fix your classpath to have tests-framework.jar before lucene-core.jar";
-    } else if (("random".equals(TEST_POSTINGSFORMAT) == false) || ("random".equals(TEST_DOCVALUESFORMAT) == false)) {
+    if (("random".equals(TEST_POSTINGSFORMAT) == false) || ("random".equals(TEST_DOCVALUESFORMAT) == false)) {
       // the user wired postings or DV: this is messy
       // refactor into RandomCodec....
       

Modified: lucene/dev/branches/lucene5858/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.Codec
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5858/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.Codec?rev=1621751&r1=1621750&r2=1621751&view=diff
==============================================================================
--- lucene/dev/branches/lucene5858/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.Codec (original)
+++ lucene/dev/branches/lucene5858/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.Codec Mon Sep  1 11:37:03 2014
@@ -19,9 +19,3 @@ org.apache.lucene.codecs.compressing.Fas
 org.apache.lucene.codecs.compressing.FastDecompressionCompressingCodec
 org.apache.lucene.codecs.compressing.HighCompressionCompressingCodec
 org.apache.lucene.codecs.compressing.dummy.DummyCompressingCodec
-org.apache.lucene.codecs.lucene40.Lucene40RWCodec
-org.apache.lucene.codecs.lucene41.Lucene41RWCodec
-org.apache.lucene.codecs.lucene42.Lucene42RWCodec
-org.apache.lucene.codecs.lucene45.Lucene45RWCodec
-org.apache.lucene.codecs.lucene46.Lucene46RWCodec
-org.apache.lucene.codecs.lucene49.Lucene49RWCodec

Modified: lucene/dev/branches/lucene5858/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5858/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat?rev=1621751&r1=1621750&r2=1621751&view=diff
==============================================================================
--- lucene/dev/branches/lucene5858/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat (original)
+++ lucene/dev/branches/lucene5858/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat Mon Sep  1 11:37:03 2014
@@ -14,4 +14,3 @@
 #  limitations under the License.
 
 org.apache.lucene.codecs.asserting.AssertingDocValuesFormat
-org.apache.lucene.codecs.lucene42.Lucene42RWDocValuesFormat

Modified: lucene/dev/branches/lucene5858/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5858/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat?rev=1621751&r1=1621750&r2=1621751&view=diff
==============================================================================
--- lucene/dev/branches/lucene5858/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat (original)
+++ lucene/dev/branches/lucene5858/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat Mon Sep  1 11:37:03 2014
@@ -21,4 +21,3 @@ org.apache.lucene.codecs.lucene41vargap.
 org.apache.lucene.codecs.lucene41vargap.Lucene41VarGapDocFreqInterval
 org.apache.lucene.codecs.bloom.TestBloomFilteredLucene41Postings
 org.apache.lucene.codecs.asserting.AssertingPostingsFormat
-org.apache.lucene.codecs.lucene40.Lucene40RWPostingsFormat

Modified: lucene/dev/branches/lucene5858/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5858/solr/common-build.xml?rev=1621751&r1=1621750&r2=1621751&view=diff
==============================================================================
--- lucene/dev/branches/lucene5858/solr/common-build.xml (original)
+++ lucene/dev/branches/lucene5858/solr/common-build.xml Mon Sep  1 11:37:03 2014
@@ -88,6 +88,7 @@
     <pathelement location="${analyzers-kuromoji.jar}"/>
     <pathelement location="${analyzers-phonetic.jar}"/>
     <pathelement location="${codecs.jar}"/>
+    <pathelement location="${backward-codecs.jar}"/>
     <pathelement location="${highlighter.jar}"/>
     <pathelement location="${memory.jar}"/>
     <pathelement location="${misc.jar}"/>