You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/08/31 00:43:59 UTC

svn commit: r1379200 [1/11] - in /lucene/dev/branches/lucene3312: ./ dev-tools/ dev-tools/eclipse/ dev-tools/idea/.idea/libraries/ dev-tools/maven/ dev-tools/maven/lucene/core/ dev-tools/maven/lucene/test-framework/ dev-tools/scripts/ lucene/ lucene/an...

Author: uschindler
Date: Thu Aug 30 22:43:41 2012
New Revision: 1379200

URL: http://svn.apache.org/viewvc?rev=1379200&view=rev
Log:
LUCENE-3312: Merge up to trunk and fix basic Javadocs merge conflicts. The new classes now need method descriptions, mainly oal.index.StorableField(Type)

Added:
    lucene/dev/branches/lucene3312/extra-targets.xml
      - copied unchanged from r1379173, lucene/dev/trunk/extra-targets.xml
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked.java
      - copied unchanged from r1379173, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock.java
      - copied unchanged from r1379173, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock.java
    lucene/dev/branches/lucene3312/lucene/tools/junit4/tests.policy
      - copied unchanged from r1379173, lucene/dev/trunk/lucene/tools/junit4/tests.policy
    lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java
      - copied unchanged from r1379196, lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java
    lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/update/SplitIndexCommand.java
      - copied unchanged from r1379196, lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SplitIndexCommand.java
Removed:
    lucene/dev/branches/lucene3312/build-clover.xml
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked25.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked26.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked27.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked28.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked29.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked30.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked31.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked32.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked33.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked34.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked35.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked36.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked37.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked38.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked39.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked40.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked41.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked42.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked43.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked44.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked45.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked46.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked47.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked48.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked49.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked50.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked51.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked52.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked53.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked54.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked55.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked56.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked57.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked58.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked59.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked60.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked61.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked62.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked63.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked64.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock32.java
    lucene/dev/branches/lucene3312/lucene/licenses/ant-junit-1.8.2.jar.sha1
    lucene/dev/branches/lucene3312/lucene/licenses/ant-junit-LICENSE-ASL.txt
    lucene/dev/branches/lucene3312/lucene/licenses/ant-junit-NOTICE.txt
    lucene/dev/branches/lucene3312/solr/licenses/ant-junit-1.8.2.jar.sha1
    lucene/dev/branches/lucene3312/solr/licenses/ant-junit-LICENSE-ASL.txt
    lucene/dev/branches/lucene3312/solr/licenses/ant-junit-NOTICE.txt
