lucene-java-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From uschind...@apache.org
Subject svn commit: r928246 [1/6] - in /lucene/java/branches/flex_1458: ./ backwards/src/ backwards/src/java/org/apache/lucene/search/ backwards/src/test/org/apache/lucene/analysis/ backwards/src/test/org/apache/lucene/document/ backwards/src/test/org/apache/l...
Date Sat, 27 Mar 2010 19:12:13 GMT
Author: uschindler
Date: Sat Mar 27 19:12:08 2010
New Revision: 928246

URL: http://svn.apache.org/viewvc?rev=928246&view=rev
Log:
Merge upto trunk rev 928243

The following revision of Michael Busch was left out (I do not know how this affects flex): 926791 (buschmi, LUCENE-2329: Use parallel arrays instead of PostingList objects in TermsHash*)

Also I added a noncommit to the Directory.copyTo() method, as the IndexFileNameFilter now needs a Codec which is unknown to the directory. I replaced with Arrays.asList(listAll()), without filter, for now.

Added:
    lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/util/LuceneJUnitResultFormatter.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/util/LuceneJUnitResultFormatter.java
    lucene/java/branches/flex_1458/contrib/ant/src/resources/
      - copied from r928243, lucene/dev/trunk/lucene/contrib/ant/src/resources/
    lucene/java/branches/flex_1458/contrib/ant/src/resources/org/
      - copied from r928243, lucene/dev/trunk/lucene/contrib/ant/src/resources/org/
    lucene/java/branches/flex_1458/contrib/ant/src/resources/org/apache/
      - copied from r928243, lucene/dev/trunk/lucene/contrib/ant/src/resources/org/apache/
    lucene/java/branches/flex_1458/contrib/ant/src/resources/org/apache/lucene/
      - copied from r928243, lucene/dev/trunk/lucene/contrib/ant/src/resources/org/apache/lucene/
    lucene/java/branches/flex_1458/contrib/ant/src/resources/org/apache/lucene/ant/
      - copied from r928243, lucene/dev/trunk/lucene/contrib/ant/src/resources/org/apache/lucene/ant/
    lucene/java/branches/flex_1458/contrib/ant/src/resources/org/apache/lucene/ant/antlib.xml
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/ant/src/resources/org/apache/lucene/ant/antlib.xml
    lucene/java/branches/flex_1458/contrib/benchmark/conf/collector-small.alg
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/benchmark/conf/collector-small.alg
    lucene/java/branches/flex_1458/contrib/benchmark/conf/collector.alg
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/benchmark/conf/collector.alg
    lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchWithCollectorTask.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchWithCollectorTask.java
    lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/
      - copied from r928243, lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/
    lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java
    lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FastVectorHighlighter.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FastVectorHighlighter.java
    lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldFragList.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldFragList.java
    lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldPhraseList.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldPhraseList.java
    lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldQuery.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldQuery.java
    lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java
    lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FragListBuilder.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FragListBuilder.java
    lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FragmentsBuilder.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FragmentsBuilder.java
    lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/ScoreOrderFragmentsBuilder.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/ScoreOrderFragmentsBuilder.java
    lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilder.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilder.java
    lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilder.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilder.java
    lucene/java/branches/flex_1458/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/package.html
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/package.html
    lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/
      - copied from r928243, lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/
    lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java
    lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldPhraseListTest.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldPhraseListTest.java
    lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldQueryTest.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldQueryTest.java
    lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldTermStackTest.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldTermStackTest.java
    lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/IndexTimeSynonymTest.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/IndexTimeSynonymTest.java
    lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/ScoreOrderFragmentsBuilderTest.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/ScoreOrderFragmentsBuilderTest.java
    lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilderTest.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilderTest.java
    lucene/java/branches/flex_1458/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java
    lucene/java/branches/flex_1458/contrib/queries/lib/
      - copied from r928243, lucene/dev/trunk/lucene/contrib/queries/lib/
    lucene/java/branches/flex_1458/contrib/queries/lib/jakarta-regexp-1.4.jar
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queries/lib/jakarta-regexp-1.4.jar
    lucene/java/branches/flex_1458/contrib/queries/lib/regexp.LICENSE
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queries/lib/regexp.LICENSE
    lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/regex/
      - copied from r928243, lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/regex/
    lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/regex/JakartaRegexpCapabilities.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/regex/JakartaRegexpCapabilities.java
    lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/regex/JavaUtilRegexCapabilities.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/regex/JavaUtilRegexCapabilities.java
    lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/regex/RegexCapabilities.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/regex/RegexCapabilities.java
    lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/regex/RegexQuery.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/regex/RegexQuery.java
    lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/regex/RegexQueryCapable.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/regex/RegexQueryCapable.java
    lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/regex/RegexTermEnum.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/regex/RegexTermEnum.java
    lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/regex/SpanRegexQuery.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/regex/SpanRegexQuery.java
    lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/lucene/search/regex/package.html
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/regex/package.html
    lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/regexp/
      - copied from r928243, lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/regexp/
    lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/regexp/RegexpTunnel.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/regexp/RegexpTunnel.java
    lucene/java/branches/flex_1458/contrib/queries/src/java/org/apache/regexp/package.html
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/regexp/package.html
    lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/lucene/search/regex/
      - copied from r928243, lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/
    lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/lucene/search/regex/TestJakartaRegexpCapabilities.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestJakartaRegexpCapabilities.java
    lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/lucene/search/regex/TestRegexQuery.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestRegexQuery.java
    lucene/java/branches/flex_1458/contrib/queries/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java
    lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/
      - copied from r928243, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/
    lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java
    lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/package.html
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/package.html
    lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/complexPhrase/
      - copied from r928243, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/complexPhrase/
    lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/complexPhrase/ComplexPhraseQueryParser.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/complexPhrase/ComplexPhraseQueryParser.java
    lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/complexPhrase/package.html
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/complexPhrase/package.html
    lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/
      - copied from r928243, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/
    lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ExtendableQueryParser.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ExtendableQueryParser.java
    lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ExtensionQuery.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ExtensionQuery.java
    lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/Extensions.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/Extensions.java
    lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ParserExtension.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ParserExtension.java
    lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/package.html
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/package.html
    lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/
      - copied from r928243, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/
    lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/CharStream.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/CharStream.java
    lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/FastCharStream.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/FastCharStream.java
    lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/ParseException.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/ParseException.java
    lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.java
    lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.jj
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.jj
    lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParserConstants.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParserConstants.java
    lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParserTokenManager.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParserTokenManager.java
    lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/Token.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/Token.java
    lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/TokenMgrError.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/TokenMgrError.java
    lucene/java/branches/flex_1458/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/package.html
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/package.html
    lucene/java/branches/flex_1458/contrib/queryparser/src/test/org/apache/lucene/queryParser/analyzing/
      - copied from r928243, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/analyzing/
    lucene/java/branches/flex_1458/contrib/queryparser/src/test/org/apache/lucene/queryParser/analyzing/TestAnalyzingQueryParser.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/analyzing/TestAnalyzingQueryParser.java
    lucene/java/branches/flex_1458/contrib/queryparser/src/test/org/apache/lucene/queryParser/complexPhrase/
      - copied from r928243, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/complexPhrase/
    lucene/java/branches/flex_1458/contrib/queryparser/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java
    lucene/java/branches/flex_1458/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/
      - copied from r928243, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/
    lucene/java/branches/flex_1458/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/ExtensionStub.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/ExtensionStub.java
    lucene/java/branches/flex_1458/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/TestExtendableQueryParser.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/TestExtendableQueryParser.java
    lucene/java/branches/flex_1458/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/TestExtensions.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/TestExtensions.java
    lucene/java/branches/flex_1458/contrib/queryparser/src/test/org/apache/lucene/queryParser/precedence/
      - copied from r928243, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/precedence/
    lucene/java/branches/flex_1458/contrib/queryparser/src/test/org/apache/lucene/queryParser/precedence/TestPrecedenceQueryParser.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/precedence/TestPrecedenceQueryParser.java
    lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/NumericRangeFilterBuilder.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/NumericRangeFilterBuilder.java
    lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/NumericRangeQueryBuilder.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/NumericRangeQueryBuilder.java
    lucene/java/branches/flex_1458/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/NumericRangeFilterQuery.xml
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/NumericRangeFilterQuery.xml
    lucene/java/branches/flex_1458/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/NumericRangeQueryQuery.xml
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/NumericRangeQueryQuery.xml
    lucene/java/branches/flex_1458/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/builders/
      - copied from r928243, lucene/dev/trunk/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/builders/
    lucene/java/branches/flex_1458/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/builders/TestNumericRangeFilterBuilder.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/builders/TestNumericRangeFilterBuilder.java
    lucene/java/branches/flex_1458/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/builders/TestNumericRangeQueryBuilder.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/builders/TestNumericRangeQueryBuilder.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/util/IOUtils.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/IOUtils.java
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/LuceneJUnitResultFormatter.java
      - copied unchanged from r928243, lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/LuceneJUnitResultFormatter.java
