You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2011/02/21 15:13:40 UTC

svn commit: r1072973 [1/11] - in /lucene/dev/branches/docvalues: ./ dev-tools/eclipse/ dev-tools/idea/.idea/ dev-tools/idea/lucene/contrib/ant/ dev-tools/idea/lucene/contrib/demo/ dev-tools/idea/lucene/contrib/highlighter/ dev-tools/idea/lucene/contrib...

Author: simonw
Date: Mon Feb 21 14:13:28 2011
New Revision: 1072973

URL: http://svn.apache.org/viewvc?rev=1072973&view=rev
Log:
catch up with trunk

Added:
    lucene/dev/branches/docvalues/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/
      - copied from r1072684, lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/
    lucene/dev/branches/docvalues/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/apache1.0.txt
      - copied unchanged from r1072684, lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/apache1.0.txt
    lucene/dev/branches/docvalues/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/apache1.1.txt
      - copied unchanged from r1072684, lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/apache1.1.txt
    lucene/dev/branches/docvalues/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/apache2.0.txt
      - copied unchanged from r1072684, lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/apache2.0.txt
    lucene/dev/branches/docvalues/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/cpl1.0.txt
      - copied unchanged from r1072684, lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/cpl1.0.txt
    lucene/dev/branches/docvalues/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/epl1.0.txt
      - copied unchanged from r1072684, lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/epl1.0.txt
    lucene/dev/branches/docvalues/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/freebsd.txt
      - copied unchanged from r1072684, lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/freebsd.txt
    lucene/dev/branches/docvalues/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/gpl1.0.txt
      - copied unchanged from r1072684, lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/gpl1.0.txt
    lucene/dev/branches/docvalues/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/gpl2.0.txt
      - copied unchanged from r1072684, lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/gpl2.0.txt
    lucene/dev/branches/docvalues/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/gpl3.0.txt
      - copied unchanged from r1072684, lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/gpl3.0.txt
    lucene/dev/branches/docvalues/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/lgpl2.1.txt
      - copied unchanged from r1072684, lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/lgpl2.1.txt
    lucene/dev/branches/docvalues/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/lgpl3.txt
      - copied unchanged from r1072684, lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/lgpl3.txt
    lucene/dev/branches/docvalues/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/lpgl2.0.txt
      - copied unchanged from r1072684, lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/lpgl2.0.txt
    lucene/dev/branches/docvalues/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/mit.txt
      - copied unchanged from r1072684, lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/mit.txt
    lucene/dev/branches/docvalues/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/mozilla1.1.txt
      - copied unchanged from r1072684, lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/mozilla1.1.txt
    lucene/dev/branches/docvalues/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/mozilla_eula_firefox3.txt
      - copied unchanged from r1072684, lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/mozilla_eula_firefox3.txt
    lucene/dev/branches/docvalues/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/mozilla_eula_thunderbird2.txt
      - copied unchanged from r1072684, lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/mozilla_eula_thunderbird2.txt
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/codecs/CoreCodecProvider.java
      - copied unchanged from r1072684, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/CoreCodecProvider.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestRollingUpdates.java
      - copied unchanged from r1072684, lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestRollingUpdates.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestStressAdvance.java
      - copied unchanged from r1072684, lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressAdvance.java
    lucene/dev/branches/docvalues/modules/analysis/icu/src/data/uax29/Default.rbbi
      - copied unchanged from r1072684, lucene/dev/trunk/modules/analysis/icu/src/data/uax29/Default.rbbi
    lucene/dev/branches/docvalues/modules/analysis/icu/src/resources/org/apache/lucene/analysis/icu/segmentation/Default.brk
      - copied unchanged from r1072684, lucene/dev/trunk/modules/analysis/icu/src/resources/org/apache/lucene/analysis/icu/segmentation/Default.brk
    lucene/dev/branches/docvalues/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/
      - copied from r1072684, lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/
    lucene/dev/branches/docvalues/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/Entities.java
      - copied unchanged from r1072684, lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/Entities.java
    lucene/dev/branches/docvalues/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/HTMLParser.java
      - copied unchanged from r1072684, lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/HTMLParser.java
    lucene/dev/branches/docvalues/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/HTMLParser.jj
      - copied unchanged from r1072684, lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/HTMLParser.jj
    lucene/dev/branches/docvalues/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/HTMLParserConstants.java
      - copied unchanged from r1072684, lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/HTMLParserConstants.java
    lucene/dev/branches/docvalues/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/HTMLParserTokenManager.java
      - copied unchanged from r1072684, lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/HTMLParserTokenManager.java
    lucene/dev/branches/docvalues/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/ParseException.java
      - copied unchanged from r1072684, lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/ParseException.java
    lucene/dev/branches/docvalues/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/ParserThread.java
      - copied unchanged from r1072684, lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/ParserThread.java
    lucene/dev/branches/docvalues/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/SimpleCharStream.java
      - copied unchanged from r1072684, lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/SimpleCharStream.java
    lucene/dev/branches/docvalues/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/Tags.java
      - copied unchanged from r1072684, lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/Tags.java
    lucene/dev/branches/docvalues/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/Token.java
      - copied unchanged from r1072684, lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/Token.java
    lucene/dev/branches/docvalues/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/TokenMgrError.java
      - copied unchanged from r1072684, lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/TokenMgrError.java
    lucene/dev/branches/docvalues/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/demohtml/
      - copied from r1072684, lucene/dev/trunk/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/demohtml/
    lucene/dev/branches/docvalues/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/demohtml/TestHtmlParser.java
      - copied unchanged from r1072684, lucene/dev/trunk/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/demohtml/TestHtmlParser.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDeltaPrefixedPk.java
      - copied unchanged from r1072684, lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDeltaPrefixedPk.java
    lucene/dev/branches/docvalues/solr/example/solr/zoo.cfg
      - copied unchanged from r1072684, lucene/dev/trunk/solr/example/solr/zoo.cfg
    lucene/dev/branches/docvalues/solr/lib/jcl-over-slf4j-1.6.1.jar
      - copied unchanged from r1072684, lucene/dev/trunk/solr/lib/jcl-over-slf4j-1.6.1.jar
    lucene/dev/branches/docvalues/solr/lib/log4j-over-slf4j-1.6.1.jar
      - copied unchanged from r1072684, lucene/dev/trunk/solr/lib/log4j-over-slf4j-1.6.1.jar
    lucene/dev/branches/docvalues/solr/lib/slf4j-api-1.6.1.jar
      - copied unchanged from r1072684, lucene/dev/trunk/solr/lib/slf4j-api-1.6.1.jar
    lucene/dev/branches/docvalues/solr/lib/slf4j-jdk14-1.6.1.jar
      - copied unchanged from r1072684, lucene/dev/trunk/solr/lib/slf4j-jdk14-1.6.1.jar