Modified:
    lucene/dev/branches/lucene3312/   (props changed)
    lucene/dev/branches/lucene3312/build.xml
    lucene/dev/branches/lucene3312/dev-tools/   (props changed)
    lucene/dev/branches/lucene3312/dev-tools/eclipse/dot.classpath
    lucene/dev/branches/lucene3312/dev-tools/idea/.idea/libraries/Ant.xml   (contents, props changed)
    lucene/dev/branches/lucene3312/dev-tools/idea/.idea/libraries/HSQLDB.xml   (contents, props changed)
    lucene/dev/branches/lucene3312/dev-tools/maven/lucene/core/pom.xml.template
    lucene/dev/branches/lucene3312/dev-tools/maven/lucene/test-framework/pom.xml.template
    lucene/dev/branches/lucene3312/dev-tools/maven/pom.xml.template
    lucene/dev/branches/lucene3312/dev-tools/scripts/checkJavaDocs.py
    lucene/dev/branches/lucene3312/lucene/   (props changed)
    lucene/dev/branches/lucene3312/lucene/BUILD.txt   (contents, props changed)
    lucene/dev/branches/lucene3312/lucene/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/lucene3312/lucene/MIGRATE.txt   (contents, props changed)
    lucene/dev/branches/lucene3312/lucene/analysis/   (props changed)
    lucene/dev/branches/lucene3312/lucene/analysis/common/   (props changed)
    lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordTokenizer.java
    lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizer.java
    lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizer.java
    lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java
    lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizer.java
    lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AbstractAnalysisFactory.java   (contents, props changed)
    lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharFilterFactory.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharTokenizer.java
    lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/MultiTermAwareComponent.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoaderAware.java
    lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/StemmerUtil.java
    lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/TokenFilterFactory.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/TokenizerFactory.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/WordlistLoader.java
    lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizer.java
    lucene/dev/branches/lucene3312/lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.util.CharFilterFactory   (props changed)
    lucene/dev/branches/lucene3312/lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory   (props changed)
    lucene/dev/branches/lucene3312/lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenizerFactory   (props changed)
    lucene/dev/branches/lucene3312/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/CommonGramsFilterTest.java
    lucene/dev/branches/lucene3312/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java
    lucene/dev/branches/lucene3312/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAnalyzers.java
    lucene/dev/branches/lucene3312/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopAnalyzer.java
    lucene/dev/branches/lucene3312/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/testCompressed.aff   (props changed)
    lucene/dev/branches/lucene3312/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/testCompressed.dic   (props changed)
    lucene/dev/branches/lucene3312/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/testWrongAffixRule.aff   (props changed)
    lucene/dev/branches/lucene3312/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTokenizer.java
    lucene/dev/branches/lucene3312/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizer.java
    lucene/dev/branches/lucene3312/lucene/analysis/icu/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory   (props changed)
    lucene/dev/branches/lucene3312/lucene/analysis/icu/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenizerFactory   (props changed)
    lucene/dev/branches/lucene3312/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseTokenizer.java
    lucene/dev/branches/lucene3312/lucene/analysis/kuromoji/src/resources/META-INF/services/org.apache.lucene.analysis.util.CharFilterFactory   (props changed)
    lucene/dev/branches/lucene3312/lucene/analysis/kuromoji/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory   (props changed)
    lucene/dev/branches/lucene3312/lucene/analysis/kuromoji/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenizerFactory   (props changed)
    lucene/dev/branches/lucene3312/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorphosyntacticTagsAttributeImpl.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/analysis/morfologik/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory   (props changed)
    lucene/dev/branches/lucene3312/lucene/analysis/phonetic/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory   (props changed)
    lucene/dev/branches/lucene3312/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SentenceTokenizer.java
    lucene/dev/branches/lucene3312/lucene/analysis/smartcn/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory   (props changed)
    lucene/dev/branches/lucene3312/lucene/analysis/smartcn/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenizerFactory   (props changed)
    lucene/dev/branches/lucene3312/lucene/analysis/stempel/src/java/org/egothor/stemmer/Row.java
    lucene/dev/branches/lucene3312/lucene/analysis/stempel/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory   (props changed)
    lucene/dev/branches/lucene3312/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/BaseUIMATokenizer.java
    lucene/dev/branches/lucene3312/lucene/analysis/uima/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenizerFactory   (props changed)
    lucene/dev/branches/lucene3312/lucene/benchmark/   (props changed)
    lucene/dev/branches/lucene3312/lucene/benchmark/conf/addIndexes.alg   (props changed)
    lucene/dev/branches/lucene3312/lucene/build.xml   (contents, props changed)
    lucene/dev/branches/lucene3312/lucene/common-build.xml   (contents, props changed)
    lucene/dev/branches/lucene3312/lucene/core/   (props changed)
    lucene/dev/branches/lucene3312/lucene/core/build.xml
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/Analyzer.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/AnalyzerWrapper.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/CachingTokenFilter.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/CharFilter.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/NumericTokenStream.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/Token.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/TokenFilter.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/TokenStream.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/Tokenizer.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/package.html
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttribute.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttributeImpl.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/FlagsAttribute.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/FlagsAttributeImpl.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/KeywordAttribute.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/KeywordAttributeImpl.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/OffsetAttribute.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/OffsetAttributeImpl.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PayloadAttribute.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PayloadAttributeImpl.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionIncrementAttribute.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionIncrementAttributeImpl.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionLengthAttribute.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionLengthAttributeImpl.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/TermToBytesRefAttribute.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/TypeAttribute.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/TypeAttributeImpl.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/Codec.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/PostingsFormat.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/block/BlockPostingsFormat.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/block/BlockPostingsReader.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/block/BlockPostingsWriter.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/block/BlockSkipReader.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/block/BlockSkipWriter.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/block/ForUtil.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/block/package.html   (props changed)
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/bloom/BloomFilterFactory.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java   (contents, props changed)
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/bloom/DefaultBloomFilterFactory.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/bloom/package.html   (contents, props changed)
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/document/ByteDocValuesField.java   (contents, props changed)
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/document/CompressionTools.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/document/DateTools.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/document/DerefBytesDocValuesField.java   (contents, props changed)
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/document/DocumentStoredFieldVisitor.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/document/DoubleDocValuesField.java   (contents, props changed)
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/document/DoubleField.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/document/Field.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/document/FieldType.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/document/FloatDocValuesField.java   (contents, props changed)
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/document/FloatField.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/document/IntDocValuesField.java   (contents, props changed)
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/document/IntField.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/document/LongDocValuesField.java   (contents, props changed)
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/document/LongField.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/document/PackedLongDocValuesField.java   (contents, props changed)
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/document/ShortDocValuesField.java   (contents, props changed)
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/document/SortedBytesDocValuesField.java   (contents, props changed)
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/document/StoredField.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/document/StraightBytesDocValuesField.java   (contents, props changed)
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/document/StringField.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/document/TextField.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/DirectoryReader.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/FieldInfo.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/FilterAtomicReader.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/FilteredTermsEnum.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/IndexFileNames.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/IndexReader.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/IndexableField.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/IndexableFieldType.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/MultiFields.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/SegmentInfoPerCommit.java   (contents, props changed)
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/Term.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/TermsEnum.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/TwoPhaseCommitTool.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/search/DocIdSet.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/search/NumericRangeQuery.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/search/Scorer.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/search/similarities/DefaultSimilarity.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/store/ChecksumIndexInput.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/store/Directory.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/store/TrackingDirectoryWrapper.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/Constants.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/FuzzySet.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/IOUtils.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/LongsRef.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/PriorityQueue.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/SmallFloat.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/WeakIdentityMap.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/fst/CharSequenceOutputs.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/fst/Util.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/hash/HashFunction.java   (contents, props changed)
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/hash/MurmurHash2.java   (contents, props changed)
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/hash/package.html   (contents, props changed)
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperation.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked1.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked10.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked11.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked12.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked13.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked14.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked15.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked16.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked17.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked18.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked19.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked2.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked20.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked21.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked22.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked23.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked24.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked3.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked4.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked5.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked6.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked7.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked8.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked9.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock1.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock10.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock12.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock16.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock2.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock21.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock3.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock4.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock5.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock6.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock7.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock8.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock9.java
    lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/gen_BulkOperation.py
    lucene/dev/branches/lucene3312/lucene/core/src/resources/META-INF/services/org.apache.lucene.util.hash.HashFunction   (contents, props changed)
    lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/TestWorstCaseTestBehavior.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/codecs/block/TestForUtil.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java
    lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
    lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java
    lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterStallControl.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java
    lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
    lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java
    lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
    lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java
    lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/util/TestMaxFailuresRule.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/util/TestNumericUtils.java
    lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestBeforeAfterOverrides.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestCodecReported.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestSameRandomnessLocalePassedOrNot.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/facet/   (props changed)
    lucene/dev/branches/lucene3312/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/CategoryPath.java
    lucene/dev/branches/lucene3312/lucene/grouping/   (props changed)
    lucene/dev/branches/lucene3312/lucene/grouping/src/java/org/apache/lucene/search/grouping/dv/DVGroupFacetCollector.java
    lucene/dev/branches/lucene3312/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupHeadsCollector.java
    lucene/dev/branches/lucene3312/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupsCollector.java
    lucene/dev/branches/lucene3312/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionSecondPassGroupingCollector.java
    lucene/dev/branches/lucene3312/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermAllGroupsCollector.java
    lucene/dev/branches/lucene3312/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermGroupFacetCollector.java
    lucene/dev/branches/lucene3312/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java
    lucene/dev/branches/lucene3312/lucene/highlighter/   (props changed)
    lucene/dev/branches/lucene3312/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragListBuilder.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleFieldFragList.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/WeightedFieldFragList.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/WeightedFragListBuilder.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java
    lucene/dev/branches/lucene3312/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/WeightedFragListBuilderTest.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/join/   (props changed)
    lucene/dev/branches/lucene3312/lucene/join/src/java/org/apache/lucene/search/join/ScoreMode.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java
    lucene/dev/branches/lucene3312/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java
    lucene/dev/branches/lucene3312/lucene/licenses/   (props changed)
    lucene/dev/branches/lucene3312/lucene/licenses/Tagger-2.3.1.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/lucene/licenses/WhitespaceTokenizer-2.3.1.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/lucene/licenses/ant-1.8.2.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/lucene/licenses/asm-debug-all-4.0.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/lucene/licenses/commons-codec-1.6.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/lucene/licenses/commons-compress-1.3.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/lucene/licenses/icu4j-49.1.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/lucene/licenses/jakarta-regexp-1.4.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/lucene/licenses/junit-4.10.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/lucene/licenses/junit4-ant-2.0.0.rc5.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/lucene/licenses/junit4-ant-LICENSE-ASL.txt   (props changed)
    lucene/dev/branches/lucene3312/lucene/licenses/junit4-ant-NOTICE.txt   (props changed)
    lucene/dev/branches/lucene3312/lucene/licenses/morfologik-fsa-1.5.3.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/lucene/licenses/morfologik-polish-1.5.3.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/lucene/licenses/morfologik-stemming-1.5.3.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/lucene/licenses/nekohtml-1.9.15.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/lucene/licenses/randomizedtesting-runner-2.0.0.rc5.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/lucene/licenses/randomizedtesting-runner-LICENSE-ASL.txt   (props changed)
    lucene/dev/branches/lucene3312/lucene/licenses/randomizedtesting-runner-NOTICE.txt   (props changed)
    lucene/dev/branches/lucene3312/lucene/licenses/servlet-api-2.4.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/lucene/licenses/spatial4j-0.2.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/lucene/licenses/uimaj-core-2.3.1.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/lucene/licenses/xercesImpl-2.9.1.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/lucene/misc/   (props changed)
    lucene/dev/branches/lucene3312/lucene/misc/build.xml
    lucene/dev/branches/lucene3312/lucene/misc/src/test/org/apache/lucene/index/TestIndexSplitter.java
    lucene/dev/branches/lucene3312/lucene/queries/   (props changed)
    lucene/dev/branches/lucene3312/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ShortFieldSource.java
    lucene/dev/branches/lucene3312/lucene/queries/src/test/org/apache/lucene/queries/function/TestBoostedQuery.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/queryparser/   (props changed)
    lucene/dev/branches/lucene3312/lucene/queryparser/build.xml
    lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/CharStream.java
    lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/ParseException.java
    lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.java
    lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.jj
    lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserBase.java
    lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/Token.java
    lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/TokenMgrError.java
    lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryNodeParseException.java
    lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/AbstractQueryConfig.java
    lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/QueryNodeImpl.java
    lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/CharStream.java
    lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/ParseException.java
    lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.java
    lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/Token.java
    lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/TokenMgrError.java
    lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/CharStream.java
    lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/ParseException.java
    lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParser.java
    lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/Token.java
    lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/TokenMgrError.java
    lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/DistanceSubQuery.java
    lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/FieldsQuery.java
    lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/NotQuery.java
    lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SimpleTerm.java
    lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndPrefixQuery.java
    lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndTermQuery.java
    lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/CorePlusExtensionsParser.java
    lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/DOMUtils.java
    lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/ParserException.java
    lucene/dev/branches/lucene3312/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiPhraseQueryParsing.java
    lucene/dev/branches/lucene3312/lucene/site/   (props changed)
    lucene/dev/branches/lucene3312/lucene/site/changes/changes2html.pl
    lucene/dev/branches/lucene3312/lucene/site/xsl/index.xsl
    lucene/dev/branches/lucene3312/lucene/spatial/   (props changed)
    lucene/dev/branches/lucene3312/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/AreaSimilarity.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxSimilarity.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxSimilarityValueSource.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxStrategy.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/package-info.java   (contents, props changed)
    lucene/dev/branches/lucene3312/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixCellsTokenizer.java
    lucene/dev/branches/lucene3312/lucene/spatial/src/java/org/apache/lucene/spatial/query/SpatialArgs.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/spatial/src/java/org/apache/lucene/spatial/query/SpatialArgsParser.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/spatial/src/java/org/apache/lucene/spatial/query/SpatialOperation.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/spatial/src/java/org/apache/lucene/spatial/query/UnsupportedSpatialOperation.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/spatial/src/java/org/apache/lucene/spatial/query/package-info.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/spatial/src/java/org/apache/lucene/spatial/util/CachingDoubleValueSource.java
    lucene/dev/branches/lucene3312/lucene/spatial/src/java/org/apache/lucene/spatial/util/ValueSourceFilter.java
    lucene/dev/branches/lucene3312/lucene/spatial/src/test-files/data/simple-bbox.txt   (contents, props changed)
    lucene/dev/branches/lucene3312/lucene/spatial/src/test-files/simple-Queries-BBox.txt   (contents, props changed)
    lucene/dev/branches/lucene3312/lucene/spatial/src/test/org/apache/lucene/spatial/PortedSolr3Test.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialExample.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/spatial/src/test/org/apache/lucene/spatial/bbox/TestBBoxStrategy.java   (contents, props changed)
    lucene/dev/branches/lucene3312/lucene/spatial/src/test/org/apache/lucene/spatial/query/SpatialArgsParserTest.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/suggest/   (props changed)
    lucene/dev/branches/lucene3312/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletionLookup.java
    lucene/dev/branches/lucene3312/lucene/test-framework/   (props changed)
    lucene/dev/branches/lucene3312/lucene/test-framework/ivy.xml
    lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/analysis/MockTokenizer.java
    lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/codecs/bloom/TestBloomFilteredLucene40Postings.java   (contents, props changed)
    lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/codecs/bloom/package.html   (contents, props changed)
    lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/index/AlcoholicMergePolicy.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/search/ShardSearchingTestBase.java
    lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/util/CloseableDirectory.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/util/CloseableFile.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/util/LuceneJUnit3MethodProvider.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/util/QuickPatchThreadsFilter.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/util/RunListenerPrintReproduceInfo.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleAssertionsRequired.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleIgnoreAfterMaxFailures.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleIgnoreTestSuites.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleMarkFailure.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupTeardownChained.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/util/TimeUnits.java   (props changed)
    lucene/dev/branches/lucene3312/lucene/tools/   (props changed)
    lucene/dev/branches/lucene3312/lucene/tools/forbiddenApis/executors.txt   (props changed)
    lucene/dev/branches/lucene3312/lucene/tools/junit4/cached-timehints.txt   (props changed)
    lucene/dev/branches/lucene3312/lucene/tools/junit4/logging.properties   (props changed)
    lucene/dev/branches/lucene3312/solr/   (props changed)
    lucene/dev/branches/lucene3312/solr/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/lucene3312/solr/build.xml   (contents, props changed)
    lucene/dev/branches/lucene3312/solr/cloud-dev/   (props changed)
    lucene/dev/branches/lucene3312/solr/cloud-dev/cli-test-solrcloud-start.sh   (props changed)
    lucene/dev/branches/lucene3312/solr/cloud-dev/solrcloud-multi-start.sh   (props changed)
    lucene/dev/branches/lucene3312/solr/common-build.xml   (contents, props changed)
    lucene/dev/branches/lucene3312/solr/contrib/   (props changed)
    lucene/dev/branches/lucene3312/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/DuplicatingStemmerFactory.java   (props changed)
    lucene/dev/branches/lucene3312/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/DuplicatingTokenizerFactory.java   (props changed)
    lucene/dev/branches/lucene3312/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/EchoStemsClusteringAlgorithm.java   (props changed)
    lucene/dev/branches/lucene3312/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/EchoTokensClusteringAlgorithm.java   (props changed)
    lucene/dev/branches/lucene3312/solr/core/   (props changed)
    lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/analysis/TrieTokenizerFactory.java
    lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
    lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/cloud/CloudDescriptor.java
    lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
    lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java
    lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/cloud/Overseer.java
    lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java   (props changed)
    lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
    lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java
    lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/cloud/ZkCLI.java   (props changed)
    lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/cloud/ZkController.java
    lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/common/ResourceLoader.java   (props changed)
    lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/core/CoreContainer.java
    lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/core/SolrCore.java
    lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java   (props changed)
    lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
    lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/highlight/WeightedFragListBuilder.java   (props changed)
    lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/logging/CircularList.java   (contents, props changed)
    lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/logging/LogWatcher.java   (contents, props changed)
    lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/logging/LoggerInfo.java   (contents, props changed)
    lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/logging/jul/JulInfo.java   (contents, props changed)
    lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/logging/jul/JulWatcher.java   (contents, props changed)
    lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/logging/jul/RecordHandler.java   (contents, props changed)
    lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/BoolField.java
    lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java
    lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/Pair.java   (props changed)
    lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
    lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
    lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/update/MemOutputStream.java   (props changed)
    lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
    lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/update/UpdateHandler.java
    lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
    lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/util/AdjustableSemaphore.java   (props changed)
    lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/util/plugin/ResourceLoaderAware.java   (props changed)
    lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java   (props changed)
    lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/TestDocumentBuilder.java   (props changed)
    lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java   (props changed)
    lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
    lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java
    lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
    lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java   (props changed)
    lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/cloud/TestHashPartitioner.java
    lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/cloud/TestMultiCoreConfBootstrap.java
    lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java   (props changed)
    lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/core/TestJmxMonitoredMap.java
    lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/util/SimplePostToolTest.java   (props changed)
    lucene/dev/branches/lucene3312/solr/example/   (props changed)
    lucene/dev/branches/lucene3312/solr/example/cloud-scripts/zkcli.bat   (contents, props changed)
    lucene/dev/branches/lucene3312/solr/example/cloud-scripts/zkcli.sh   (props changed)
    lucene/dev/branches/lucene3312/solr/example/contexts/solr.xml   (props changed)
    lucene/dev/branches/lucene3312/solr/example/etc/logging.properties   (props changed)
    lucene/dev/branches/lucene3312/solr/example/example-DIH/hsqldb/ex.log   (props changed)
    lucene/dev/branches/lucene3312/solr/example/example-DIH/hsqldb/ex.script   (props changed)
    lucene/dev/branches/lucene3312/solr/example/solr-webapp/.gitignore   (props changed)
    lucene/dev/branches/lucene3312/solr/example/solr/collection1/conf/schema.xml
    lucene/dev/branches/lucene3312/solr/example/solr/collection1/conf/solrconfig.xml
    lucene/dev/branches/lucene3312/solr/example/solr/collection1/conf/update-script.js   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/AlchemyAPIAnnotator-2.3.1.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/OpenCalaisAnnotator-2.3.1.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/Tagger-2.3.1.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/WhitespaceTokenizer-2.3.1.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/activation-1.1.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/ant-1.8.2.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/apache-mime4j-core-0.7.2.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/apache-mime4j-dom-0.7.2.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/bcmail-jdk15-1.45.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/bcprov-jdk15-1.45.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/boilerpipe-1.1.0.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/carrot2-core-3.5.0.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/commons-beanutils-1.7.0.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/commons-cli-1.2.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/commons-cli-LICENSE-ASL.txt   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/commons-cli-NOTICE.txt   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/commons-codec-1.6.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/commons-collections-3.2.1.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/commons-compress-1.4.1.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/commons-digester-2.0.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/commons-fileupload-1.2.1.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/commons-io-2.1.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/commons-lang-2.6.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/dom4j-1.6.1.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/easymock-2.2.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/fontbox-1.7.0.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/guava-r05.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/hppc-0.3.3.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/hsqldb-1.8.0.10.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/httpclient-4.1.3.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/httpcore-4.1.4.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/httpmime-4.1.3.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/icu4j-49.1.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/isoparser-1.0-RC-1.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/jackson-core-asl-1.7.4.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/jackson-mapper-asl-1.7.4.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/javax.servlet-api-3.0.1.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/jcl-over-slf4j-1.6.4.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/jdom-1.0.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/jempbox-1.7.0.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/jetty-continuation-8.1.2.v20120308.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/jetty-deploy-8.1.2.v20120308.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/jetty-http-8.1.2.v20120308.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/jetty-io-8.1.2.v20120308.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/jetty-jmx-8.1.2.v20120308.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/jetty-security-8.1.2.v20120308.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/jetty-server-8.1.2.v20120308.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/jetty-servlet-8.1.2.v20120308.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/jetty-util-8.1.2.v20120308.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/jetty-webapp-8.1.2.v20120308.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/jetty-xml-8.1.2.v20120308.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/jsonic-1.2.7.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/junit-4.10.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/junit4-ant-2.0.0.rc5.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/junit4-ant-LICENSE-ASL.txt   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/junit4-ant-NOTICE.txt   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/juniversalchardet-1.0.3.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/langdetect-1.1-20120112.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/log4j-over-slf4j-1.6.4.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/mahout-collections-0.3.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/mahout-math-0.3.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/mail-1.4.1.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/metadata-extractor-2.4.0-beta-1.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/morfologik-fsa-1.5.3.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/morfologik-polish-1.5.3.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/morfologik-stemming-1.5.3.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/netcdf-4.2-min.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/pdfbox-1.7.0.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/poi-3.8.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/poi-ooxml-3.8.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/poi-ooxml-schemas-3.8.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/poi-scratchpad-3.8.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/randomizedtesting-runner-2.0.0.rc5.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/randomizedtesting-runner-LICENSE-ASL.txt   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/randomizedtesting-runner-NOTICE.txt   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/rome-0.9.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/servlet-api-3.0.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/simple-xml-2.4.1.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/slf4j-api-1.6.4.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/slf4j-jdk14-1.6.4.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/spatial4j-0.2.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/start.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/tagsoup-1.2.1.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/tika-core-1.2.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/tika-parsers-1.2.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/uimaj-core-2.3.1.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/velocity-1.6.4.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/velocity-tools-2.0.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/vorbis-java-core-0.1.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/vorbis-java-tika-0.1.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/wstx-asl-3.2.7.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/xercesImpl-2.9.1.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/xmlbeans-2.3.0.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/xz-1.0.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/licenses/zookeeper-3.3.6.jar.sha1   (props changed)
    lucene/dev/branches/lucene3312/solr/solrj/   (props changed)
    lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java
    lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/client/solrj/request/CoreAdminRequest.java
    lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/client/solrj/request/IsUpdateRequest.java   (props changed)
    lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java
    lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
    lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/cloud/HashPartitioner.java
    lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
    lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/cloud/ZkClientConnectionStrategy.java
    lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCoreNodeProps.java
    lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
    lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/params/CollectionParams.java   (props changed)
    lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/params/CoreAdminParams.java
    lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/util/SolrjNamedThreadFactory.java   (props changed)
    lucene/dev/branches/lucene3312/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig.xml   (props changed)
    lucene/dev/branches/lucene3312/solr/solrj/src/test-files/solrj/solr/solr.xml   (props changed)
    lucene/dev/branches/lucene3312/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerTest.java   (props changed)
    lucene/dev/branches/lucene3312/solr/test-framework/   (props changed)
    lucene/dev/branches/lucene3312/solr/test-framework/ivy.xml
    lucene/dev/branches/lucene3312/solr/test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java   (props changed)
    lucene/dev/branches/lucene3312/solr/test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.java
    lucene/dev/branches/lucene3312/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
    lucene/dev/branches/lucene3312/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java
    lucene/dev/branches/lucene3312/solr/test-framework/src/java/org/apache/solr/util/RevertDefaultThreadHandlerRule.java   (props changed)
    lucene/dev/branches/lucene3312/solr/webapp/   (props changed)
    lucene/dev/branches/lucene3312/solr/webapp/build.xml
    lucene/dev/branches/lucene3312/solr/webapp/web/js/scripts/app.js