Removed:
    lucene/java/branches/flex_1458/contrib/ant/src/java/org/apache/lucene/ant/antlib.xml
    lucene/java/branches/flex_1458/contrib/fast-vector-highlighter/
    lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/queryParser/analyzing/
    lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/queryParser/complexPhrase/
    lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/queryParser/ext/
    lucene/java/branches/flex_1458/contrib/misc/src/java/org/apache/lucene/queryParser/precedence/
    lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/queryParser/analyzing/
    lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/queryParser/complexPhrase/
    lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/queryParser/ext/
    lucene/java/branches/flex_1458/contrib/misc/src/test/org/apache/lucene/queryParser/precedence/
    lucene/java/branches/flex_1458/contrib/regex/
Modified:
    lucene/java/branches/flex_1458/   (props changed)
    lucene/java/branches/flex_1458/CHANGES.txt
    lucene/java/branches/flex_1458/backwards/src/   (props changed)
    lucene/java/branches/flex_1458/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java   (props changed)
    lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java   (props changed)
    lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/document/TestDateTools.java   (props changed)
    lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/document/TestNumberTools.java   (props changed)
    lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java   (props changed)
    lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/index/TestFieldsReader.java
    lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/index/TestIndexReaderCloneNorms.java
    lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/index/TestIndexReaderReopen.java
    lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/index/TestIndexWriterLockRelease.java
    lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/store/TestRAMDirectory.java
    lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java   (props changed)
    lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/util/_TestUtil.java
    lucene/java/branches/flex_1458/build.xml   (contents, props changed)
    lucene/java/branches/flex_1458/common-build.xml
    lucene/java/branches/flex_1458/contrib/   (props changed)
    lucene/java/branches/flex_1458/contrib/CHANGES.txt   (contents, props changed)
    lucene/java/branches/flex_1458/contrib/ant/build.xml
    lucene/java/branches/flex_1458/contrib/benchmark/CHANGES.txt
    lucene/java/branches/flex_1458/contrib/benchmark/build.xml
    lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java
    lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Config.java
    lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/apache/lucene/benchmark/BenchmarkTestCase.java
    lucene/java/branches/flex_1458/contrib/benchmark/src/test/org/apache/lucene/benchmark/quality/TestQualityRun.java
    lucene/java/branches/flex_1458/contrib/contrib-build.xml
    lucene/java/branches/flex_1458/contrib/highlighter/build.xml
    lucene/java/branches/flex_1458/contrib/highlighter/src/test/   (props changed)
    lucene/java/branches/flex_1458/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java   (props changed)
    lucene/java/branches/flex_1458/contrib/misc/build.xml
    lucene/java/branches/flex_1458/contrib/queries/README.txt
    lucene/java/branches/flex_1458/contrib/queries/build.xml
    lucene/java/branches/flex_1458/contrib/queries/pom.xml.template
    lucene/java/branches/flex_1458/contrib/queryparser/build.xml
    lucene/java/branches/flex_1458/contrib/spatial/build.xml
    lucene/java/branches/flex_1458/contrib/spellchecker/build.xml
    lucene/java/branches/flex_1458/contrib/xml-query-parser/LuceneCoreQuery.dtd
    lucene/java/branches/flex_1458/contrib/xml-query-parser/build.xml
    lucene/java/branches/flex_1458/contrib/xml-query-parser/docs/LuceneContribQuery.dtd.entities.html
    lucene/java/branches/flex_1458/contrib/xml-query-parser/docs/LuceneContribQuery.dtd.html
    lucene/java/branches/flex_1458/contrib/xml-query-parser/docs/LuceneCoreQuery.dtd.entities.html
    lucene/java/branches/flex_1458/contrib/xml-query-parser/docs/LuceneCoreQuery.dtd.html
    lucene/java/branches/flex_1458/contrib/xml-query-parser/docs/LuceneCoreQuery.dtd.org.html
    lucene/java/branches/flex_1458/contrib/xml-query-parser/docs/elementsIndex.html
    lucene/java/branches/flex_1458/contrib/xml-query-parser/docs/toc.html
    lucene/java/branches/flex_1458/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/CoreParser.java
    lucene/java/branches/flex_1458/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestParser.java
    lucene/java/branches/flex_1458/docs/contributions.html
    lucene/java/branches/flex_1458/docs/demo.html
    lucene/java/branches/flex_1458/docs/demo2.html
    lucene/java/branches/flex_1458/docs/demo3.html
    lucene/java/branches/flex_1458/docs/demo4.html
    lucene/java/branches/flex_1458/docs/fileformats.html
    lucene/java/branches/flex_1458/docs/gettingstarted.html
    lucene/java/branches/flex_1458/docs/index.html
    lucene/java/branches/flex_1458/docs/linkmap.html
    lucene/java/branches/flex_1458/docs/linkmap.pdf
    lucene/java/branches/flex_1458/docs/lucene-contrib/index.html
    lucene/java/branches/flex_1458/docs/lucene-contrib/index.pdf
    lucene/java/branches/flex_1458/docs/queryparsersyntax.html
    lucene/java/branches/flex_1458/docs/scoring.html
    lucene/java/branches/flex_1458/docs/systemrequirements.html
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/Tokenizer.java   (props changed)
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/index/IndexWriterConfig.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java   (props changed)
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/Directory.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/FSDirectory.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/MMapDirectory.java
    lucene/java/branches/flex_1458/src/java/org/apache/lucene/store/NIOFSDirectory.java
    lucene/java/branches/flex_1458/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml
    lucene/java/branches/flex_1458/src/site/src/documentation/content/xdocs/site.xml
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java   (props changed)
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/document/TestDateTools.java   (props changed)
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/document/TestNumberTools.java   (props changed)
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java   (contents, props changed)
    lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/TestAttributeSource.java   (props changed)