Removed:
    lucene/dev/branches/docvalues/lucene/contrib/demo/src/java/demo-build.template
    lucene/dev/branches/docvalues/lucene/contrib/demo/src/java/org/apache/lucene/demo/DeleteFiles.java
    lucene/dev/branches/docvalues/lucene/contrib/demo/src/java/org/apache/lucene/demo/FileDocument.java
    lucene/dev/branches/docvalues/lucene/contrib/demo/src/java/org/apache/lucene/demo/HTMLDocument.java
    lucene/dev/branches/docvalues/lucene/contrib/demo/src/java/org/apache/lucene/demo/IndexHTML.java
    lucene/dev/branches/docvalues/lucene/contrib/demo/src/java/org/apache/lucene/demo/html/
    lucene/dev/branches/docvalues/lucene/contrib/demo/src/jsp/
    lucene/dev/branches/docvalues/lucene/contrib/demo/src/test/org/apache/lucene/demo/html/
    lucene/dev/branches/docvalues/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/html/
    lucene/dev/branches/docvalues/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/queries.txt
    lucene/dev/branches/docvalues/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/queries2.txt
    lucene/dev/branches/docvalues/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestSerialization.java
    lucene/dev/branches/docvalues/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestCartesianShapeFilter.java
    lucene/dev/branches/docvalues/lucene/docs/demo3.html
    lucene/dev/branches/docvalues/lucene/docs/demo3.pdf
    lucene/dev/branches/docvalues/lucene/docs/demo4.html
    lucene/dev/branches/docvalues/lucene/docs/demo4.pdf
    lucene/dev/branches/docvalues/lucene/src/site/src/documentation/content/xdocs/demo3.xml
    lucene/dev/branches/docvalues/lucene/src/site/src/documentation/content/xdocs/demo4.xml
    lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleMatrixFilter.java
    lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/shingle/TestShingleMatrixFilter.java
    lucene/dev/branches/docvalues/solr/lib/jcl-over-slf4j-1.5.5.jar
    lucene/dev/branches/docvalues/solr/lib/log4j-over-slf4j-1.5.5.jar
    lucene/dev/branches/docvalues/solr/lib/slf4j-api-1.5.5.jar
    lucene/dev/branches/docvalues/solr/lib/slf4j-jdk14-1.5.5.jar
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/function/MaxFloatFunction.java
Modified:
    lucene/dev/branches/docvalues/   (props changed)
    lucene/dev/branches/docvalues/dev-tools/eclipse/dot.classpath
    lucene/dev/branches/docvalues/dev-tools/idea/.idea/compiler.xml
    lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/ant/ant.iml
    lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/demo/demo.iml
    lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/highlighter/highlighter.iml
    lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/instantiated/instantiated.iml
    lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/lucli/lucli.iml
    lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/memory/memory.iml
    lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/queryparser/queryparser.iml
    lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/spatial/spatial.iml
    lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/spellchecker/spellchecker.iml
    lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/swing/swing.iml
    lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/wordnet/wordnet.iml
    lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/xml-query-parser/xml-query-parser.iml
    lucene/dev/branches/docvalues/dev-tools/idea/modules/benchmark/benchmark.iml
    lucene/dev/branches/docvalues/dev-tools/idea/solr/contrib/clustering/clustering.iml
    lucene/dev/branches/docvalues/dev-tools/idea/solr/contrib/uima/uima.iml
    lucene/dev/branches/docvalues/dev-tools/idea/solr/solr.iml
    lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/demo/pom.xml.template
    lucene/dev/branches/docvalues/dev-tools/maven/modules/benchmark/pom.xml.template
    lucene/dev/branches/docvalues/dev-tools/maven/pom.xml.template
    lucene/dev/branches/docvalues/lucene/   (props changed)
    lucene/dev/branches/docvalues/lucene/CHANGES.txt
    lucene/dev/branches/docvalues/lucene/MIGRATE.txt
    lucene/dev/branches/docvalues/lucene/build.xml   (contents, props changed)
    lucene/dev/branches/docvalues/lucene/contrib/   (props changed)
    lucene/dev/branches/docvalues/lucene/contrib/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/docvalues/lucene/contrib/demo/build.xml
    lucene/dev/branches/docvalues/lucene/contrib/demo/src/java/org/apache/lucene/demo/IndexFiles.java
    lucene/dev/branches/docvalues/lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java
    lucene/dev/branches/docvalues/lucene/contrib/demo/src/test/org/apache/lucene/demo/TestDemo.java
    lucene/dev/branches/docvalues/lucene/contrib/highlighter/src/test/   (props changed)
    lucene/dev/branches/docvalues/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/FieldSetting.java
    lucene/dev/branches/docvalues/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/FieldSettings.java
    lucene/dev/branches/docvalues/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedDocument.java
    lucene/dev/branches/docvalues/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndex.java
    lucene/dev/branches/docvalues/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexWriter.java
    lucene/dev/branches/docvalues/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTerm.java
    lucene/dev/branches/docvalues/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTermDocumentInformation.java
    lucene/dev/branches/docvalues/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTermFreqVector.java
    lucene/dev/branches/docvalues/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTermPositionVector.java
    lucene/dev/branches/docvalues/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java   (props changed)
    lucene/dev/branches/docvalues/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
    lucene/dev/branches/docvalues/lucene/contrib/misc/src/java/org/apache/lucene/index/FieldNormModifier.java
    lucene/dev/branches/docvalues/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingCodec.java
    lucene/dev/branches/docvalues/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingTermsDictReader.java
    lucene/dev/branches/docvalues/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingTermsDictWriter.java
    lucene/dev/branches/docvalues/lucene/contrib/misc/src/java/org/apache/lucene/misc/SweetSpotSimilarity.java
    lucene/dev/branches/docvalues/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java
    lucene/dev/branches/docvalues/lucene/contrib/misc/src/test/org/apache/lucene/misc/SweetSpotSimilarityTest.java
    lucene/dev/branches/docvalues/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java
    lucene/dev/branches/docvalues/lucene/contrib/queries/src/java/org/apache/lucene/search/FilterClause.java
    lucene/dev/branches/docvalues/lucene/contrib/queries/src/java/org/apache/lucene/search/regex/RegexCapabilities.java
    lucene/dev/branches/docvalues/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java   (props changed)
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/QueryNodeError.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/QueryNodeException.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/QueryNodeParseException.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/AndQueryNode.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/AnyQueryNode.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/BooleanQueryNode.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/BoostQueryNode.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/DeletedQueryNode.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/FieldQueryNode.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/FuzzyQueryNode.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/GroupQueryNode.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/MatchAllDocsQueryNode.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/MatchNoDocsQueryNode.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ModifierQueryNode.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/NoTokenFoundQueryNode.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/OpaqueQueryNode.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/OrQueryNode.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ParametricQueryNode.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ParametricRangeQueryNode.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/PathQueryNode.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/PhraseSlopQueryNode.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ProximityQueryNode.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QueryNode.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QueryNodeImpl.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QuotedFieldQueryNode.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/SlopQueryNode.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/TokenizedPhraseQueryNode.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/package.html
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/processors/QueryNodeProcessorImpl.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/AllowLeadingWildcardAttributeImpl.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/AnalyzerAttributeImpl.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/BoostAttributeImpl.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DateResolutionAttributeImpl.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DefaultOperatorAttributeImpl.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DefaultPhraseSlopAttributeImpl.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldBoostMapAttributeImpl.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldBoostMapFCListener.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldDateResolutionFCListener.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldDateResolutionMapAttributeImpl.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FuzzyAttributeImpl.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/LocaleAttributeImpl.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/LowercaseExpandedTermsAttributeImpl.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/MultiFieldAttributeImpl.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/MultiTermRewriteMethodAttributeImpl.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/PositionIncrementsAttributeImpl.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/RangeCollatorAttributeImpl.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/BooleanModifierNode.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/MultiPhraseQueryNode.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/PrefixWildcardQueryNode.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/RangeQueryNode.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/RegexpQueryNode.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/StandardBooleanQueryNode.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/WildcardQueryNode.java
    lucene/dev/branches/docvalues/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/UniqueFieldAttributeImpl.java
    lucene/dev/branches/docvalues/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geohash/GeoHashDistanceFilter.java
    lucene/dev/branches/docvalues/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceFieldComparatorSource.java
    lucene/dev/branches/docvalues/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceFilter.java
    lucene/dev/branches/docvalues/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceQueryBuilder.java
    lucene/dev/branches/docvalues/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/InvalidGeoException.java
    lucene/dev/branches/docvalues/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/LatLongDistanceFilter.java
    lucene/dev/branches/docvalues/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/Shape.java
    lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/NumericRangeFilterBuilder.java
    lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestParser.java
    lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/builders/TestNumericRangeFilterBuilder.java   (props changed)
    lucene/dev/branches/docvalues/lucene/docs/contributions.html
    lucene/dev/branches/docvalues/lucene/docs/demo.html
    lucene/dev/branches/docvalues/lucene/docs/demo.pdf
    lucene/dev/branches/docvalues/lucene/docs/demo2.html
    lucene/dev/branches/docvalues/lucene/docs/demo2.pdf
    lucene/dev/branches/docvalues/lucene/docs/fileformats.html
    lucene/dev/branches/docvalues/lucene/docs/gettingstarted.html
    lucene/dev/branches/docvalues/lucene/docs/gettingstarted.pdf
    lucene/dev/branches/docvalues/lucene/docs/index.html
    lucene/dev/branches/docvalues/lucene/docs/linkmap.html
    lucene/dev/branches/docvalues/lucene/docs/linkmap.pdf
    lucene/dev/branches/docvalues/lucene/docs/lucene-contrib/index.html
    lucene/dev/branches/docvalues/lucene/docs/lucene-contrib/index.pdf
    lucene/dev/branches/docvalues/lucene/docs/queryparsersyntax.html
    lucene/dev/branches/docvalues/lucene/docs/scoring.html
    lucene/dev/branches/docvalues/lucene/docs/systemrequirements.html
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/NumericTokenStream.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java   (props changed)
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttributeImpl.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/tokenattributes/FlagsAttributeImpl.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/tokenattributes/OffsetAttributeImpl.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/tokenattributes/PayloadAttributeImpl.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/tokenattributes/PositionIncrementAttributeImpl.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/analysis/tokenattributes/TypeAttributeImpl.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/document/AbstractField.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/document/Document.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/document/Field.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/document/FieldSelector.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/document/Fieldable.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/document/NumericField.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/BufferedDeletesStream.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/DirectoryReader.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/IndexReader.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/IndexWriter.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/LogMergePolicy.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/MergePolicy.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/NormsWriterPerField.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/OrdTermState.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/Payload.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/SegmentWriteState.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/Term.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/TermState.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/TermVectorOffsetInfo.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/codecs/BlockTermState.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/codecs/BlockTermsReader.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/codecs/BlockTermsWriter.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/codecs/CodecProvider.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/codecs/intblock/FixedIntBlockIndexInput.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/codecs/intblock/FixedIntBlockIndexOutput.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/codecs/intblock/VariableIntBlockIndexInput.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/codecs/intblock/VariableIntBlockIndexOutput.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/codecs/preflex/SegmentTermDocs.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/codecs/pulsing/PulsingCodec.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/codecs/pulsing/PulsingPostingsReaderImpl.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/codecs/sep/IntIndexInput.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/codecs/sep/IntIndexOutput.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/codecs/sep/SepPostingsReaderImpl.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/codecs/sep/SepPostingsWriterImpl.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/codecs/sep/SepSkipListReader.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/codecs/sep/SepSkipListWriter.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/codecs/standard/StandardCodec.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/codecs/standard/StandardPostingsReader.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/codecs/standard/StandardPostingsWriter.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/messages/Message.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/messages/MessageImpl.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/queryParser/QueryParserBase.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/AutomatonQuery.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/BooleanClause.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/CachingWrapperFilter.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/DefaultSimilarity.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/Explanation.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/FieldCache.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/FieldComparatorSource.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/Filter.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/FuzzyTermsEnum.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/MultiTermQuery.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java   (props changed)
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/NumericRangeFilter.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/NumericRangeQuery.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/Query.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/ScoreDoc.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/Similarity.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/Sort.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/SortField.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/TopDocs.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/Weight.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/cache/EntryCreator.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/function/ValueSource.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/payloads/PayloadFunction.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/store/RAMDirectory.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/store/RAMFile.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/util/AttributeImpl.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/util/BytesRef.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/util/MapBackedSet.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/util/OpenBitSet.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/util/PriorityQueue.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/util/automaton/Automaton.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/util/automaton/RunAutomaton.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/util/automaton/State.java
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/util/automaton/Transition.java
    lucene/dev/branches/docvalues/lucene/src/java/overview.html
    lucene/dev/branches/docvalues/lucene/src/site/src/documentation/content/xdocs/demo.xml
    lucene/dev/branches/docvalues/lucene/src/site/src/documentation/content/xdocs/demo2.xml
    lucene/dev/branches/docvalues/lucene/src/site/src/documentation/content/xdocs/gettingstarted.xml
    lucene/dev/branches/docvalues/lucene/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml
    lucene/dev/branches/docvalues/lucene/src/site/src/documentation/content/xdocs/site.xml
    lucene/dev/branches/docvalues/lucene/src/test-framework/org/apache/lucene/analysis/MockAnalyzer.java
    lucene/dev/branches/docvalues/lucene/src/test-framework/org/apache/lucene/analysis/MockTokenFilter.java
    lucene/dev/branches/docvalues/lucene/src/test-framework/org/apache/lucene/analysis/MockTokenizer.java
    lucene/dev/branches/docvalues/lucene/src/test-framework/org/apache/lucene/index/RandomIndexWriter.java
    lucene/dev/branches/docvalues/lucene/src/test-framework/org/apache/lucene/index/codecs/mockintblock/MockFixedIntBlockCodec.java
    lucene/dev/branches/docvalues/lucene/src/test-framework/org/apache/lucene/index/codecs/mockintblock/MockVariableIntBlockCodec.java
    lucene/dev/branches/docvalues/lucene/src/test-framework/org/apache/lucene/index/codecs/mockrandom/MockRandomCodec.java
    lucene/dev/branches/docvalues/lucene/src/test-framework/org/apache/lucene/index/codecs/mocksep/MockSepCodec.java
    lucene/dev/branches/docvalues/lucene/src/test-framework/org/apache/lucene/index/codecs/mocksep/MockSingleIntIndexInput.java
    lucene/dev/branches/docvalues/lucene/src/test-framework/org/apache/lucene/index/codecs/mocksep/MockSingleIntIndexOutput.java
    lucene/dev/branches/docvalues/lucene/src/test-framework/org/apache/lucene/search/QueryUtils.java
    lucene/dev/branches/docvalues/lucene/src/test-framework/org/apache/lucene/store/MockDirectoryWrapper.java
    lucene/dev/branches/docvalues/lucene/src/test-framework/org/apache/lucene/util/LineFileDocs.java
    lucene/dev/branches/docvalues/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
    lucene/dev/branches/docvalues/lucene/src/test-framework/org/apache/lucene/util/_TestUtil.java
    lucene/dev/branches/docvalues/lucene/src/test-framework/org/apache/lucene/util/automaton/AutomatonTestUtil.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/TestExternalCodecs.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/document/TestDateTools.java   (props changed)
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java   (props changed)
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestDoc.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestIndexReaderCloneNorms.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestIsCurrent.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestMaxTermFrequency.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestMultiFields.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestNorms.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestOmitTf.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestThreadedOptimize.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/queryParser/TestQueryParser.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/search/JustCompileSearch.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/search/TestAutomatonQuery.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/search/TestCachingSpanFilter.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/search/TestCustomSearcherSort.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/search/TestSimilarity.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/search/TestSimilarityProvider.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/search/TestSort.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/store/TestRAMDirectory.java
    lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java   (props changed)
    lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/ByteVector.java
    lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/CharVector.java
    lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/Hyphen.java
    lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/HyphenationTree.java
    lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java
    lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/ASCIITLD.jflex-macro
    lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java
    lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/SUPPLEMENTARY.jflex-macro
    lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java
    lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java
    lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex
    lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizer.java
    lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizer.jflex
    lucene/dev/branches/docvalues/modules/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java
    lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestStandardAnalyzer.java
    lucene/dev/branches/docvalues/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestUAX29URLEmailTokenizer.java
    lucene/dev/branches/docvalues/modules/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/DefaultICUTokenizerConfig.java
    lucene/dev/branches/docvalues/modules/analysis/icu/src/java/org/apache/lucene/analysis/icu/tokenattributes/ScriptAttributeImpl.java
    lucene/dev/branches/docvalues/modules/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizer.java
    lucene/dev/branches/docvalues/modules/benchmark/build.xml
    lucene/dev/branches/docvalues/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DemoHTMLParser.java
    lucene/dev/branches/docvalues/solr/   (props changed)
    lucene/dev/branches/docvalues/solr/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/docvalues/solr/KEYS   (props changed)
    lucene/dev/branches/docvalues/solr/LICENSE.txt   (props changed)
    lucene/dev/branches/docvalues/solr/NOTICE.txt   (props changed)
    lucene/dev/branches/docvalues/solr/README.txt   (props changed)
    lucene/dev/branches/docvalues/solr/build.xml   (contents, props changed)
    lucene/dev/branches/docvalues/solr/client/   (props changed)
    lucene/dev/branches/docvalues/solr/client/ruby/solr-ruby/solr/conf/solrconfig.xml
    lucene/dev/branches/docvalues/solr/client/ruby/solr-ruby/test/conf/solrconfig.xml
    lucene/dev/branches/docvalues/solr/common-build.xml   (contents, props changed)
    lucene/dev/branches/docvalues/solr/contrib/   (props changed)
    lucene/dev/branches/docvalues/solr/contrib/clustering/   (props changed)
    lucene/dev/branches/docvalues/solr/contrib/clustering/src/test/resources/solr-clustering/conf/solrconfig.xml
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/CHANGES.txt
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/build.xml
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/extras/main/java/org/apache/solr/handler/dataimport/TikaEntityProcessor.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestTikaEntityProcessor.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/extras/test/resources/solr-dihextras/conf/dataimport-solrconfig.xml
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EntityProcessorBase.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EntityProcessorWrapper.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/main/webapp/admin/dataimport.jsp
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTestCase.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestErrorHandling.java
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/contentstream-solrconfig.xml
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/dataimport-nodatasource-solrconfig.xml
    lucene/dev/branches/docvalues/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/dataimport-solrconfig.xml
    lucene/dev/branches/docvalues/solr/contrib/extraction/src/test/resources/solr-extraction/conf/solrconfig.xml
    lucene/dev/branches/docvalues/solr/contrib/uima/README.txt
    lucene/dev/branches/docvalues/solr/contrib/uima/src/test/resources/solr-uima/conf/solrconfig.xml
    lucene/dev/branches/docvalues/solr/example/   (props changed)
    lucene/dev/branches/docvalues/solr/example/example-DIH/solr/db/conf/solrconfig.xml
    lucene/dev/branches/docvalues/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
    lucene/dev/branches/docvalues/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
    lucene/dev/branches/docvalues/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
    lucene/dev/branches/docvalues/solr/example/solr/conf/velocity/tabs.vm
    lucene/dev/branches/docvalues/solr/example/solr/solr.xml
    lucene/dev/branches/docvalues/solr/lib/   (props changed)
    lucene/dev/branches/docvalues/solr/lib/commons-httpclient-3.1.jar   (props changed)
    lucene/dev/branches/docvalues/solr/site/   (props changed)
    lucene/dev/branches/docvalues/solr/src/   (props changed)
    lucene/dev/branches/docvalues/solr/src/common/org/apache/solr/common/   (props changed)
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/core/CoreContainer.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/request/SimpleFacets.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/schema/AbstractSubTypeFieldType.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/schema/BoolField.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/schema/ByteField.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/schema/DateField.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/schema/DoubleField.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/schema/FieldType.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/schema/FloatField.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/schema/GeoHashField.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/schema/IntField.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/schema/LongField.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/schema/SchemaField.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/schema/ShortField.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/schema/SortableDoubleField.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/schema/SortableFloatField.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/schema/SortableIntField.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/schema/SortableLongField.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/schema/StrField.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/schema/TrieDateField.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/schema/TrieField.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/ValueSourceParser.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/function/ValueSource.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/spelling/SpellCheckCollator.java
    lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/update/DirectUpdateHandler2.java
    lucene/dev/branches/docvalues/solr/src/solrj/org/   (props changed)
    lucene/dev/branches/docvalues/solr/src/solrj/org/apache/solr/client/solrj/impl/StreamingUpdateSolrServer.java
    lucene/dev/branches/docvalues/solr/src/test-files/solr/conf/schema.xml
    lucene/dev/branches/docvalues/solr/src/test-files/solr/conf/solrconfig-elevate.xml
    lucene/dev/branches/docvalues/solr/src/test-files/solr/conf/solrconfig-enableplugin.xml
    lucene/dev/branches/docvalues/solr/src/test-files/solr/conf/solrconfig-master.xml
    lucene/dev/branches/docvalues/solr/src/test-files/solr/conf/solrconfig-master1.xml
    lucene/dev/branches/docvalues/solr/src/test-files/solr/conf/solrconfig-master2.xml
    lucene/dev/branches/docvalues/solr/src/test-files/solr/conf/solrconfig-repeater.xml
    lucene/dev/branches/docvalues/solr/src/test-files/solr/conf/solrconfig-slave.xml
    lucene/dev/branches/docvalues/solr/src/test-files/solr/conf/solrconfig-slave1.xml
    lucene/dev/branches/docvalues/solr/src/test-files/solr/conf/solrconfig-solcoreproperties.xml
    lucene/dev/branches/docvalues/solr/src/test-files/solr/conf/solrconfig-spellcheckcomponent.xml
    lucene/dev/branches/docvalues/solr/src/test-files/solr/conf/solrconfig.xml
    lucene/dev/branches/docvalues/solr/src/test-files/solr/conf/solrconfig_perf.xml
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/client/   (props changed)
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/search/QueryParsingTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/search/TestIndexSearcher.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/search/TestQueryTypes.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/search/function/SortByFunctionTest.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/search/function/TestFunctionQuery.java
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java
    lucene/dev/branches/docvalues/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/   (props changed)
    lucene/dev/branches/docvalues/solr/testlogging.properties   (props changed)