Modified: lucene/dev/branches/lucene3312/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/build.xml?rev=1379200&r1=1379199&r2=1379200&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/build.xml (original)
+++ lucene/dev/branches/lucene3312/build.xml Thu Aug 30 22:43:41 2012
@@ -74,7 +74,7 @@
     </pathconvert>
     <fail if="validate.patternsFound">The following files contain @author tags or nocommits:${line.separator}${validate.patternsFound}</fail>
   </target>
-
+	
   <target name="rat-sources" description="Runs rat across all sources and tests">
     <sequential><subant target="rat-sources" inheritall="false" failonerror="true">
         <fileset dir="lucene" includes="build.xml" />
@@ -248,15 +248,21 @@
    </sequential>
   </target>
   
+  <target name="check-svn-working-copy">
+    <subant target="check-svn-working-copy" inheritall="false" failonerror="true">
+      <fileset dir="." includes="extra-targets.xml" />
+    </subant>
+  </target>
+
   <!-- Calls only generate-clover-reports on Lucene, as Solr's is just a clone with other target; the database itsself is fixed -->
   <target name="generate-clover-reports">
     <subant target="generate-clover-reports" inheritall="false" failonerror="true">
-      <fileset dir="." includes="build-clover.xml" />
+      <fileset dir="." includes="extra-targets.xml" />
     </subant>
   </target>
 
   <!-- Jenkins tasks -->