Propchange: lucene/java/branches/flex_1458/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 27 19:12:08 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene:926653
+/lucene/dev/trunk/lucene:926653,926948-928243
 /lucene/java/branches/lucene_2_4:748824
 /lucene/java/branches/lucene_2_9:817269-818600,829134,829881,831036,896850,909334
 /lucene/java/branches/lucene_2_9_back_compat_tests:818601-821336

Modified: lucene/java/branches/flex_1458/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/CHANGES.txt?rev=928246&r1=928245&r2=928246&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/CHANGES.txt (original)
+++ lucene/java/branches/flex_1458/CHANGES.txt Sat Mar 27 19:12:08 2010
@@ -254,6 +254,11 @@ New features
   convenient classes in case you want to disable segment merges by IndexWriter
   without tweaking a particular MergePolicy parameters, such as mergeFactor.
   MergeScheduler's methods are now public. (Shai Erera via Mike McCandless)
+
+* LUCENE-2339: Deprecate static method Directory.copy in favor of
+  Directory.copyTo, and use nio's FileChannel.transferTo when copying
+  files between FSDirectory instances.  (Earwin Burrfoot via Mike
+  McCandless).
   
 Optimizations
 

Propchange: lucene/java/branches/flex_1458/backwards/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 27 19:12:08 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src:926653
+/lucene/dev/trunk/lucene/backwards/src:926653,926948-928243
 /lucene/java/branches/lucene_2_4/src:748824
 /lucene/java/branches/lucene_2_9/src:817269-818600,825998,829134,829881,831036
 /lucene/java/branches/lucene_2_9_back_compat_tests/src:818601-821336

Propchange: lucene/java/branches/flex_1458/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 27 19:12:08 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:926653
+/lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:926653,926948-928243
 /lucene/java/branches/lucene_2_4/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:748824
 /lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:817269-818600,825998,829134,829881,831036
 /lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:818601-821336

Propchange: lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 27 19:12:08 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:926653
+/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:926653,926948-928243
 /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:748824
 /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:825998,829134,829881,831036
 /lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:880754,880793,880823,881216,881317,881376,881473,881549,881820,882467,882890,883076,883080,912383

Propchange: lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/document/TestDateTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 27 19:12:08 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/document/TestDateTools.java:926653
+/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/document/TestDateTools.java:926653,926948-928243
 /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestDateTools.java:748824
 /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestDateTools.java:825998,829134,829881,831036
 /lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/document/TestDateTools.java:880754,880793,880823,881216,881317,881376,881473,881549,881820,882467,882890,883076,883080,912383

Propchange: lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/document/TestNumberTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 27 19:12:08 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/document/TestNumberTools.java:926653
+/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/document/TestNumberTools.java:926653,926948-928243
 /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestNumberTools.java:748824
 /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestNumberTools.java:825998,829134,829881,831036
 /lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/document/TestNumberTools.java:880754,880793,880823,881216,881317,881376,881473,881549,881820,882467,882890,883076,883080,912383

Propchange: lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 27 19:12:08 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:926653
+/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:926653,926948-928243
 /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:748824
 /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:825998,829134,829881,831036
 /lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:880754,880793,880823,881216,881317,881376,881473,881549,881820,882467,882890,883076,883080,912383