Modified: lucene/dev/branches/docvalues/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/eclipse/dot.classpath?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/docvalues/dev-tools/eclipse/dot.classpath Mon Feb 21 14:13:28 2011
@@ -107,12 +107,12 @@
 	<classpathentry kind="lib" path="solr/lib/easymock.jar"/>
 	<classpathentry kind="lib" path="solr/lib/geronimo-stax-api_1.0_spec-1.0.1.jar"/>
 	<classpathentry kind="lib" path="solr/lib/guava-r05.jar"/>
-	<classpathentry kind="lib" path="solr/lib/jcl-over-slf4j-1.5.5.jar"/>
+	<classpathentry kind="lib" path="solr/lib/jcl-over-slf4j-1.6.1.jar"/>
 	<classpathentry kind="lib" path="solr/lib/junit-4.7.jar"/>
-	<classpathentry kind="lib" path="solr/lib/log4j-over-slf4j-1.5.5.jar"/>
+	<classpathentry kind="lib" path="solr/lib/log4j-over-slf4j-1.6.1.jar"/>
 	<classpathentry kind="lib" path="solr/lib/servlet-api-2.4.jar"/>
-	<classpathentry kind="lib" path="solr/lib/slf4j-api-1.5.5.jar"/>
-	<classpathentry kind="lib" path="solr/lib/slf4j-jdk14-1.5.5.jar"/>
+	<classpathentry kind="lib" path="solr/lib/slf4j-api-1.6.1.jar"/>
+	<classpathentry kind="lib" path="solr/lib/slf4j-jdk14-1.6.1.jar"/>
 	<classpathentry kind="lib" path="solr/lib/velocity-1.6.4.jar"/>
 	<classpathentry kind="lib" path="solr/lib/velocity-tools-2.0.jar"/>
 	<classpathentry kind="lib" path="solr/lib/wstx-asl-3.2.7.jar"/>