-  <target name="jenkins-hourly" depends="clean,test,validate,-jenkins-javadocs-lint,-svn-status"/>
+  <target name="jenkins-hourly" depends="clean,test,validate,-jenkins-javadocs-lint,check-svn-working-copy"/>
   
   <target name="jenkins-clover">
     <antcall target="-jenkins-clover">
@@ -280,31 +286,4 @@
   <target name="-jenkins-javadocs-lint" unless="-disable.javadocs-lint">
     <antcall target="javadocs-lint"/> 
   </target>
-
-  <!-- define here, as common-build is not included! -->
-  <property name="svn.exe" value="svn" />
-  
-  <target name="-svn-status">
-    <exec executable="${svn.exe}" dir="." failonerror="true">
-      <arg value="status"/>
-      <redirector outputproperty="svn.status.output">
-        <outputfilterchain>
-          <linecontainsregexp>
-            <regexp pattern="^\?" />
-          </linecontainsregexp>
-          <tokenfilter>
-            <replaceregex pattern="^........" replace="* " />
-            <replacestring from="${file.separator}" to="/" />
-          </tokenfilter>
-        </outputfilterchain>
-      </redirector>
-    </exec>
-    <fail message="Source checkout is dirty after running tests!!! Offending files:${line.separator}${svn.status.output}">
-      <condition>
-        <not>
-          <equals arg1="${svn.status.output}" arg2=""/>
-        </not>
-      </condition>
-    </fail>
-  </target>
 </project>