Modified: lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/index/TestFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/index/TestFieldsReader.java?rev=928246&r1=928245&r2=928246&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/index/TestFieldsReader.java (original)
+++ lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/index/TestFieldsReader.java Sat Mar 27 19:12:08 2010
@@ -384,9 +384,9 @@ public class TestFieldsReader extends Lu
 
   // LUCENE-1262
   public void testExceptions() throws Throwable {
-    String tempDir = System.getProperty("java.io.tmpdir");
+    String tempDir = System.getProperty("tempDir", System.getProperty("java.io.tmpdir"));
     if (tempDir == null)
-      throw new IOException("java.io.tmpdir undefined, cannot run test");
+      throw new IOException("System property tempDir undefined, cannot run test");
     File indexDir = new File(tempDir, "testfieldswriterexceptions");
 
     try {

Modified: lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/index/TestIndexReaderCloneNorms.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/index/TestIndexReaderCloneNorms.java?rev=928246&r1=928245&r2=928246&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/index/TestIndexReaderCloneNorms.java (original)
+++ lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/index/TestIndexReaderCloneNorms.java Sat Mar 27 19:12:08 2010
@@ -81,10 +81,9 @@ public class TestIndexReaderCloneNorms e
    */
   public void testNorms() throws IOException {
     // tmp dir
-    String tempDir = System.getProperty("java.io.tmpdir");
-    if (tempDir == null) {
-      throw new IOException("java.io.tmpdir undefined, cannot run test");
-    }
+    String tempDir = System.getProperty("tempDir", System.getProperty("java.io.tmpdir"));
+    if (tempDir == null)
+      throw new IOException("System property tempDir undefined, cannot run test");
 
     // test with a single index: index1
     File indexDir1 = new File(tempDir, "lucenetestindex1");

Modified: lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/index/TestIndexReaderReopen.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/index/TestIndexReaderReopen.java?rev=928246&r1=928245&r2=928246&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/index/TestIndexReaderReopen.java (original)
+++ lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/index/TestIndexReaderReopen.java Sat Mar 27 19:12:08 2010
@@ -1095,9 +1095,9 @@ public class TestIndexReaderReopen exten
   @Override
   protected void setUp() throws Exception {
     super.setUp();
-    String tempDir = System.getProperty("java.io.tmpdir");
+    String tempDir = System.getProperty("tempDir", System.getProperty("java.io.tmpdir"));
     if (tempDir == null)
-      throw new IOException("java.io.tmpdir undefined, cannot run test");
+      throw new IOException("System property tempDir undefined, cannot run test");
     indexDir = new File(tempDir, "IndexReaderReopen");
   }
   

Modified: lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/index/TestIndexWriterLockRelease.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/index/TestIndexWriterLockRelease.java?rev=928246&r1=928245&r2=928246&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/index/TestIndexWriterLockRelease.java (original)
+++ lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/index/TestIndexWriterLockRelease.java Sat Mar 27 19:12:08 2010
@@ -39,8 +39,10 @@ public class TestIndexWriterLockRelease 
     public void setUp() throws Exception {
         super.setUp();
         if (this.__test_dir == null) {
-            String tmp_dir = System.getProperty("java.io.tmpdir", "tmp");
-            this.__test_dir = new File(tmp_dir, "testIndexWriter");
+            String tempDir = System.getProperty("tempDir", System.getProperty("java.io.tmpdir"));
+            if (tempDir == null)
+              throw new IOException("System property tempDir undefined, cannot run test");
+            this.__test_dir = new File(tempDir, "testIndexWriter");
 
             if (this.__test_dir.exists()) {
                 throw new IOException("test directory \"" + this.__test_dir.getPath() + "\" already exists (please remove by hand)");

Modified: lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/store/TestRAMDirectory.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/store/TestRAMDirectory.java?rev=928246&r1=928245&r2=928246&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/store/TestRAMDirectory.java (original)
+++ lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/store/TestRAMDirectory.java Sat Mar 27 19:12:08 2010
@@ -49,9 +49,9 @@ public class TestRAMDirectory extends Lu
   @Override
   public void setUp () throws Exception {
     super.setUp();
-    String tempDir = System.getProperty("java.io.tmpdir");
+    String tempDir = System.getProperty("tempDir", System.getProperty("java.io.tmpdir"));
     if (tempDir == null)
-      throw new IOException("java.io.tmpdir undefined, cannot run test");
+      throw new IOException("System property tempDir undefined, cannot run test");
     indexDir = new File(tempDir, "RAMDirIndex");
     
     Directory dir = FSDirectory.open(indexDir);

Propchange: lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 27 19:12:08 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java:926653
+/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java:926653,926948-928243
 /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/util/TestAttributeSource.java:748824
 /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/util/TestAttributeSource.java:817269-818600,825998,829134,829881,831036
 /lucene/java/branches/lucene_2_9_back_compat_tests/src/test/org/apache/lucene/util/TestAttributeSource.java:818601-821336

Modified: lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/util/_TestUtil.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/util/_TestUtil.java?rev=928246&r1=928245&r2=928246&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/util/_TestUtil.java (original)
+++ lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/util/_TestUtil.java Sat Mar 27 19:12:08 2010
@@ -33,9 +33,9 @@ public class _TestUtil {
   /** Returns temp dir, containing String arg in its name;
    *  does not create the directory. */
   public static File getTempDir(String desc) {
-    String tempDir = System.getProperty("java.io.tmpdir");
+    String tempDir = System.getProperty("tempDir", System.getProperty("java.io.tmpdir"));
     if (tempDir == null)
-      throw new RuntimeException("java.io.tmpdir undefined, cannot run test");
+      throw new RuntimeException("System property tempDir undefined, cannot run test");
     return new File(tempDir, desc + "." + new Random().nextLong());
   }
 

Modified: lucene/java/branches/flex_1458/build.xml
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/build.xml?rev=928246&r1=928245&r2=928246&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/build.xml (original)
+++ lucene/java/branches/flex_1458/build.xml Sat Mar 27 19:12:08 2010
@@ -102,7 +102,7 @@
 The source distribution does not contain sources of the previous Lucene Java version.</echo>
   </target>
 
-  <target name="test-backwards" depends="compile-core, jar-core, test-backwards-message"
+  <target name="compile-backwards" depends="compile-core, jar-core, test-backwards-message"
   	description="Runs tests of a previous Lucene version." if="backwards.available">
 	<sequential>
       <mkdir dir="${build.dir.backwards}"/>	  
@@ -119,15 +119,65 @@ The source distribution does not contain
       <!-- compile branch tests against branch classpath -->	
       <compile-test-macro srcdir="${backwards.dir}/src/test" destdir="${build.dir.backwards}/classes/test"
                   test.classpath="backwards.test.compile.classpath" javac.source="${javac.source.backwards}" javac.target="${javac.target.backwards}"/>
-		
-	  <!-- run branch tests against trunk jar -->
-      <test-macro dataDir="${backwards.dir}/src/test" 
-              tempDir="${build.dir.backwards}/test"
-      			  junit.classpath="backwards.junit.classpath"
-              junit.output.dir="${junit.output.dir.backwards}" />
+      
+
   	</sequential>
   </target>	
-	
+
+  <target name="test-backwards" depends="compile-backwards, junit-backwards-mkdir, junit-backwards-sequential, junit-backwards-parallel"/>
+
+  <target name="junit-backwards-mkdir">
+	<mkdir dir="${build.dir.backwards}/test"/>
+  </target>
+
+  <macrodef name="backwards-test-macro">
+  	<attribute name="pattern" default=""/>
+  	<sequential>
+  	  <!-- run branch tests against trunk jar -->
+      <test-macro 
+    	dataDir="${backwards.dir}/src/test" 
+    	tempDir="${build.dir.backwards}/test" 
+    	junit.classpath="backwards.junit.classpath" 
+    	junit.output.dir="${junit.output.dir.backwards}" 
+        pattern="@{pattern}" />
+  	</sequential>
+  </macrodef>
+
+  <target name="junit-backwards-sequential" if="runsequential">
+    <backwards-test-macro/>
+  </target>
+
+  <target name="junit-backwards-parallel" unless="runsequential">
+    <parallel threadsPerProcessor="2">
+     <backwards-test-macro pattern="A"/>
+     <backwards-test-macro pattern="B"/>
+     <backwards-test-macro pattern="C"/>
+     <backwards-test-macro pattern="D"/>
+     <backwards-test-macro pattern="E"/>
+     <backwards-test-macro pattern="F"/>
+     <backwards-test-macro pattern="G"/>
+     <backwards-test-macro pattern="H"/>
+     <backwards-test-macro pattern="I"/>
+     <backwards-test-macro pattern="J"/>
+     <backwards-test-macro pattern="K"/>
+     <backwards-test-macro pattern="L"/>
+     <backwards-test-macro pattern="M"/>
+     <backwards-test-macro pattern="N"/>
+     <backwards-test-macro pattern="O"/>
+     <backwards-test-macro pattern="P"/>
+     <backwards-test-macro pattern="Q"/>
+     <backwards-test-macro pattern="R"/>
+     <backwards-test-macro pattern="S"/>
+     <backwards-test-macro pattern="T"/>
+     <backwards-test-macro pattern="U"/>
+     <backwards-test-macro pattern="V"/>
+     <backwards-test-macro pattern="W"/>
+     <backwards-test-macro pattern="X"/>
+     <backwards-test-macro pattern="Y"/>
+     <backwards-test-macro pattern="Z"/>
+    </parallel>
+  </target>
+
   <!-- ================================================================== -->
   <!-- J A R                                                              -->
   <!-- ================================================================== -->
@@ -287,14 +337,12 @@ The source distribution does not contain
           <packageset dir="contrib/icu/src/java"/>
           <packageset dir="contrib/db/bdb-je/src/java"/>
           <packageset dir="contrib/db/bdb/src/java"/>
-          <packageset dir="contrib/fast-vector-highlighter/src/java"/>
           <packageset dir="contrib/highlighter/src/java"/>
           <packageset dir="contrib/instantiated/src/java"/>
           <packageset dir="contrib/lucli/src/java"/>
           <packageset dir="contrib/memory/src/java"/>
           <packageset dir="contrib/misc/src/java"/>
           <packageset dir="contrib/queries/src/java"/>
-          <packageset dir="contrib/regex/src/java"/>
           <packageset dir="contrib/remote/src/java"/>
           <packageset dir="contrib/spatial/src/java"/>
           <packageset dir="contrib/spellchecker/src/java"/>
@@ -319,15 +367,13 @@ The source distribution does not contain
           <group title="contrib: Benchmark" packages="org.apache.lucene.benchmark*"/>
           <group title="contrib: ICU" packages="org.apache.lucene.collation*"/>
           <group title="contrib: DB" packages="org.apache.lucene.store.db*:org.apache.lucene.store.je*:com.sleepycat*"/>
-          <group title="contrib: Fast Vector Highlighter" packages="org.apache.lucene.search.vectorhighlight*"/>
-          <group title="contrib: Highlighter" packages="org.apache.lucene.search.highlight*"/>
+          <group title="contrib: Highlighter" packages="org.apache.lucene.search.highlight:*org.apache.lucene.search.vectorhighlight*"/>
           <group title="contrib: Instantiated" packages="org.apache.lucene.store.instantiated*"/>
           <group title="contrib: Lucli" packages="lucli*"/>
           <group title="contrib: Memory" packages="org.apache.lucene.index.memory*"/>
-          <group title="contrib: Misc " packages="org.apache.lucene.misc*:org.apache.lucene.queryParser.analyzing*:org.apache.lucene.queryParser.precedence*"/>
-          <group title="contrib: Queries" packages="org.apache.lucene.search.similar*"/>
+          <group title="contrib: Misc " packages="org.apache.lucene.misc*"/>
+          <group title="contrib: Queries" packages="org.apache.lucene.search.similar*:org.apache.lucene.search.regex*:org.apache.regexp*"/>
           <group title="contrib: Query Parser" packages="org.apache.lucene.queryParser.*"/>
-          <group title="contrib: RegEx" packages="org.apache.lucene.search.regex*:org.apache.regexp*"/>
           <group title="contrib: Spatial" packages="org.apache.lucene.spatial*"/>
           <group title="contrib: SpellChecker" packages="org.apache.lucene.search.spell*"/>
           <group title="contrib: Surround Parser" packages="org.apache.lucene.queryParser.surround*"/>
@@ -709,6 +755,7 @@ The source distribution does not contain
     <attribute name="failonerror" default="true"/>
     <sequential>
       <subant target="@{target}" failonerror="@{failonerror}">
+        <property name="core.compiled" value="true"/>
         <fileset dir="."
                  includes="contrib/*/build.xml"
         />
@@ -716,30 +763,13 @@ The source distribution does not contain
     </sequential>
   </macrodef>
 
-  <target name="build-contrib"
+  <target name="build-contrib" depends="compile-test"
           description="Builds all contrib modules and their tests">
     <contrib-crawl target="build-artifacts-and-tests"/>
   </target>
 
   <target name="test-contrib" depends="build-contrib">
-    <!-- Don't fail on error, instead check for flag file so we run
-         all the tests possible and can "ant generate-test-reports"
-         for all of them.
-
-         Because of this, we depend on "build-contrib" even though the
-         Individual contrib "test" targets probably have the
-         neccessary dependencies.  If they fail to compile, we won't
-         know about it.
-     -->
-    <contrib-crawl target="test" failonerror="false"/>
-    <available property="contribs.failed" file="junitfailed.flag">
-      <filepath>
-        <dirset dir="${build.dir}/contrib/">
-          <include name="**/test/" />
-        </dirset>
-      </filepath>
-    </available>
-    <fail if="contribs.failed">Contrib tests failed!</fail>
+    <contrib-crawl target="test" failonerror="true"/>
   </target>
 
   <!-- Macro for building checksum files -->

Propchange: lucene/java/branches/flex_1458/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 27 19:12:08 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/build.xml:926653
+/lucene/dev/trunk/lucene/build.xml:926653,926948-928243
 /lucene/java/branches/lucene_2_9/build.xml:909334
 /lucene/java/trunk/build.xml:916596,916685,916755,916769,917019,917148,917154,917161,917203-917204,919060,919119,919718,919731,919869,920237-920499,922013,922277,922525,922528,922583,922593,922602,922624,922797,922799,922806,922886-922887,923112,923238,924151,924207,924286,924321-924731,924781,925176-925462
 /lucene/solr/branches/newtrunk/lucene/build.xml:926020-926289

Modified: lucene/java/branches/flex_1458/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/common-build.xml?rev=928246&r1=928245&r2=928246&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/common-build.xml (original)
+++ lucene/java/branches/flex_1458/common-build.xml Sat Mar 27 19:12:08 2010
@@ -99,8 +99,14 @@
   <property name="junit.output.dir.backwards" location="${build.dir.backwards}/test"/>
   <property name="junit.reports" location="${build.dir}/test/reports"/>
   <property name="junit.reports.backwards" location="${build.dir.backwards}/test/reports"/>
-  <property name="junit.includes" value="**/Test*.java,**/*Test.java"/>
   <property name="junit.excludes" value=""/>
+  <property name="junit.details.formatter" value="org.apache.lucene.util.LuceneJUnitResultFormatter"/>
+  <condition property="runsequential">
+    <or>
+      <isset property="testcase"/>
+      <isset property="sequential-tests"/>
+    </or>
+  </condition>
 
   <property name="manifest.file" location="${common.dir}/build/MANIFEST.MF"/>
 
@@ -392,9 +398,9 @@
   <macrodef name="test-macro" description="Executes junit tests.">
   	<attribute name="junit.output.dir" default="${junit.output.dir}"/>
   	<attribute name="junit.classpath" default="junit.classpath"/>
-  	<attribute name="dataDir"/>
-  	<attribute name="tempDir"/>
-  	<element name="contrib-settings" optional="yes"/>
+  	<attribute name="dataDir" default="src/test"/>
+  	<attribute name="tempDir" default="${build.dir}/test"/>
+  	<attribute name="pattern" default=""/>
 
     <sequential>
 	    <condition property="runall">
@@ -404,7 +410,10 @@
 	      	<isset property="testpackageroot" />
 	      </or></not>
 	    </condition>
-	  	<mkdir dir="@{junit.output.dir}"/>
+	    <!-- <mkdir dir="@{tempDir}/@{pattern}"/> 
+	    This is very loud and obnoxious. abuse touch instead for a "quiet" mkdir
+	    -->
+    	<touch file="@{tempDir}/@{pattern}/quiet.ant" verbose="false" mkdirs="true"/>
 	    <junit printsummary="off" haltonfailure="no" maxmemory="512M"
 	      errorProperty="tests.failed" failureProperty="tests.failed" forkmode="perBatch">
 	      <classpath refid="@{junit.classpath}"/>
@@ -418,56 +427,85 @@
 	      <sysproperty key="tests.verbose" value="${tests.verbose}"/>
 	
 	      <!-- TODO: create propertyset for test properties, so each project can have its own set -->
-	      <sysproperty key="tempDir" file="@{tempDir}"/>
-	      <sysproperty key="java.io.tmpdir" file="@{tempDir}"/>
+	      <sysproperty key="tempDir" file="@{tempDir}/@{pattern}"/>
+
 	      <sysproperty key="lucene.version" value="${dev.version}"/>
 	
-		  <contrib-settings />
+          <!-- set as a system property so contrib tests can have a fixed root
+               to reference file paths from, and "ant test" can work from
+               anywhere.
+          -->
+          <sysproperty key="lucene.common.dir" file="${common.dir}" />
+
+          <!-- contrib/ant IndexTaskTest needs these two system properties -->
+          <sysproperty key="docs.dir" file="src/test"/>
+          <sysproperty key="index.dir" file="${build.dir}/test/index"/>
+	    		
+          <!-- contrib/benchmark uses this system property to locate docs data and defined tasks -->
+          <sysproperty key="tasks.dir" file="${build.dir}/classes/java/org/apache/lucene/benchmark/byTask/tasks"/>
+          <sysproperty key="benchmark.work.dir" file="@{tempDir}/@{pattern}"/>
 	    	
 	      <formatter type="xml"/>
-	      <formatter type="brief" usefile="false"/>
+	      <formatter classname="${junit.details.formatter}" usefile="false"/>
 	      <batchtest fork="yes" todir="@{junit.output.dir}" if="runall">
-	        <fileset dir="@{dataDir}" includes="${junit.includes}" excludes="${junit.excludes}"/>
+	        <fileset dir="@{dataDir}" includes="**/Test@{pattern}*.java,**/@{pattern}*Test.java" excludes="${junit.excludes}"/>
 	      </batchtest>
 	      <batchtest fork="yes" todir="@{junit.output.dir}" if="testpackage">
-	        <fileset dir="@{dataDir}" includes="**/${testpackage}/**/Test*.java,**/${testpackage}/**/*Test.java" excludes="${junit.excludes}"/>
+	        <fileset dir="@{dataDir}" includes="**/${testpackage}/**/Test@{pattern}*.java,**/${testpackage}/**/@{pattern}*Test.java" excludes="${junit.excludes}"/>
 	      </batchtest>
 	      <batchtest fork="yes" todir="@{junit.output.dir}" if="testpackageroot">
-	        <fileset dir="@{dataDir}" includes="**/${testpackageroot}/Test*.java,**/${testpackageroot}/*Test.java" excludes="${junit.excludes}"/>
+	        <fileset dir="@{dataDir}" includes="**/${testpackageroot}/Test@{pattern}*.java,**/${testpackageroot}/@{pattern}*Test.java" excludes="${junit.excludes}"/>
 	      </batchtest>
 	      <batchtest fork="yes" todir="@{junit.output.dir}" if="testcase">
 	        <fileset dir="@{dataDir}" includes="**/${testcase}.java"/>
 	      </batchtest>
 	    </junit>
-	    <!-- create this file, then if we don't fail, delete it -->
-	    <!-- this meme makes it easy to tell if contribs have failed later -->
-	    <echo file="@{junit.output.dir}/junitfailed.flag">MAYBE</echo>
 	    <fail if="tests.failed">Tests failed!</fail>
-	    <!-- life would be easier if echo had an 'if' attribute like fail -->
-	    <delete file="@{junit.output.dir}/junitfailed.flag" />
   	</sequential>
   </macrodef>
 	
-  <target name="test" depends="compile-test" description="Runs unit tests">
-    <test-macro dataDir="src/test" tempDir="${build.dir}/test">
-    	<contrib-settings>
-	      <!-- set as a system property so contrib tests can have a fixed root
-	           to reference file paths from, and "ant test" can work from
-	           anywhere.
-	       -->
-	      <sysproperty key="lucene.common.dir" file="${common.dir}" />
-	      
-	      <!-- contrib/ant IndexTaskTest needs these two system properties -->
-	      <sysproperty key="docs.dir" file="src/test"/>
-	      <sysproperty key="index.dir" file="${build.dir}/test/index"/>
-	
-	      <!-- contrib/benchmark uses this system property to locate docs data and defined tasks -->
-	      <sysproperty key="tasks.dir" file="${build.dir}/classes/java/org/apache/lucene/benchmark/byTask/tasks"/>
-	      <sysproperty key="benchmark.work.dir" file="${common.dir}/contrib/benchmark/work"/>
-	  </contrib-settings>
-    </test-macro>
+  <target name="test" depends="compile-test,junit-mkdir,junit-sequential,junit-parallel" description="Runs unit tests"/>
+
+  <target name="junit-mkdir">
+  	<mkdir dir="${junit.output.dir}"/>
   </target>
 
+  <target name="junit-sequential" if="runsequential">
+    <test-macro/>
+  </target>
+
+  <target name="junit-parallel" unless="runsequential">
+    <parallel threadsPerProcessor="2">
+     <test-macro pattern="A"/>
+     <test-macro pattern="B"/>
+     <test-macro pattern="C"/>
+     <test-macro pattern="D"/>
+     <test-macro pattern="E"/>
+     <test-macro pattern="F"/>
+     <test-macro pattern="G"/>
+     <test-macro pattern="H"/>
+     <test-macro pattern="I"/>
+     <test-macro pattern="J"/>
+     <test-macro pattern="K"/>
+     <test-macro pattern="L"/>
+     <test-macro pattern="M"/>
+     <test-macro pattern="N"/>
+     <test-macro pattern="O"/>
+     <test-macro pattern="P"/>
+     <test-macro pattern="Q"/>
+     <test-macro pattern="R"/>
+     <test-macro pattern="S"/>
+     <test-macro pattern="T"/>
+     <test-macro pattern="U"/>
+     <test-macro pattern="V"/>
+     <test-macro pattern="W"/>
+     <test-macro pattern="X"/>
+     <test-macro pattern="Y"/>
+     <test-macro pattern="Z"/>
+    </parallel>
+  </target>
+
+
     <!--
      If you want clover test code coverage, run this before the tests.  You need clover.jar and the license in your ANT classspath and you need to specify -Drun.clover=true on the command line.
 

Propchange: lucene/java/branches/flex_1458/contrib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 27 19:12:08 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/contrib:926653
+/lucene/dev/trunk/lucene/contrib:926653,926948-928243
 /lucene/java/branches/lucene_2_4/contrib:748824
 /lucene/java/branches/lucene_2_9/contrib:817269-818600,825998,829134,829816,829881,831036,896850,909334
 /lucene/java/branches/lucene_2_9_back_compat_tests/contrib:818601-821336

Modified: lucene/java/branches/flex_1458/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/CHANGES.txt?rev=928246&r1=928245&r2=928246&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/CHANGES.txt (original)
+++ lucene/java/branches/flex_1458/contrib/CHANGES.txt Sat Mar 27 19:12:08 2010
@@ -74,6 +74,8 @@ API Changes
    (Robert Muir, Uwe Schindler, Simon Willnauer)
    
 New features
+ * LUCENE-2306: Add NumericRangeFilter and NumericRangeQuery support to XMLQueryParser.
+   (Jingkei Ly, via Mark Harwood)
 
  * LUCENE-2102: Add a Turkish LowerCase Filter. TurkishLowerCaseFilter handles
    Turkish and Azeri unique casing behavior correctly.
@@ -112,6 +114,15 @@ Build
  * LUCENE-2124: Moved the JDK-based collation support from contrib/collation 
    into core, and moved the ICU-based collation support into contrib/icu.  
    (Steven Rowe, Robert Muir)
+
+ * LUCENE-2323: Moved contrib/regex into contrib/queries. Moved the
+   queryparsers under contrib/misc into contrib/queryparser. Moved
+   contrib/fast-vector-highlighter into contrib/highlighter.  (Robert Muir)
+   
+ * LUCENE-2333: Fix failures during contrib builds, when classes in
+   core were changed without ant clean. This fix also optimizes the
+   dependency management between contribs by a new ANT macro.
+   (Uwe Schindler, Shai Erera)
    
 Optimizations
 

Propchange: lucene/java/branches/flex_1458/contrib/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 27 19:12:08 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/contrib/CHANGES.txt:926653
+/lucene/dev/trunk/lucene/contrib/CHANGES.txt:926653,926948-928243
 /lucene/java/branches/lucene_2_4/contrib/CHANGES.txt:748824
 /lucene/java/branches/lucene_2_9/contrib/CHANGES.txt:817269-818600,825998,826775,829134,829816,829881,831036,896850
 /lucene/java/branches/lucene_2_9_back_compat_tests/contrib/CHANGES.txt:818601-821336

Modified: lucene/java/branches/flex_1458/contrib/ant/build.xml
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/ant/build.xml?rev=928246&r1=928245&r2=928246&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/ant/build.xml (original)
+++ lucene/java/branches/flex_1458/contrib/ant/build.xml Sat Mar 27 19:12:08 2010
@@ -33,11 +33,5 @@
                refid="additional.dependencies"
   />
 
-  <target name="compile-core" depends="common.compile-core">
-    <copy todir="${build.dir}/classes/java">
-      <fileset dir="src/java" includes="**/*.xml"/>
-    </copy>
-  </target>
-
   <import file="../contrib-build.xml"/>
 </project>

Modified: lucene/java/branches/flex_1458/contrib/benchmark/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/benchmark/CHANGES.txt?rev=928246&r1=928245&r2=928246&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/benchmark/CHANGES.txt (original)
+++ lucene/java/branches/flex_1458/contrib/benchmark/CHANGES.txt Sat Mar 27 19:12:08 2010
@@ -2,7 +2,10 @@ Lucene Benchmark Contrib Change Log
 
 The Benchmark contrib package contains code for benchmarking Lucene in a variety of ways.
 
-2/21/2020
+3/24/2010
+  LUCENE-2343: Added support for benchmarking collectors. (Grant Ingersoll, Shai Erera)
+
+2/21/2010
   LUCENE-2254: Add support to the quality package for running
   experiments with any combination of Title, Description, and Narrative.
   (Robert Muir)

Modified: lucene/java/branches/flex_1458/contrib/benchmark/build.xml
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/benchmark/build.xml?rev=928246&r1=928245&r2=928246&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/benchmark/build.xml (original)
+++ lucene/java/branches/flex_1458/contrib/benchmark/build.xml Sat Mar 27 19:12:08 2010
@@ -8,6 +8,12 @@
     <import file="../contrib-build.xml"/>
     <property name="working.dir" location="work"/>
 
+    <contrib-uptodate name="highlighter" property="highlighter.uptodate" classpath.property="highlighter.jar"/>
+    <contrib-uptodate name="icu" property="icu.uptodate" classpath.property="icu.jar"/>
+    <!-- analyzers common needs a hack for the jar file: -->
+    <contrib-uptodate name="analyzers/common" jarfile="${common.dir}/build/contrib/analyzers/common/lucene-analyzers-${version}.jar"
+      property="analyzers-common.uptodate" classpath.property="analyzers-common.jar"/>
+    <contrib-uptodate name="memory" property="memory.uptodate" classpath.property="memory.jar"/>
 
     <target name="check-files">
         <available file="temp/news20.tar.gz" property="news20.exists"/>
@@ -126,12 +132,11 @@
     </target>
 
     <path id="classpath">
-        <pathelement path="${common.dir}/build/classes/java"/>
-        <pathelement path="${common.dir}/build/classes/demo"/>
-        <pathelement path="${common.dir}/build/contrib/highlighter/classes/java"/>
-        <pathelement path="${common.dir}/build/contrib/memory/classes/java"/>
-        <pathelement path="${common.dir}/build/contrib/fast-vector-highlighter/classes/java"/>
-        <pathelement path="${common.dir}/build/contrib/analyzers/common/classes/java"/>
+      <pathelement path="${memory.jar}"/>
+      <pathelement path="${highlighter.jar}"/>
+      <pathelement path="${analyzers-common.jar}"/>
+      <path refid="base.classpath"/>
+      <pathelement path="${common.dir}/build/classes/demo"/>
     	<fileset dir="lib">
     		<include name="**/*.jar"/>
     	</fileset>
@@ -173,8 +178,8 @@
 	
 	<path id="collation.runtime.classpath">
 	  <path refid="run.classpath"/>
-	  <pathelement path="${common.dir}/build/contrib/icu/classes/java"/>
-      <fileset dir="${common.dir}/contrib/icu/lib" includes="icu4j*.jar"/>
+    <pathelement path="${icu.jar}"/>
+    <fileset dir="${common.dir}/contrib/icu/lib" includes="icu4j*.jar"/>
 	</path>
 	
 	<target name="collation" depends="compile,compile-icu,top-100k-wiki-word-files">
@@ -203,7 +208,7 @@
       <path refid="run.classpath"/>
     </path>
 	
-    <target name="shingle" depends="compile,compile-analyzers-common,get-files">
+    <target name="shingle" depends="compile,get-files">
       <echo>Running contrib/benchmark with alg file: ${shingle.alg.file}</echo>
       <java fork="true" classname="org.apache.lucene.benchmark.byTask.Benchmark" 
             maxmemory="${task.mem}" output="${shingle.output.file}">
@@ -224,32 +229,27 @@
          <fileset dir="${common.dir}" includes="build.xml"/>
       </subant>
     </target>
-    <target name="compile-highlighter">
-      <subant target="compile">
+    <target name="compile-highlighter" unless="highlighter.uptodate">
+      <subant target="default">
          <fileset dir="${common.dir}/contrib/highlighter" includes="build.xml"/>
       </subant>
     </target>
-    <target name="compile-icu">
-      <subant target="compile">
+    <target name="compile-icu" unless="icu.uptodate">
+      <subant target="default">
          <fileset dir="${common.dir}/contrib/icu" includes="build.xml"/>
       </subant>
     </target>
-    <target name="compile-analyzers-common">
-      <subant target="compile">
+    <target name="compile-analyzers-common" unless="analyzers-common.uptodate">
+      <subant target="default">
         <fileset dir="${common.dir}/contrib/analyzers/common" includes="build.xml"/>
       </subant>
     </target>
-    <target name="compile-memory">
-      <subant target="compile">
+    <target name="compile-memory" unless="memory.uptodate">
+      <subant target="default">
          <fileset dir="${common.dir}/contrib/memory" includes="build.xml"/>
       </subant>
     </target>
-    <target name="compile-vector-highlighter">
-      <subant target="compile">
-         <fileset dir="${common.dir}/contrib/fast-vector-highlighter" includes="build.xml"/>
-      </subant>
-    </target>
 
-    <target name="init" depends="common.init,compile-demo,compile-memory,compile-highlighter,compile-vector-highlighter"/>
+    <target name="init" depends="common.init,compile-demo,compile-memory,compile-highlighter,compile-analyzers-common"/>
     
 </project>

Modified: lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java?rev=928246&r1=928245&r2=928246&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java (original)
+++ lucene/java/branches/flex_1458/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java Sat Mar 27 19:12:08 2010
@@ -30,10 +30,12 @@ import org.apache.lucene.benchmark.byTas
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Fieldable;
 import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.search.Collector;
 import org.apache.lucene.search.TopDocs;
 import org.apache.lucene.search.MultiTermQuery;
 import org.apache.lucene.search.TopFieldCollector;
 import org.apache.lucene.search.ScoreDoc;
+import org.apache.lucene.search.TopScoreDocCollector;
 import org.apache.lucene.search.Weight;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.Query;
@@ -105,23 +107,29 @@ public abstract class ReadTask extends P
       res++;
       Query q = queryMaker.makeQuery();
       Sort sort = getSort();
-      TopDocs hits;
+      TopDocs hits = null;
       final int numHits = numHits();
       if (numHits > 0) {
-        if (sort != null) {
-          Weight w = q.weight(searcher);
-          TopFieldCollector collector = TopFieldCollector.create(sort, numHits,
-                                                                 true, withScore(),
-                                                                 withMaxScore(),
-                                                                 !w.scoresDocsOutOfOrder());
-          searcher.search(w, null, collector);
-          hits = collector.topDocs();
+        if (withCollector() == false) {
+          if (sort != null) {
+            Weight w = q.weight(searcher);
+            TopFieldCollector collector = TopFieldCollector.create(sort, numHits,
+                                                                   true, withScore(),
+                                                                   withMaxScore(),
+                                                                   !w.scoresDocsOutOfOrder());
+            searcher.search(w, null, collector);
+            hits = collector.topDocs();
+          } else {
+            hits = searcher.search(q, numHits);
+          }
         } else {
-          hits = searcher.search(q, numHits);
+          Collector collector = createCollector();
+          searcher.search(q, null, collector);
+          //hits = collector.topDocs();
         }
 
         final String printHitsField = getRunData().getConfig().get("print.hits.field", null);
-        if (printHitsField != null && printHitsField.length() > 0) {
+        if (hits != null && printHitsField != null && printHitsField.length() > 0) {
           if (q instanceof MultiTermQuery) {
             System.out.println("MultiTermQuery term count = " + ((MultiTermQuery) q).getTotalNumberOfTerms());
           }
@@ -177,6 +185,9 @@ public abstract class ReadTask extends P
     return res;
   }
 
+  protected Collector createCollector() throws Exception {
+    return TopScoreDocCollector.create(numHits(), true);
+  }
 
 
   protected Document retrieveDoc(IndexReader ir, int id) throws IOException {
@@ -192,6 +203,10 @@ public abstract class ReadTask extends P
    * Return true if search should be performed.
    */
   public abstract boolean withSearch();
+
+  public boolean withCollector(){
+    return false;
+  }
   
 
   /**



Mime
View raw message