Modified: lucene/dev/branches/docvalues/dev-tools/idea/.idea/compiler.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/idea/.idea/compiler.xml?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/idea/.idea/compiler.xml (original)
+++ lucene/dev/branches/docvalues/dev-tools/idea/.idea/compiler.xml Mon Feb 21 14:13:28 2011
@@ -23,6 +23,7 @@
       <entry name="?*.pdf" />
       <entry name="?*.png" />
       <entry name="?*.properties" />
+      <entry name="?*.rslp"/>
       <entry name="?*.tbl" />
       <entry name="?*.tld" />
       <entry name="?*.txt" />
@@ -33,5 +34,8 @@
       <entry name="README*" />
     </wildcardResourcePatterns>
   </component>
+  <component name="JavacSettings">
+    <option name="ADDITIONAL_OPTIONS_STRING" value="-encoding utf-8" />
+  </component>
 </project>
 

Modified: lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/ant/ant.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/ant/ant.iml?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/ant/ant.iml (original)
+++ lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/ant/ant.iml Mon Feb 21 14:13:28 2011
@@ -10,7 +10,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
     </content>
     <orderEntry type="module" module-name="common" />
-    <orderEntry type="module" module-name="remote" />
     <orderEntry type="module" module-name="lucene" />
     <orderEntry type="module" module-name="queries" />
     <orderEntry type="module" module-name="misc" />