Modified: lucene/dev/branches/lucene3312/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/dev-tools/eclipse/dot.classpath?rev=1379200&r1=1379199&r2=1379200&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/lucene3312/dev-tools/eclipse/dot.classpath Thu Aug 30 22:43:41 2012
@@ -95,7 +95,6 @@
   <classpathentry kind="src" path="solr/contrib/velocity/src/test"/>
   <classpathentry kind="src" path="solr/contrib/velocity/src/test-files"/>
   <classpathentry kind="lib" path="lucene/test-framework/lib/ant-1.8.2.jar"/>
-  <classpathentry kind="lib" path="lucene/test-framework/lib/ant-junit-1.8.2.jar"/>
   <classpathentry kind="lib" path="lucene/test-framework/lib/junit-4.10.jar"/>
   <classpathentry kind="lib" path="lucene/sandbox/lib/jakarta-regexp-1.4.jar"/>
   <classpathentry kind="lib" path="lucene/analysis/icu/lib/icu4j-49.1.jar"/>

Modified: lucene/dev/branches/lucene3312/dev-tools/idea/.idea/libraries/Ant.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/dev-tools/idea/.idea/libraries/Ant.xml?rev=1379200&r1=1379199&r2=1379200&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/dev-tools/idea/.idea/libraries/Ant.xml (original)
+++ lucene/dev/branches/lucene3312/dev-tools/idea/.idea/libraries/Ant.xml Thu Aug 30 22:43:41 2012
@@ -2,7 +2,6 @@
   <library name="Ant">
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/ant-1.8.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/ant-junit-1.8.2.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