Modified: lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/demo/demo.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/demo/demo.iml?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/demo/demo.iml (original)
+++ lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/demo/demo.iml Mon Feb 21 14:13:28 2011
@@ -6,14 +6,10 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/jsp" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
     </content>
     <orderEntry type="module" module-name="common" />
-    <orderEntry type="module" module-name="remote" />
     <orderEntry type="module" module-name="lucene" />
-    <orderEntry type="module" module-name="queries" />
-    <orderEntry type="module" module-name="misc" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module-library">

Modified: lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/highlighter/highlighter.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/highlighter/highlighter.iml?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/highlighter/highlighter.iml (original)
+++ lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/highlighter/highlighter.iml Mon Feb 21 14:13:28 2011
@@ -8,7 +8,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
     </content>
-    <orderEntry type="module" module-name="remote" />
     <orderEntry type="module" module-name="lucene" />
     <orderEntry type="module" module-name="memory" />
     <orderEntry type="module" module-name="queries" />

Modified: lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/instantiated/instantiated.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/instantiated/instantiated.iml?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/instantiated/instantiated.iml (original)
+++ lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/instantiated/instantiated.iml Mon Feb 21 14:13:28 2011
@@ -8,7 +8,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
     </content>
-    <orderEntry type="module" module-name="remote" />
     <orderEntry type="module" module-name="lucene" />
     <orderEntry type="module" module-name="queries" />
     <orderEntry type="module" module-name="misc" />

Modified: lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/lucli/lucli.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/lucli/lucli.iml?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/lucli/lucli.iml (original)
+++ lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/lucli/lucli.iml Mon Feb 21 14:13:28 2011
@@ -9,7 +9,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
     </content>
     <orderEntry type="module" module-name="common" />
-    <orderEntry type="module" module-name="remote" />
     <orderEntry type="module" module-name="lucene" />
     <orderEntry type="module" module-name="queries" />
     <orderEntry type="module" module-name="misc" />

Modified: lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/memory/memory.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/memory/memory.iml?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/memory/memory.iml (original)
+++ lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/memory/memory.iml Mon Feb 21 14:13:28 2011
@@ -8,7 +8,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
     </content>
-    <orderEntry type="module" module-name="remote" />
     <orderEntry type="module" module-name="lucene" />
     <orderEntry type="module" module-name="queries" />
     <orderEntry type="module" module-name="misc" />

Modified: lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/queryparser/queryparser.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/queryparser/queryparser.iml?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/queryparser/queryparser.iml (original)
+++ lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/queryparser/queryparser.iml Mon Feb 21 14:13:28 2011
@@ -9,7 +9,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/resources" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
     </content>
-    <orderEntry type="module" module-name="remote" />
     <orderEntry type="module" module-name="lucene" />
     <orderEntry type="module" module-name="queries" />
     <orderEntry type="module" module-name="misc" />

Modified: lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/spatial/spatial.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/spatial/spatial.iml?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/spatial/spatial.iml (original)
+++ lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/spatial/spatial.iml Mon Feb 21 14:13:28 2011
@@ -8,7 +8,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
     </content>
-    <orderEntry type="module" module-name="remote" />
     <orderEntry type="module" module-name="lucene" />
     <orderEntry type="module" module-name="queries" />
     <orderEntry type="module" module-name="misc" />

Modified: lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/spellchecker/spellchecker.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/spellchecker/spellchecker.iml?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/spellchecker/spellchecker.iml (original)
+++ lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/spellchecker/spellchecker.iml Mon Feb 21 14:13:28 2011
@@ -9,7 +9,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
     </content>
     <orderEntry type="module" module-name="common" />
-    <orderEntry type="module" module-name="remote" />
     <orderEntry type="module" module-name="lucene" />
     <orderEntry type="module" module-name="queries" />
     <orderEntry type="module" module-name="misc" />

Modified: lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/swing/swing.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/swing/swing.iml?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/swing/swing.iml (original)
+++ lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/swing/swing.iml Mon Feb 21 14:13:28 2011
@@ -9,7 +9,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
     </content>
     <orderEntry type="module" module-name="common" />
-    <orderEntry type="module" module-name="remote" />
     <orderEntry type="module" module-name="lucene" />
     <orderEntry type="module" module-name="queries" />
     <orderEntry type="module" module-name="misc" />

Modified: lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/wordnet/wordnet.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/wordnet/wordnet.iml?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/wordnet/wordnet.iml (original)
+++ lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/wordnet/wordnet.iml Mon Feb 21 14:13:28 2011
@@ -9,7 +9,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
     </content>
     <orderEntry type="module" module-name="common" />
-    <orderEntry type="module" module-name="remote" />
     <orderEntry type="module" module-name="lucene" />
     <orderEntry type="module" module-name="queries" />
     <orderEntry type="module" module-name="misc" />

Modified: lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/xml-query-parser/xml-query-parser.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/xml-query-parser/xml-query-parser.iml?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/xml-query-parser/xml-query-parser.iml (original)
+++ lucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/xml-query-parser/xml-query-parser.iml Mon Feb 21 14:13:28 2011
@@ -11,7 +11,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
     </content>
     <orderEntry type="module" module-name="common" />