Modified: lucene/dev/branches/lucene3312/dev-tools/idea/.idea/libraries/HSQLDB.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/dev-tools/idea/.idea/libraries/HSQLDB.xml?rev=1379200&r1=1379199&r2=1379200&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/dev-tools/idea/.idea/libraries/HSQLDB.xml (original)
+++ lucene/dev/branches/lucene3312/dev-tools/idea/.idea/libraries/HSQLDB.xml Thu Aug 30 22:43:41 2012
@@ -1,9 +1,9 @@
-<component name="libraryTable">
-  <library name="HSQLDB">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/solr/example/example-DIH/solr/db/lib/hsqldb-1.8.0.10.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
+<component name="libraryTable">
+  <library name="HSQLDB">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/solr/example/example-DIH/solr/db/lib/hsqldb-1.8.0.10.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
 </component>
\ No newline at end of file

Modified: lucene/dev/branches/lucene3312/dev-tools/maven/lucene/core/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/dev-tools/maven/lucene/core/pom.xml.template?rev=1379200&r1=1379199&r2=1379200&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/dev-tools/maven/lucene/core/pom.xml.template (original)
+++ lucene/dev/branches/lucene3312/dev-tools/maven/lucene/core/pom.xml.template Thu Aug 30 22:43:41 2012
@@ -53,11 +53,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.ant</groupId>
-      <artifactId>ant-junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>com.carrotsearch.randomizedtesting</groupId>
       <artifactId>randomizedtesting-runner</artifactId>
       <scope>test</scope>

Modified: lucene/dev/branches/lucene3312/dev-tools/maven/lucene/test-framework/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/dev-tools/maven/lucene/test-framework/pom.xml.template?rev=1379200&r1=1379199&r2=1379200&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/dev-tools/maven/lucene/test-framework/pom.xml.template (original)
+++ lucene/dev/branches/lucene3312/dev-tools/maven/lucene/test-framework/pom.xml.template Thu Aug 30 22:43:41 2012
@@ -52,10 +52,6 @@
       <artifactId>junit</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.ant</groupId>
-      <artifactId>ant-junit</artifactId>
-    </dependency>
-    <dependency>
       <groupId>com.carrotsearch.randomizedtesting</groupId>
       <artifactId>randomizedtesting-runner</artifactId>
     </dependency>

Modified: lucene/dev/branches/lucene3312/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/dev-tools/maven/pom.xml.template?rev=1379200&r1=1379199&r2=1379200&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/lucene3312/dev-tools/maven/pom.xml.template Thu Aug 30 22:43:41 2012
@@ -228,11 +228,6 @@
         <version>1.8.2</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.ant</groupId>
-        <artifactId>ant-junit</artifactId>
-        <version>1.8.2</version>
-      </dependency>
-      <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-compress</artifactId>
         <version>1.2</version>

Modified: lucene/dev/branches/lucene3312/dev-tools/scripts/checkJavaDocs.py
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/dev-tools/scripts/checkJavaDocs.py?rev=1379200&r1=1379199&r2=1379200&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/dev-tools/scripts/checkJavaDocs.py (original)
+++ lucene/dev/branches/lucene3312/dev-tools/scripts/checkJavaDocs.py Thu Aug 30 22:43:41 2012
@@ -20,7 +20,225 @@ import re
 reHREF = re.compile('<a.*?>(.*?)</a>', re.IGNORECASE)
 
 reMarkup = re.compile('<.*?>')
+reDivBlock = re.compile('<div class="block">(.*?)</div>', re.IGNORECASE)
+reCaption = re.compile('<caption><span>(.*?)</span>', re.IGNORECASE)
+reTDLastNested = re.compile('^<td class="colLast"><code><strong><a href="[^>]*\.([^>]*?)\.html" title="class in[^>]*">', re.IGNORECASE)
+reTDLast = re.compile('^<td class="colLast"><code><strong><a href="[^>]*#([^>]*?)">', re.IGNORECASE)
+reColOne = re.compile('^<td class="colOne"><code><strong><a href="[^>]*#([^>]*?)">', re.IGNORECASE)
 