-    <orderEntry type="module" module-name="remote" />
     <orderEntry type="module" module-name="lucene" />
     <orderEntry type="module" module-name="queries" />
     <orderEntry type="module" module-name="misc" />

Modified: lucene/dev/branches/docvalues/dev-tools/idea/modules/benchmark/benchmark.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/idea/modules/benchmark/benchmark.iml?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/idea/modules/benchmark/benchmark.iml (original)
+++ lucene/dev/branches/docvalues/dev-tools/idea/modules/benchmark/benchmark.iml Mon Feb 21 14:13:28 2011
@@ -12,13 +12,11 @@
     </content>
     <orderEntry type="module" module-name="highlighter" />
     <orderEntry type="module" module-name="common" />
-    <orderEntry type="module" module-name="remote" />
     <orderEntry type="module" module-name="lucene" />
     <orderEntry type="module" module-name="icu" />
     <orderEntry type="module" module-name="queries" />
     <orderEntry type="module" module-name="misc" />
     <orderEntry type="module" module-name="memory" />
-    <orderEntry type="module" module-name="demo" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module-library">

Modified: lucene/dev/branches/docvalues/dev-tools/idea/solr/contrib/clustering/clustering.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/idea/solr/contrib/clustering/clustering.iml?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/idea/solr/contrib/clustering/clustering.iml (original)
+++ lucene/dev/branches/docvalues/dev-tools/idea/solr/contrib/clustering/clustering.iml Mon Feb 21 14:13:28 2011
@@ -16,7 +16,6 @@
     <orderEntry type="module" module-name="misc" />
     <orderEntry type="module" module-name="phonetic" />
     <orderEntry type="module" module-name="queries" />
-    <orderEntry type="module" module-name="remote" />
     <orderEntry type="module" module-name="solr" />
     <orderEntry type="module" module-name="spatial" />
     <orderEntry type="module" module-name="spellchecker" />

Modified: lucene/dev/branches/docvalues/dev-tools/idea/solr/contrib/uima/uima.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/idea/solr/contrib/uima/uima.iml?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/idea/solr/contrib/uima/uima.iml (original)
+++ lucene/dev/branches/docvalues/dev-tools/idea/solr/contrib/uima/uima.iml Mon Feb 21 14:13:28 2011
@@ -12,7 +12,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build" />
     </content>
     <orderEntry type="module" module-name="solr" />
-    <orderEntry type="module" module-name="solrj" />
     <orderEntry type="module" module-name="lucene" scope="TEST" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

Modified: lucene/dev/branches/docvalues/dev-tools/idea/solr/solr.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/idea/solr/solr.iml?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/idea/solr/solr.iml (original)
+++ lucene/dev/branches/docvalues/dev-tools/idea/solr/solr.iml Mon Feb 21 14:13:28 2011
@@ -22,7 +22,6 @@
     <orderEntry type="module" module-name="misc" />
     <orderEntry type="module" module-name="phonetic" />
     <orderEntry type="module" module-name="spellchecker" />
-    <orderEntry type="module" module-name="remote" />
     <orderEntry type="module" module-name="lucene" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

Modified: lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/demo/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/demo/pom.xml.template?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/demo/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/demo/pom.xml.template Mon Feb 21 14:13:28 2011
@@ -28,8 +28,8 @@
   </parent>
   <groupId>org.apache.lucene</groupId>
   <artifactId>lucene-demo</artifactId>
-  <packaging>war</packaging>
-  <name>Lucene Demos</name>
+  <packaging>jar</packaging>
+  <name>Lucene Demo</name>
   <description>This is the demo for Apache Lucene Java</description>
   <properties>
     <module-directory>lucene/contrib/demo</module-directory>
@@ -54,11 +54,6 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
@@ -80,15 +75,6 @@
     </testResources>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-war-plugin</artifactId>
-        <configuration>
-          <warSourceDirectory>src/jsp</warSourceDirectory>
-          <attachClasses>true</attachClasses>
-          <classesClassifier/>
-        </configuration>
-      </plugin>
-      <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>appassembler-maven-plugin</artifactId>
         <configuration>
@@ -101,18 +87,10 @@
           </platforms>
           <programs>
             <program>
-              <mainClass>org.apache.lucene.demo.DeleteFiles</mainClass>
-              <name>DeleteFiles</name>
-            </program>
-            <program>
               <mainClass>org.apache.lucene.demo.IndexFiles</mainClass>
               <name>IndexFiles</name>
             </program>
             <program>
-              <mainClass>org.apache.lucene.demo.IndexHTML</mainClass>
-              <name>IndexHTML</name>
-            </program>
-            <program>
               <mainClass>org.apache.lucene.demo.SearchFiles</mainClass>
               <name>SearchFiles</name>
             </program>

Modified: lucene/dev/branches/docvalues/dev-tools/maven/modules/benchmark/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/modules/benchmark/pom.xml.template?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/modules/benchmark/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/modules/benchmark/pom.xml.template Mon Feb 21 14:13:28 2011
@@ -55,12 +55,6 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>lucene-demo</artifactId>
-      <version>${project.version}</version>
-      <classifier>classes</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
       <artifactId>lucene-highlighter</artifactId>
       <version>${project.version}</version>
     </dependency>

Modified: lucene/dev/branches/docvalues/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/pom.xml.template?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/pom.xml.template Mon Feb 21 14:13:28 2011
@@ -42,7 +42,7 @@
     <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
     <java.compat.version>1.5</java.compat.version>
     <jetty.version>6.1.26</jetty.version>
-    <slf4j.version>1.5.5</slf4j.version>
+    <slf4j.version>1.6.1</slf4j.version>
     <tika.version>0.8</tika.version>
     <uima.version>${project.version}</uima.version>
   </properties>

Modified: lucene/dev/branches/docvalues/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/CHANGES.txt?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/docvalues/lucene/CHANGES.txt Mon Feb 21 14:13:28 2011
@@ -118,6 +118,10 @@ Changes in backwards compatibility polic
   ParallelMultiSearcher into IndexSearcher as an optional
   ExecutorServiced passed to its ctor.  (Mike McCandless)
 
+* LUCENE-2908: Removed serialization code from lucene classes. It is recommended
+  that you serialize user search needs at a higher level in your application.
+  (Robert Muir)
+
 * LUCENE-2831: Changed Weight#scorer, Weight#explain & Filter#getDocIdSet to
   operate on a AtomicReaderContext instead of directly on IndexReader to enable
   searches to be aware of IndexSearcher's context. (Simon Willnauer)
@@ -191,6 +195,10 @@ API Changes
   for building top-level norms. If you really need a top-level norms, use 
   MultiNorms or SlowMultiReaderWrapper. (Robert Muir, Mike Mccandless)
 
+* LUCENE-2892: Add QueryParser.newFieldQuery (called by getFieldQuery by default)
+  which takes Analyzer as a parameter, for easier customization by subclasses.
+  (Robert Muir)
+
 New features
 
 * LUCENE-2604: Added RegexpQuery support to QueryParser. Regular expressions
@@ -845,7 +853,16 @@ New features
   IndexReader, to allow apps that maintain external per-segment caches
   to evict entries when a segment is finished.  (Shay Banon, Yonik
   Seeley, Mike McCandless)
-  
+
+* LUCENE-2911: The new StandardTokenizer, UAX29URLEmailTokenizer, and
+  the ICUTokenizer in contrib now all tag types with a consistent set
+  of token types (defined in StandardTokenizer). Tokens in the major
+  CJK types are explicitly marked to allow for custom downstream handling: 
+  <IDEOGRAPHIC>, <HANGUL>, <KATAKANA>, and <HIRAGANA>.  
+  (Robert Muir, Steven Rowe)
+
+* LUCENE-2913: Add missing getters to Numeric* classes. (Uwe Schindler)
+
 Optimizations
 
 * LUCENE-2494: Use CompletionService in ParallelMultiSearcher instead of

Modified: lucene/dev/branches/docvalues/lucene/MIGRATE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/MIGRATE.txt?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/MIGRATE.txt (original)
+++ lucene/dev/branches/docvalues/lucene/MIGRATE.txt Mon Feb 21 14:13:28 2011
@@ -332,8 +332,12 @@ LUCENE-1458, LUCENE-2111: Flexible Index
   toString(), port your customization over to reflectWith(). reflectAsString() would
   then return what toString() did before.
 
-* LUCENE-2236: DefaultSimilarity can no longer be set statically (and dangerously) for the entire JVM.
+* LUCENE-2236, LUCENE-2912: DefaultSimilarity can no longer be set statically 
+  (and dangerously) for the entire JVM.
   Instead, IndexWriterConfig and IndexSearcher now take a SimilarityProvider.
   Similarity can now be configured on a per-field basis.
   Similarity retains only the field-specific relevance methods such as tf() and idf().
+  Previously some (but not all) of these methods, such as computeNorm and scorePayload took 
+  field as a parameter, this is removed due to the fact the entire Similarity (all methods)
+  can now be configured per-field.
   Methods that apply to the entire query such as coord() and queryNorm() exist in SimilarityProvider.

Modified: lucene/dev/branches/docvalues/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/build.xml?rev=1072973&r1=1072972&r2=1072973&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/build.xml (original)
+++ lucene/dev/branches/docvalues/lucene/build.xml Mon Feb 21 14:13:28 2011
@@ -391,7 +391,8 @@
 
   <target name="dist-all" depends="dist, dist-src"/>
 
-  <target name="generate-maven-artifacts" depends="maven.ant.tasks-check, package, jar-src, jar-test-framework-src, javadocs">
+  <target name="generate-maven-artifacts"
+          depends="maven.ant.tasks-check, package, jar-src, jar-test-framework-src, javadocs">
     <sequential>
 	  <ant target="get-maven-poms" dir=".."/>
  
@@ -403,22 +404,35 @@
                   classifier="sources"/>
           <attach file="${build.dir}/${final.name}-javadoc.jar"
                   classifier="javadoc"/>
-          <attach file="${build.dir}/${final.name}-tests.jar"
-                  classifier="tests"/>
         </artifact-attachments>
       </m2-deploy>
 
-      <artifact:install-provider artifactId="wagon-ssh" version="1.0-beta-7"/>
-      <artifact:pom id="test-framework-pom" file="src/test-framework/pom.xml"/>
-      <artifact:deploy>
-        <attach file="${build.dir}/${final.name}-tests.jar" 
-                classifier="tests" />
+      <!--
+        For the purposes of the generated artifacts, change the <packaging>
+        in the test-framework POM from "jar" to "test-jar" - this allows
+        artifact:deploy to properly name the artifact.  The Maven build doesn't
+        have a lifecycle mapping for the "test-jar" packaging, though, so the
+        POM in src/test-framework/ is left with the "jar" packaging.
+      -->
+      <property name="test-jar-packaging-test-framework-pom"
+                location="${build.dir}/test-jar-packaging-test-framework,pom"/>
+      <copy file="src/test-framework/pom.xml"
+            tofile="${test-jar-packaging-test-framework-pom}">
+        <filterset begintoken="&lt;packaging&gt;" endtoken="&lt;/packaging&gt;">
+          <filter token="jar"
+                  value="&lt;packaging&gt;test-jar&lt;/packaging&gt;"/>
+        </filterset>
+      </copy>
+      <artifact:pom id="test-framework-pom"
+                    file="${test-jar-packaging-test-framework-pom}"/>
+      <artifact:deploy file="${build.dir}/${final.name}-tests.jar">
         <attach file="${build.dir}/${final.name}-tests-src.jar"
                 classifier="test-sources"/>
         <attach file="${build.dir}/${final.name}-tests-javadoc.jar"
                 classifier="test-javadoc"/>
         <remoteRepository url="${m2.repository.url}">
-          <authentication username="${m2.repository.username}" privateKey="${m2.repository.private.key}"/>
+          <authentication username="${m2.repository.username}"
+                          privateKey="${m2.repository.private.key}"/>
         </remoteRepository>
         <pom refid="test-framework-pom"/>
       </artifact:deploy>
@@ -483,9 +497,6 @@
       <fileset dir="contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser" includes="*.java">
         <containsregexp expression="Generated.*By.*JavaCC"/>
       </fileset>
-      <fileset dir="contrib/demo/src/java/org/apache/lucene/demo/html" includes="*.java">
-        <containsregexp expression="Generated.*By.*JavaCC"/>
-      </fileset>
     </delete>
   </target>