+# the Method detail section at the end
+reMethodDetail = re.compile('^<h3>Method Detail</h3>$', re.IGNORECASE)
+reMethodDetailAnchor = re.compile('^(?:</a>)?<a name="([^>]*?)">$', re.IGNORECASE)
+reMethodOverridden = re.compile('^<dt><strong>(Specified by:|Overrides:)</strong></dt>$', re.IGNORECASE)
+
+reTag = re.compile("(?i)<(\/?\w+)((\s+\w+(\s*=\s*(?:\".*?\"|'.*?'|[^'\">\s]+))?)+\s*|\s*)\/?>")
+
+def verifyHTML(s):
+
+  stack = []
+  upto = 0
+  while True:
+    m = reTag.search(s, upto)
+    if m is None:
+      break
+    tag = m.group(1)
+    upto = m.end(0)
+
+    if tag[:1] == '/':
+      justTag = tag[1:]
+    else:
+      justTag = tag
+      
+    if justTag.lower() in ('br', 'li', 'p', 'col'):
+      continue
+
+    if tag[:1] == '/':
+      if len(stack) == 0:
+        raise RuntimeError('saw closing "%s" without opening <%s...>' % (m.group(0), tag[1:]))
+      elif stack[-1][0] != tag[1:].lower():
+        raise RuntimeError('closing "%s" does not match opening "%s"' % (m.group(0), stack[-1][1]))
+      stack.pop()
+    else:
+      stack.append((tag.lower(), m.group(0)))
+
+  if len(stack) != 0:
+    raise RuntimeError('"%s" was never closed' % stack[-1][1])
+
+def cleanHTML(s):
+  s = reMarkup.sub('', s)
+  s = s.replace('&nbsp;', ' ')
+  s = s.replace('&lt;', '<')
+  s = s.replace('&gt;', '>')
+  s = s.replace('&amp;', '&')
+  return s.strip()
+
+reH3 = re.compile('^<h3>(.*?)</h3>', re.IGNORECASE | re.MULTILINE)
+reH4 = re.compile('^<h4>(.*?)</h4>', re.IGNORECASE | re.MULTILINE)
+  
+def checkClassDetails(fullPath):
+  """
+  Checks for invalid HTML in the full javadocs under each field/method.
+  """
+
+  # TODO: only works with java7 generated javadocs now!
+  with open(fullPath, encoding='UTF-8') as f:
+    desc = None
+    cat = None
+    item = None
+    errors = []
+    for line in f.readlines():
+      m = reH3.search(line)
+      if m is not None:
+        if desc is not None:
+          # Have to fake <ul> context because we pulled a fragment out "across" two <ul>s:
+          desc = ''.join(desc)
+          if True or cat == 'Constructor Detail':
+            idx = desc.find('</div>')
+            if idx == -1:
+              # Ctor missing javadocs ... checkClassSummaries catches it
+              desc = None
+              continue
+            desc = desc[:idx+6]
+          else:
+            desc = '<ul>%s</ul>' % ''.join(desc)
+          #print('  VERIFY %s: %s: %s' % (cat, item, desc))
+          try:
+            verifyHTML(desc)
+          except RuntimeError as re:
+            #print('    FAILED: %s' % re)
+            errors.append((cat, item, str(re)))
+          desc = None
+        cat = m.group(1)
+        continue
+
+      m = reH4.search(line)
+      if m is not None:
+        if desc is not None:
+          # Have to fake <ul> context because we pulled a fragment out "across" two <ul>s:
+          desc = '<ul>%s</ul>' % ''.join(desc)
+          #print('  VERIFY %s: %s: %s' % (cat, item, desc))
+          try:
+            verifyHTML(desc)
+          except RuntimeError as re:
+            #print('    FAILED: %s' % re)
+            errors.append((cat, item, str(re)))
+        item = m.group(1)
+        desc = []
+        continue
+
+      if desc is not None:
+        desc.append(line)
+
+  if len(errors) != 0:
+    print()
+    print(fullPath)
+    for cat, item, message in errors:
+      print('  broken details HTML: %s: %s: %s' % (cat, item, message))
+    return True
+  else:
+    return False
+
+def checkClassSummaries(fullPath):
+
+  # TODO: only works with java7 generated javadocs now!
+  f = open(fullPath, encoding='UTF-8')
+
+  missing = []
+  broken = []
+  inThing = False
+  lastCaption = None
+  lastItem = None
+
+  desc = None
+
+  foundMethodDetail = False
+  lastMethodAnchor = None
+  
+  for line in f.readlines():
+    m = reMethodDetail.search(line)
+    if m is not None:
+      foundMethodDetail = True
+      continue
+
+    # prune methods that are just @Overrides of other interface/classes,
+    # they should be specified elsewhere, if they are e.g. jdk or 
+    # external classes we cannot inherit their docs anyway
+    if foundMethodDetail:
+      m = reMethodDetailAnchor.search(line)
+      if m is not None:
+        lastMethodAnchor = m.group(1)
+        continue
+      m = reMethodOverridden.search(line)
+      if m is not None and ('Methods', lastMethodAnchor) in missing:
+        #print('removing @overridden method: %s' % lastMethodAnchor)
+        missing.remove(('Methods', lastMethodAnchor))
+
+    m = reCaption.search(line)
+    if m is not None:
+      lastCaption = m.group(1)
+      #print('    caption %s' % lastCaption)
+    m = reTDLastNested.search(line)
+    if m is not None:
+      # nested classes
+      lastItem = m.group(1)
+      #print('      item %s' % lastItem)
+    else:
+      m = reTDLast.search(line)
+      if m is not None:
+        # methods etc
+        lastItem = m.group(1)
+      else:
+        # ctors etc
+        m = reColOne.search(line)
+        if m is not None:
+          lastItem = m.group(1)
+          #print('      item %s' % lastItem)
+
+    lineLower = line.strip().lower()
+
+    if lineLower.find('<tr class="') != -1:
+      inThing = True
+      hasDesc = False
+      continue
+
+    if inThing:
+      if lineLower.find('</tr>') != -1:
+        if not hasDesc:
+          missing.append((lastCaption, lastItem))
+        inThing = False
+        continue
+      else:
+        if line.find('<div class="block">') != -1:
+          desc = []
+        if desc is not None:
+          desc.append(line)
+          if line.find('</div>') != -1:
+            desc = ''.join(desc)
+
+            try:
+              verifyHTML(desc)
+            except RuntimeError as e:
+              broken.append((lastCaption, lastItem, str(e)))
+              #print('FAIL: %s: %s: %s: %s' % (lastCaption, lastItem, e, desc))
+                            
+            desc = desc.replace('<div class="block">', '')
+            desc = desc.replace('</div>', '')
+            desc = desc.strip()
+            hasDesc = len(desc) > 0
+
+            desc = None
+  f.close()
+  if len(missing) > 0 or len(broken) > 0:
+    print()
+    print(fullPath)
+    for (caption, item) in missing:
+      print('  missing %s: %s' % (caption, item))
+    for (caption, item, why) in broken:
+      print('  broken HTML: %s: %s: %s' % (caption, item, why))
+    return True
+  else:
+    return False
+  
 def checkSummary(fullPath):
   printed = False
   f = open(fullPath, encoding='UTF-8')
@@ -84,8 +302,8 @@ def checkPackageSummaries(root, level='c
   True if there are problems.
   """
 
-  if level != 'class' and level != 'package':
-    print('unsupported level: %s, must be "class" or "package"' % level)
+  if level != 'class' and level != 'package' and level != 'method':
+    print('unsupported level: %s, must be "class" or "package" or "method"' % level)
     sys.exit(1)
   
   #for dirPath, dirNames, fileNames in os.walk('%s/lucene/build/docs/api' % root):
@@ -99,8 +317,13 @@ def checkPackageSummaries(root, level='c
       sys.exit(1)
     
   anyMissing = False
-  for dirPath, dirNames, fileNames in os.walk(root):
+  if not os.path.isdir(root):
+    checkClassSummaries(root)
+    checkClassDetails(root)
+    sys.exit(0)
     
+  for dirPath, dirNames, fileNames in os.walk(root):
+
     if dirPath.find('/all/') != -1:
       # These are dups (this is a bit risk, eg, root IS this /all/ directory..)
       continue
@@ -108,6 +331,16 @@ def checkPackageSummaries(root, level='c
     if 'package-summary.html' in fileNames:
       if level != 'package' and checkSummary('%s/package-summary.html' % dirPath):
         anyMissing = True
+      for fileName in fileNames:
+        fullPath = '%s/%s' % (dirPath, fileName)
+        if not fileName.startswith('package-') and fileName.endswith('.html') and os.path.isfile(fullPath):
+          if level == 'method':
+            if checkClassSummaries(fullPath):
+              anyMissing = True
+          # always look for broken html, regardless of level supplied
+          if checkClassDetails(fullPath):
+            anyMissing = True
+              
     if 'overview-summary.html' in fileNames:        
       if checkSummary('%s/overview-summary.html' % dirPath):
         anyMissing = True
@@ -116,7 +349,7 @@ def checkPackageSummaries(root, level='c
 
 if __name__ == '__main__':
   if len(sys.argv) < 2 or len(sys.argv) > 3:
-    print('usage: %s <dir> [class|package]' % sys.argv[0])
+    print('usage: %s <dir> [class|package|method]' % sys.argv[0])
     sys.exit(1)
   if len(sys.argv) == 2:
     level = 'class'

Modified: lucene/dev/branches/lucene3312/lucene/BUILD.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/BUILD.txt?rev=1379200&r1=1379199&r2=1379200&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/BUILD.txt (original)
+++ lucene/dev/branches/lucene3312/lucene/BUILD.txt Thu Aug 30 22:43:41 2012
@@ -66,35 +66,13 @@ system.
 
 NOTE: the ~ character represents your user account home directory.
 
-Step 3) Install JavaCC
-
-Building the Lucene distribution from the source does not require the JavaCC
-parser generator, but if you wish to regenerate any of the pre-generated
-parser pieces, you will need to install JavaCC. Version 4.1 is tested to
-work correctly.
-
-  http://javacc.dev.java.net
-
-Follow the download links and download the zip file to a temporary
-location on your file system.
-
-After JavaCC is installed, create a build.properties file
-(as in step 2), and add the line
-
-  javacc.home=/javacc
-
-where this points to the root directory of your javacc installation
-(the directory that contains bin/lib/javacc.jar).
-
-Step 4) Run ant
+Step 3) Run ant
 
 Assuming you have ant in your PATH and have set ANT_HOME to the
 location of your ant installation, typing "ant" at the shell prompt
 and command prompt should run ant.  Ant will by default look for the
 "build.xml" file in your current directory, and compile Lucene.
 
-To rebuild any of the JavaCC-based parsers, run "ant javacc".
-
 For further information on Lucene, go to:
   http://lucene.apache.org/
 

Modified: lucene/dev/branches/lucene3312/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/CHANGES.txt?rev=1379200&r1=1379199&r2=1379200&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/lucene3312/lucene/CHANGES.txt Thu Aug 30 22:43:41 2012
@@ -23,6 +23,11 @@ New Features
 * LUCENE-4323: Added support for an absolute maximum CFS segment size
   (in MiB) to LogMergePolicy and TieredMergePolicy.
   (Alexey Lef via Uwe Schindler)
+  
+* LUCENE-4339: Allow deletes against 3.x segments for easier upgrading.
+  Lucene3x Codec is still otherwise read-only, you should not set it
+  as the default Codec on IndexWriter, because it cannot write new segments.
+  (Mike McCandless, Robert Muir)
 
 API Changes
 
@@ -77,6 +82,10 @@ API Changes
   fields in a stored document, has been replaced with the simpler
   StoredFieldVisitor API.  (Mike McCandless)
 
+* LUCENE-4343: Made Tokenizer.setReader final. This is a setter that should
+  not be overriden by subclasses: per-stream initialization should happen
+  in reset().  (Robert Muir)
+
 Bug Fixes
 
 * LUCENE-4297: BooleanScorer2 would multiply the coord() factor
@@ -110,8 +119,18 @@ Bug Fixes
   containing non-BMP Unicode characters.  (Dawid Weiss, Robert Muir,
   Mike McCandless)
 
+* LUCENE-4224: Add in-order scorer to query time joining and the
+  out-of-order scorer throws an UOE. (Martijn van Groningen, Robert Muir)
+
+* LUCENE-4333: Fixed NPE in TermGroupFacetCollector when faceting on mv fields.
+  (Jesse MacVicar, Martijn van Groningen)
+
 Optimizations
 
+* LUCENE-4322: Decrease lucene-core JAR size. The core JAR size had increased a
+  lot because of generated code introduced in LUCENE-4161 and LUCENE-3892.
+  (Adrien Grand)
+
 * LUCENE-4317: Improve reuse of internal TokenStreams and StringReader
   in oal.document.Field.  (Uwe Schindler, Chris Male, Robert Muir)
 
@@ -883,7 +902,7 @@ API Changes
 
 * LUCENE-3866: IndexReaderContext.leaves() is now the preferred way to access
   atomic sub-readers of any kind of IndexReader (for AtomicReaders it returns
-  itsself as only leaf with docBase=0).  (Uwe Schindler)
+  itself as only leaf with docBase=0).  (Uwe Schindler)
 
 New features
 
@@ -2306,7 +2325,7 @@ Changes in backwards compatibility polic
   (Mike McCandless, Shai Erera)
 
 * LUCENE-3084: MergePolicy.OneMerge.segments was changed from
-  SegmentInfos to a List<SegmentInfo>. SegmentInfos itsself was changed
+  SegmentInfos to a List<SegmentInfo>. SegmentInfos itself was changed
   to no longer extend Vector<SegmentInfo> (to update code that is using
   Vector-API, use the new asList() and asSet() methods returning unmodifiable
   collections; modifying SegmentInfos is now only possible through
@@ -7547,7 +7566,7 @@ Infrastructure
 11. Fixed bugs in GermanAnalyzer (gschwarz)
 
 
-1.2 RC2:
+1.2 RC2
  - added sources to distribution
  - removed broken build scripts and libraries from distribution
  - SegmentsReader: fixed potential race condition
@@ -7562,7 +7581,8 @@ Infrastructure
  - JDK 1.1 compatibility fix: disabled lock files for JDK 1.1,
    since they rely on a feature added in JDK 1.2.
 
-1.2 RC1 (first Apache release):
+1.2 RC1
+  - first Apache release
   - packages renamed from com.lucene to org.apache.lucene
   - license switched from LGPL to Apache
   - ant-only build -- no more makefiles
@@ -7573,7 +7593,8 @@ Infrastructure
   - Analyzers can choose tokenizer based on field name
   - misc bug fixes.
 
-1.01b (last Sourceforge release)
+1.01b
+ . last Sourceforge release
  . a few bug fixes
  . new Query Parser
  . new prefix query (search for "foo*" matches "food")