You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2011/05/09 15:19:39 UTC

svn commit: r1101016 [1/10] - in /lucene/dev/branches/bulkpostings: ./ dev-tools/ dev-tools/eclipse/ dev-tools/idea/.idea/libraries/ dev-tools/idea/solr/ dev-tools/maven/lucene/contrib/ant/ dev-tools/maven/lucene/contrib/db/bdb-je/ dev-tools/maven/luce...

Author: rmuir
Date: Mon May  9 13:19:28 2011
New Revision: 1101016

URL: http://svn.apache.org/viewvc?rev=1101016&view=rev
Log:
merge trunk (1081926:1088048)

Added:
    lucene/dev/branches/bulkpostings/common-build.xml
      - copied unchanged from r1088048, lucene/dev/trunk/common-build.xml
    lucene/dev/branches/bulkpostings/dev-tools/maven/solr/src/test-framework/
      - copied from r1088048, lucene/dev/trunk/dev-tools/maven/solr/src/test-framework/
    lucene/dev/branches/bulkpostings/dev-tools/maven/solr/src/test-framework/pom.xml.template
      - copied unchanged from r1088048, lucene/dev/trunk/dev-tools/maven/solr/src/test-framework/pom.xml.template
    lucene/dev/branches/bulkpostings/lucene/contrib/lucli/lib/jline-NOTICE.txt
      - copied unchanged from r1088048, lucene/dev/trunk/lucene/contrib/lucli/lib/jline-NOTICE.txt
    lucene/dev/branches/bulkpostings/lucene/lib/ant-junit-LICENSE-ASL.txt
      - copied unchanged from r1088048, lucene/dev/trunk/lucene/lib/ant-junit-LICENSE-ASL.txt
    lucene/dev/branches/bulkpostings/lucene/lib/junit-NOTICE.txt
      - copied unchanged from r1088048, lucene/dev/trunk/lucene/lib/junit-NOTICE.txt
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/DefaultSimilarityProvider.java
      - copied unchanged from r1088048, lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/DefaultSimilarityProvider.java
    lucene/dev/branches/bulkpostings/lucene/src/test-framework/overview.html
      - copied unchanged from r1088048, lucene/dev/trunk/lucene/src/test-framework/overview.html
    lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java
      - copied unchanged from r1088048, lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java
    lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/TestGlobalFieldNumbers.java
      - copied unchanged from r1088048, lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestGlobalFieldNumbers.java
    lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/util/automaton/TestSpecialOperations.java
      - copied unchanged from r1088048, lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/automaton/TestSpecialOperations.java
    lucene/dev/branches/bulkpostings/lucene/src/tools/
      - copied from r1088048, lucene/dev/trunk/lucene/src/tools/
    lucene/dev/branches/bulkpostings/lucene/src/tools/java/
      - copied from r1088048, lucene/dev/trunk/lucene/src/tools/java/
    lucene/dev/branches/bulkpostings/lucene/src/tools/java/org/
      - copied from r1088048, lucene/dev/trunk/lucene/src/tools/java/org/
    lucene/dev/branches/bulkpostings/lucene/src/tools/java/org/apache/
      - copied from r1088048, lucene/dev/trunk/lucene/src/tools/java/org/apache/
    lucene/dev/branches/bulkpostings/lucene/src/tools/java/org/apache/lucene/
      - copied from r1088048, lucene/dev/trunk/lucene/src/tools/java/org/apache/lucene/
    lucene/dev/branches/bulkpostings/lucene/src/tools/java/org/apache/lucene/validation/
      - copied from r1088048, lucene/dev/trunk/lucene/src/tools/java/org/apache/lucene/validation/
    lucene/dev/branches/bulkpostings/lucene/src/tools/java/org/apache/lucene/validation/DependencyChecker.java
      - copied unchanged from r1088048, lucene/dev/trunk/lucene/src/tools/java/org/apache/lucene/validation/DependencyChecker.java
    lucene/dev/branches/bulkpostings/lucene/src/tools/java/org/apache/lucene/validation/LicenseType.java
      - copied unchanged from r1088048, lucene/dev/trunk/lucene/src/tools/java/org/apache/lucene/validation/LicenseType.java
    lucene/dev/branches/bulkpostings/lucene/src/tools/prettify/
      - copied from r1088048, lucene/dev/trunk/lucene/src/tools/prettify/
    lucene/dev/branches/bulkpostings/lucene/src/tools/prettify/lang-apollo.js
      - copied unchanged from r1088048, lucene/dev/trunk/lucene/src/tools/prettify/lang-apollo.js
    lucene/dev/branches/bulkpostings/lucene/src/tools/prettify/lang-css.js
      - copied unchanged from r1088048, lucene/dev/trunk/lucene/src/tools/prettify/lang-css.js
    lucene/dev/branches/bulkpostings/lucene/src/tools/prettify/lang-hs.js
      - copied unchanged from r1088048, lucene/dev/trunk/lucene/src/tools/prettify/lang-hs.js
    lucene/dev/branches/bulkpostings/lucene/src/tools/prettify/lang-lisp.js
      - copied unchanged from r1088048, lucene/dev/trunk/lucene/src/tools/prettify/lang-lisp.js
    lucene/dev/branches/bulkpostings/lucene/src/tools/prettify/lang-lua.js
      - copied unchanged from r1088048, lucene/dev/trunk/lucene/src/tools/prettify/lang-lua.js
    lucene/dev/branches/bulkpostings/lucene/src/tools/prettify/lang-ml.js
      - copied unchanged from r1088048, lucene/dev/trunk/lucene/src/tools/prettify/lang-ml.js
    lucene/dev/branches/bulkpostings/lucene/src/tools/prettify/lang-proto.js
      - copied unchanged from r1088048, lucene/dev/trunk/lucene/src/tools/prettify/lang-proto.js
    lucene/dev/branches/bulkpostings/lucene/src/tools/prettify/lang-sql.js
      - copied unchanged from r1088048, lucene/dev/trunk/lucene/src/tools/prettify/lang-sql.js
    lucene/dev/branches/bulkpostings/lucene/src/tools/prettify/lang-vb.js
      - copied unchanged from r1088048, lucene/dev/trunk/lucene/src/tools/prettify/lang-vb.js
    lucene/dev/branches/bulkpostings/lucene/src/tools/prettify/lang-wiki.js
      - copied unchanged from r1088048, lucene/dev/trunk/lucene/src/tools/prettify/lang-wiki.js
    lucene/dev/branches/bulkpostings/lucene/src/tools/prettify/prettify.css
      - copied unchanged from r1088048, lucene/dev/trunk/lucene/src/tools/prettify/prettify.css
    lucene/dev/branches/bulkpostings/lucene/src/tools/prettify/prettify.js
      - copied unchanged from r1088048, lucene/dev/trunk/lucene/src/tools/prettify/prettify.js
    lucene/dev/branches/bulkpostings/lucene/src/tools/prettify/stylesheet+prettify.css
      - copied unchanged from r1088048, lucene/dev/trunk/lucene/src/tools/prettify/stylesheet+prettify.css
    lucene/dev/branches/bulkpostings/modules/analysis/icu/lib/icu4j-NOTICE.txt
      - copied unchanged from r1088048, lucene/dev/trunk/modules/analysis/icu/lib/icu4j-NOTICE.txt
    lucene/dev/branches/bulkpostings/modules/benchmark/lib/commons-compress-1.1.jar
      - copied unchanged from r1088048, lucene/dev/trunk/modules/benchmark/lib/commons-compress-1.1.jar
    lucene/dev/branches/bulkpostings/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/StreamUtils.java
      - copied unchanged from r1088048, lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/StreamUtils.java
    lucene/dev/branches/bulkpostings/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/alt/
      - copied from r1088048, lucene/dev/trunk/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/alt/
    lucene/dev/branches/bulkpostings/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/alt/AltPackageTaskTest.java
      - copied unchanged from r1088048, lucene/dev/trunk/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/alt/AltPackageTaskTest.java
    lucene/dev/branches/bulkpostings/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/alt/AltTestTask.java
      - copied unchanged from r1088048, lucene/dev/trunk/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/alt/AltTestTask.java
    lucene/dev/branches/bulkpostings/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/utils/StreamUtilsTest.java
      - copied unchanged from r1088048, lucene/dev/trunk/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/utils/StreamUtilsTest.java
    lucene/dev/branches/bulkpostings/solr/client/README.txt
      - copied unchanged from r1088048, lucene/dev/trunk/solr/client/README.txt
    lucene/dev/branches/bulkpostings/solr/contrib/analysis-extras/lib/icu4j-NOTICE.txt
      - copied unchanged from r1088048, lucene/dev/trunk/solr/contrib/analysis-extras/lib/icu4j-NOTICE.txt
    lucene/dev/branches/bulkpostings/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/
      - copied from r1088048, lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/
    lucene/dev/branches/bulkpostings/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java
      - copied unchanged from r1088048, lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java
    lucene/dev/branches/bulkpostings/solr/contrib/analysis-extras/src/test-files/solr-analysis-extras/
      - copied from r1088048, lucene/dev/trunk/solr/contrib/analysis-extras/src/test-files/solr-analysis-extras/
    lucene/dev/branches/bulkpostings/solr/contrib/analysis-extras/src/test-files/solr-analysis-extras/conf/
      - copied from r1088048, lucene/dev/trunk/solr/contrib/analysis-extras/src/test-files/solr-analysis-extras/conf/
    lucene/dev/branches/bulkpostings/solr/contrib/analysis-extras/src/test-files/solr-analysis-extras/conf/schema-icucollate.xml
      - copied unchanged from r1088048, lucene/dev/trunk/solr/contrib/analysis-extras/src/test-files/solr-analysis-extras/conf/schema-icucollate.xml
    lucene/dev/branches/bulkpostings/solr/contrib/analysis-extras/src/test-files/solr-analysis-extras/conf/solrconfig-icucollate.xml
      - copied unchanged from r1088048, lucene/dev/trunk/solr/contrib/analysis-extras/src/test-files/solr-analysis-extras/conf/solrconfig-icucollate.xml
    lucene/dev/branches/bulkpostings/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/
      - copied from r1088048, lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/
    lucene/dev/branches/bulkpostings/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java
      - copied unchanged from r1088048, lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java
    lucene/dev/branches/bulkpostings/solr/contrib/clustering/lib/carrot2-core-NOTICE.txt
      - copied unchanged from r1088048, lucene/dev/trunk/solr/contrib/clustering/lib/carrot2-core-NOTICE.txt
    lucene/dev/branches/bulkpostings/solr/contrib/extraction/lib/asm-NOTICE.txt
      - copied unchanged from r1088048, lucene/dev/trunk/solr/contrib/extraction/lib/asm-NOTICE.txt
    lucene/dev/branches/bulkpostings/solr/contrib/extraction/lib/bcmail-NOTICE.txt
      - copied unchanged from r1088048, lucene/dev/trunk/solr/contrib/extraction/lib/bcmail-NOTICE.txt
    lucene/dev/branches/bulkpostings/solr/contrib/extraction/lib/bcprov-NOTICE.txt
      - copied unchanged from r1088048, lucene/dev/trunk/solr/contrib/extraction/lib/bcprov-NOTICE.txt
    lucene/dev/branches/bulkpostings/solr/contrib/extraction/lib/dom4j-NOTICE.txt
      - copied unchanged from r1088048, lucene/dev/trunk/solr/contrib/extraction/lib/dom4j-NOTICE.txt
    lucene/dev/branches/bulkpostings/solr/contrib/extraction/lib/icu4j-NOTICE.txt
      - copied unchanged from r1088048, lucene/dev/trunk/solr/contrib/extraction/lib/icu4j-NOTICE.txt
    lucene/dev/branches/bulkpostings/solr/contrib/extraction/lib/rome-NOTICE.txt
      - copied unchanged from r1088048, lucene/dev/trunk/solr/contrib/extraction/lib/rome-NOTICE.txt
    lucene/dev/branches/bulkpostings/solr/contrib/extraction/lib/tagsoup-NOTICE.txt
      - copied unchanged from r1088048, lucene/dev/trunk/solr/contrib/extraction/lib/tagsoup-NOTICE.txt
    lucene/dev/branches/bulkpostings/solr/contrib/uima/lib/uimaj-core-LICENSE-ASL.txt
      - copied unchanged from r1088048, lucene/dev/trunk/solr/contrib/uima/lib/uimaj-core-LICENSE-ASL.txt
    lucene/dev/branches/bulkpostings/solr/contrib/uima/lib/uimaj-core-NOTICE.txt
      - copied unchanged from r1088048, lucene/dev/trunk/solr/contrib/uima/lib/uimaj-core-NOTICE.txt
    lucene/dev/branches/bulkpostings/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/an/
      - copied from r1088048, lucene/dev/trunk/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/an/
    lucene/dev/branches/bulkpostings/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/an/DummyEntityAnnotator.java
      - copied unchanged from r1088048, lucene/dev/trunk/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/an/DummyEntityAnnotator.java
    lucene/dev/branches/bulkpostings/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/an/DummySentimentAnnotator.java
      - copied unchanged from r1088048, lucene/dev/trunk/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/an/DummySentimentAnnotator.java
    lucene/dev/branches/bulkpostings/solr/contrib/uima/src/test/java/org/apache/solr/uima/ts/
      - copied from r1088048, lucene/dev/trunk/solr/contrib/uima/src/test/java/org/apache/solr/uima/ts/
    lucene/dev/branches/bulkpostings/solr/contrib/uima/src/test/java/org/apache/solr/uima/ts/EntityAnnotation.java
      - copied unchanged from r1088048, lucene/dev/trunk/solr/contrib/uima/src/test/java/org/apache/solr/uima/ts/EntityAnnotation.java
    lucene/dev/branches/bulkpostings/solr/contrib/uima/src/test/java/org/apache/solr/uima/ts/EntityAnnotation_Type.java
      - copied unchanged from r1088048, lucene/dev/trunk/solr/contrib/uima/src/test/java/org/apache/solr/uima/ts/EntityAnnotation_Type.java
    lucene/dev/branches/bulkpostings/solr/contrib/uima/src/test/java/org/apache/solr/uima/ts/SentimentAnnotation.java
      - copied unchanged from r1088048, lucene/dev/trunk/solr/contrib/uima/src/test/java/org/apache/solr/uima/ts/SentimentAnnotation.java
    lucene/dev/branches/bulkpostings/solr/contrib/uima/src/test/java/org/apache/solr/uima/ts/SentimentAnnotation_Type.java
      - copied unchanged from r1088048, lucene/dev/trunk/solr/contrib/uima/src/test/java/org/apache/solr/uima/ts/SentimentAnnotation_Type.java
    lucene/dev/branches/bulkpostings/solr/contrib/uima/src/test/resources/DummyEntityAEDescriptor.xml
      - copied unchanged from r1088048, lucene/dev/trunk/solr/contrib/uima/src/test/resources/DummyEntityAEDescriptor.xml
    lucene/dev/branches/bulkpostings/solr/contrib/uima/src/test/resources/DummySentimentAnalysisAEDescriptor.xml
      - copied unchanged from r1088048, lucene/dev/trunk/solr/contrib/uima/src/test/resources/DummySentimentAnalysisAEDescriptor.xml
    lucene/dev/branches/bulkpostings/solr/example/example-DIH/solr/db/lib/hsqldb-NOTICE.txt
      - copied unchanged from r1088048, lucene/dev/trunk/solr/example/example-DIH/solr/db/lib/hsqldb-NOTICE.txt
    lucene/dev/branches/bulkpostings/solr/lib/apache-solr-noggit-NOTICE.txt
      - copied unchanged from r1088048, lucene/dev/trunk/solr/lib/apache-solr-noggit-NOTICE.txt
    lucene/dev/branches/bulkpostings/solr/lib/guava-NOTICE.txt
      - copied unchanged from r1088048, lucene/dev/trunk/solr/lib/guava-NOTICE.txt
    lucene/dev/branches/bulkpostings/solr/lib/jcl-over-slf4j-NOTICE.txt
      - copied unchanged from r1088048, lucene/dev/trunk/solr/lib/jcl-over-slf4j-NOTICE.txt
    lucene/dev/branches/bulkpostings/solr/lib/junit-NOTICE.txt
      - copied unchanged from r1088048, lucene/dev/trunk/solr/lib/junit-NOTICE.txt
    lucene/dev/branches/bulkpostings/solr/lib/log4j-over-slf4j-NOTICE.txt
      - copied unchanged from r1088048, lucene/dev/trunk/solr/lib/log4j-over-slf4j-NOTICE.txt
    lucene/dev/branches/bulkpostings/solr/lib/servlet-api-LICENSE-ASL.txt
      - copied unchanged from r1088048, lucene/dev/trunk/solr/lib/servlet-api-LICENSE-ASL.txt
    lucene/dev/branches/bulkpostings/solr/lib/servlet-api-NOTICE.txt
      - copied unchanged from r1088048, lucene/dev/trunk/solr/lib/servlet-api-NOTICE.txt
    lucene/dev/branches/bulkpostings/solr/lib/slf4j-NOTICE.txt
      - copied unchanged from r1088048, lucene/dev/trunk/solr/lib/slf4j-NOTICE.txt
    lucene/dev/branches/bulkpostings/solr/lib/slf4j-api-NOTICE.txt
      - copied unchanged from r1088048, lucene/dev/trunk/solr/lib/slf4j-api-NOTICE.txt
    lucene/dev/branches/bulkpostings/solr/lib/zookeeper-NOTICE.txt
      - copied unchanged from r1088048, lucene/dev/trunk/solr/lib/zookeeper-NOTICE.txt
    lucene/dev/branches/bulkpostings/solr/site/skin/images/apache-thanks.png
      - copied unchanged from r1088048, lucene/dev/trunk/solr/site/skin/images/apache-thanks.png
    lucene/dev/branches/bulkpostings/solr/site/skin/images/built-with-cocoon.gif
      - copied unchanged from r1088048, lucene/dev/trunk/solr/site/skin/images/built-with-cocoon.gif
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/response/ResultContext.java
      - copied unchanged from r1088048, lucene/dev/trunk/solr/src/java/org/apache/solr/response/ResultContext.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/response/transform/
      - copied from r1088048, lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/response/transform/DocIdAugmenterFactory.java
      - copied unchanged from r1088048, lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/DocIdAugmenterFactory.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/response/transform/DocTransformer.java
      - copied unchanged from r1088048, lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/DocTransformer.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/response/transform/DocTransformers.java
      - copied unchanged from r1088048, lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/DocTransformers.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/response/transform/ExplainAugmenterFactory.java
      - copied unchanged from r1088048, lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/ExplainAugmenterFactory.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/response/transform/RenameFieldsTransformer.java
      - copied unchanged from r1088048, lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/RenameFieldsTransformer.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/response/transform/ScoreAugmenter.java
      - copied unchanged from r1088048, lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/ScoreAugmenter.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/response/transform/ShardAugmenterFactory.java
      - copied unchanged from r1088048, lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/ShardAugmenterFactory.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/response/transform/TransformContext.java
      - copied unchanged from r1088048, lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/TransformContext.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/response/transform/TransformerFactory.java
      - copied unchanged from r1088048, lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/TransformerFactory.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/response/transform/TransformerWithContext.java
      - copied unchanged from r1088048, lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/TransformerWithContext.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/response/transform/ValueAugmenterFactory.java
      - copied unchanged from r1088048, lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/ValueAugmenterFactory.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/response/transform/ValueSourceAugmenter.java
      - copied unchanged from r1088048, lucene/dev/trunk/solr/src/java/org/apache/solr/response/transform/ValueSourceAugmenter.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/CollationField.java
      - copied unchanged from r1088048, lucene/dev/trunk/solr/src/java/org/apache/solr/schema/CollationField.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/SimilarityProviderFactory.java
      - copied unchanged from r1088048, lucene/dev/trunk/solr/src/java/org/apache/solr/schema/SimilarityProviderFactory.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/TrieFieldHelper.java
      - copied unchanged from r1088048, lucene/dev/trunk/solr/src/java/org/apache/solr/schema/TrieFieldHelper.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/ReturnFields.java
      - copied unchanged from r1088048, lucene/dev/trunk/solr/src/java/org/apache/solr/search/ReturnFields.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/SolrSimilarityProvider.java
      - copied unchanged from r1088048, lucene/dev/trunk/solr/src/java/org/apache/solr/search/SolrSimilarityProvider.java
    lucene/dev/branches/bulkpostings/solr/src/test-files/solr/conf/schema-collate.xml
      - copied unchanged from r1088048, lucene/dev/trunk/solr/src/test-files/solr/conf/schema-collate.xml
    lucene/dev/branches/bulkpostings/solr/src/test-files/solr/conf/solrconfig-collate.xml
      - copied unchanged from r1088048, lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-collate.xml
    lucene/dev/branches/bulkpostings/solr/src/test-framework/   (props changed)
      - copied from r1088048, lucene/dev/trunk/solr/src/test-framework/
    lucene/dev/branches/bulkpostings/solr/src/test-framework/org/
      - copied from r1088048, lucene/dev/trunk/solr/src/test-framework/org/
    lucene/dev/branches/bulkpostings/solr/src/test-framework/org/apache/
      - copied from r1088048, lucene/dev/trunk/solr/src/test-framework/org/apache/
    lucene/dev/branches/bulkpostings/solr/src/test-framework/org/apache/solr/
      - copied from r1088048, lucene/dev/trunk/solr/src/test-framework/org/apache/solr/
    lucene/dev/branches/bulkpostings/solr/src/test-framework/org/apache/solr/BaseDistributedSearchTestCase.java
      - copied unchanged from r1088048, lucene/dev/trunk/solr/src/test-framework/org/apache/solr/BaseDistributedSearchTestCase.java
    lucene/dev/branches/bulkpostings/solr/src/test-framework/org/apache/solr/JSONTestUtil.java
      - copied unchanged from r1088048, lucene/dev/trunk/solr/src/test-framework/org/apache/solr/JSONTestUtil.java
    lucene/dev/branches/bulkpostings/solr/src/test-framework/org/apache/solr/SolrTestCaseJ4.java
      - copied unchanged from r1088048, lucene/dev/trunk/solr/src/test-framework/org/apache/solr/SolrTestCaseJ4.java
    lucene/dev/branches/bulkpostings/solr/src/test-framework/org/apache/solr/analysis/
      - copied from r1088048, lucene/dev/trunk/solr/src/test-framework/org/apache/solr/analysis/
    lucene/dev/branches/bulkpostings/solr/src/test-framework/org/apache/solr/analysis/BaseTokenTestCase.java
      - copied unchanged from r1088048, lucene/dev/trunk/solr/src/test-framework/org/apache/solr/analysis/BaseTokenTestCase.java
    lucene/dev/branches/bulkpostings/solr/src/test-framework/org/apache/solr/util/
      - copied from r1088048, lucene/dev/trunk/solr/src/test-framework/org/apache/solr/util/
    lucene/dev/branches/bulkpostings/solr/src/test-framework/org/apache/solr/util/AbstractSolrTestCase.java
      - copied unchanged from r1088048, lucene/dev/trunk/solr/src/test-framework/org/apache/solr/util/AbstractSolrTestCase.java
    lucene/dev/branches/bulkpostings/solr/src/test-framework/org/apache/solr/util/TestHarness.java
      - copied unchanged from r1088048, lucene/dev/trunk/solr/src/test-framework/org/apache/solr/util/TestHarness.java
    lucene/dev/branches/bulkpostings/solr/src/test/org/apache/solr/schema/CustomSimilarityProviderFactory.java
      - copied unchanged from r1088048, lucene/dev/trunk/solr/src/test/org/apache/solr/schema/CustomSimilarityProviderFactory.java
    lucene/dev/branches/bulkpostings/solr/src/test/org/apache/solr/schema/MockConfigurableSimilarityProvider.java
      - copied unchanged from r1088048, lucene/dev/trunk/solr/src/test/org/apache/solr/schema/MockConfigurableSimilarityProvider.java
    lucene/dev/branches/bulkpostings/solr/src/test/org/apache/solr/schema/TestCollationField.java
      - copied unchanged from r1088048, lucene/dev/trunk/solr/src/test/org/apache/solr/schema/TestCollationField.java
    lucene/dev/branches/bulkpostings/solr/src/test/org/apache/solr/schema/TestPerFieldSimilarity.java
      - copied unchanged from r1088048, lucene/dev/trunk/solr/src/test/org/apache/solr/schema/TestPerFieldSimilarity.java
    lucene/dev/branches/bulkpostings/solr/src/test/org/apache/solr/util/ExternalPaths.java
      - copied unchanged from r1088048, lucene/dev/trunk/solr/src/test/org/apache/solr/util/ExternalPaths.java
Removed:
    lucene/dev/branches/bulkpostings/dev-tools/prettify/
    lucene/dev/branches/bulkpostings/lucene/.cvsignore
    lucene/dev/branches/bulkpostings/lucene/contrib/highlighter/.cvsignore
    lucene/dev/branches/bulkpostings/lucene/lib/ant-junit-LICENSE.txt
    lucene/dev/branches/bulkpostings/modules/benchmark/lib/commons-compress-1.0.jar
    lucene/dev/branches/bulkpostings/modules/benchmark/lib/xml-apis-LICENSE-ASL.txt
    lucene/dev/branches/bulkpostings/modules/benchmark/lib/xml-apis-NOTICE.txt
    lucene/dev/branches/bulkpostings/solr/client/javascript/
    lucene/dev/branches/bulkpostings/solr/client/python/
    lucene/dev/branches/bulkpostings/solr/contrib/analysis-extras/src/test-files/empty
    lucene/dev/branches/bulkpostings/solr/contrib/uima/lib/uima-core-LICENSE-ASL.txt
    lucene/dev/branches/bulkpostings/solr/contrib/uima/lib/uima-core-NOTICE.txt
    lucene/dev/branches/bulkpostings/solr/contrib/uima/src/test/resources/OpenCalaisAnnotator.xml
    lucene/dev/branches/bulkpostings/solr/contrib/uima/src/test/resources/TextCategorizationAEDescriptor.xml
    lucene/dev/branches/bulkpostings/solr/lib/servlet-api-LICENSE-SUN.txt
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/util/TestHarness.java
    lucene/dev/branches/bulkpostings/solr/src/test/org/apache/solr/BaseDistributedSearchTestCase.java
    lucene/dev/branches/bulkpostings/solr/src/test/org/apache/solr/JSONTestUtil.java
    lucene/dev/branches/bulkpostings/solr/src/test/org/apache/solr/SolrTestCaseJ4.java
    lucene/dev/branches/bulkpostings/solr/src/test/org/apache/solr/analysis/BaseTokenTestCase.java
    lucene/dev/branches/bulkpostings/solr/src/test/org/apache/solr/util/AbstractSolrTestCase.java
Modified:
    lucene/dev/branches/bulkpostings/   (props changed)
    lucene/dev/branches/bulkpostings/build.xml
    lucene/dev/branches/bulkpostings/dev-tools/   (props changed)
    lucene/dev/branches/bulkpostings/dev-tools/eclipse/dot.classpath
    lucene/dev/branches/bulkpostings/dev-tools/idea/.idea/libraries/Servlet_API_2_4.xml
    lucene/dev/branches/bulkpostings/dev-tools/idea/solr/solr.iml
    lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/ant/pom.xml.template
    lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/db/bdb-je/pom.xml.template
    lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/db/bdb/pom.xml.template
    lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/demo/pom.xml.template
    lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template
    lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/instantiated/pom.xml.template
    lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/lucli/pom.xml.template
    lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/memory/pom.xml.template
    lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/misc/pom.xml.template
    lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/queries/pom.xml.template
    lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/queryparser/pom.xml.template
    lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/spatial/pom.xml.template
    lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/spellchecker/pom.xml.template
    lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/swing/pom.xml.template
    lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/wordnet/pom.xml.template
    lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml.template
    lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/src/test-framework/pom.xml.template
    lucene/dev/branches/bulkpostings/dev-tools/maven/modules/analysis/common/pom.xml.template
    lucene/dev/branches/bulkpostings/dev-tools/maven/modules/analysis/icu/pom.xml.template
    lucene/dev/branches/bulkpostings/dev-tools/maven/modules/analysis/phonetic/pom.xml.template
    lucene/dev/branches/bulkpostings/dev-tools/maven/modules/analysis/smartcn/pom.xml.template
    lucene/dev/branches/bulkpostings/dev-tools/maven/modules/analysis/stempel/pom.xml.template
    lucene/dev/branches/bulkpostings/dev-tools/maven/modules/benchmark/pom.xml.template
    lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template
    lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/clustering/pom.xml.template
    lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template
    lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template
    lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/extraction/pom.xml.template
    lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/uima/pom.xml.template
    lucene/dev/branches/bulkpostings/dev-tools/maven/solr/pom.xml.template
    lucene/dev/branches/bulkpostings/dev-tools/maven/solr/src/pom.xml.template
    lucene/dev/branches/bulkpostings/dev-tools/maven/solr/src/solrj/pom.xml.template
    lucene/dev/branches/bulkpostings/lucene/   (props changed)
    lucene/dev/branches/bulkpostings/lucene/CHANGES.txt
    lucene/dev/branches/bulkpostings/lucene/README.txt
    lucene/dev/branches/bulkpostings/lucene/build.xml
    lucene/dev/branches/bulkpostings/lucene/common-build.xml
    lucene/dev/branches/bulkpostings/lucene/contrib/CHANGES.txt
    lucene/dev/branches/bulkpostings/lucene/contrib/lucli/build.xml
    lucene/dev/branches/bulkpostings/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
    lucene/dev/branches/bulkpostings/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java
    lucene/dev/branches/bulkpostings/lucene/contrib/misc/src/test/org/apache/lucene/misc/SweetSpotSimilarityTest.java
    lucene/dev/branches/bulkpostings/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java
    lucene/dev/branches/bulkpostings/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanOrTermsBuilder.java
    lucene/dev/branches/bulkpostings/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/TermsFilterBuilder.java
    lucene/dev/branches/bulkpostings/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/TermsQueryBuilder.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/analysis/NumericTokenStream.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttributeImpl.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/analysis/tokenattributes/TermToBytesRefAttribute.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/CheckIndex.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/DocConsumerPerThread.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/DocFieldConsumer.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/DocFieldProcessor.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/DocFieldProcessorPerThread.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/DocInverter.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/FieldInfo.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/FieldInfos.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/FieldsWriter.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/IndexFileNames.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/IndexWriter.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/IndexWriterConfig.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/InvertedDocConsumer.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/InvertedDocEndConsumer.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/NormsWriter.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/PerFieldCodecWrapper.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/SegmentCodecs.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/SegmentInfo.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/SegmentInfos.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/SegmentMerger.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/SegmentReader.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/StoredFieldsWriter.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/StoredFieldsWriterPerThread.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/TermsHash.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/TermsHashConsumer.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/TermsHashPerField.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/TermsHashPerThread.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/DefaultSegmentInfosReader.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/DefaultSegmentInfosWriter.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/preflex/PreFlexFields.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/queryParser/QueryParserBase.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/DefaultSimilarity.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/IndexSearcher.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/QueryTermVector.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/Similarity.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/store/DataInput.java   (contents, props changed)
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/util/ArrayUtil.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/util/CollectionUtil.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/util/PriorityQueue.java
    lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/util/automaton/SpecialOperations.java
    lucene/dev/branches/bulkpostings/lucene/src/test-framework/org/apache/lucene/index/RandomIndexWriter.java
    lucene/dev/branches/bulkpostings/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
    lucene/dev/branches/bulkpostings/lucene/src/test-framework/org/apache/lucene/util/_TestUtil.java
    lucene/dev/branches/bulkpostings/lucene/src/test-framework/org/apache/lucene/util/automaton/AutomatonTestUtil.java
    lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/analysis/TestNumericTokenStream.java
    lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/Test2BTerms.java
    lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/TestAddIndexes.java
    lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
    lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/TestCodecs.java
    lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/TestDoc.java
    lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/TestDocumentWriter.java
    lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/TestFieldInfos.java
    lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/TestFieldsReader.java
    lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/TestIndexFileDeleter.java
    lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/TestIndexInput.java
    lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/TestIndexReaderCloneNorms.java
    lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java
    lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/TestIndexWriterConfig.java
    lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
    lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java
    lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/TestMaxTermFrequency.java
    lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/TestNorms.java
    lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/TestOmitTf.java
    lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/TestPerFieldCodecSupport.java
    lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java
    lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/search/TestBoolean2.java
    lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/search/TestComplexExplanations.java
    lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/search/TestConstantScoreQuery.java
    lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
    lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java
    lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/search/TestSimilarity.java
    lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java
    lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java
    lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java
    lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java
    lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/util/TestCollectionUtil.java
    lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/util/automaton/fst/TestFSTs.java
    lucene/dev/branches/bulkpostings/modules/   (props changed)
    lucene/dev/branches/bulkpostings/modules/analysis/common/src/java/org/apache/lucene/collation/tokenattributes/CollatedTermAttributeImpl.java
    lucene/dev/branches/bulkpostings/modules/analysis/common/src/test/org/apache/lucene/collation/CollationTestBase.java
    lucene/dev/branches/bulkpostings/modules/analysis/icu/build.xml
    lucene/dev/branches/bulkpostings/modules/analysis/icu/src/java/org/apache/lucene/collation/tokenattributes/ICUCollatedTermAttributeImpl.java
    lucene/dev/branches/bulkpostings/modules/benchmark/CHANGES.txt
    lucene/dev/branches/bulkpostings/modules/benchmark/lib/commons-compress-NOTICE.txt
    lucene/dev/branches/bulkpostings/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/Benchmark.java
    lucene/dev/branches/bulkpostings/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ContentSource.java
    lucene/dev/branches/bulkpostings/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.java
    lucene/dev/branches/bulkpostings/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LineDocSource.java
    lucene/dev/branches/bulkpostings/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecContentSource.java
    lucene/dev/branches/bulkpostings/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/package.html
    lucene/dev/branches/bulkpostings/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java
    lucene/dev/branches/bulkpostings/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewCollationAnalyzerTask.java
    lucene/dev/branches/bulkpostings/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewShingleAnalyzerTask.java
    lucene/dev/branches/bulkpostings/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java
    lucene/dev/branches/bulkpostings/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTokensTask.java
    lucene/dev/branches/bulkpostings/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.java
    lucene/dev/branches/bulkpostings/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Algorithm.java
    lucene/dev/branches/bulkpostings/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
    lucene/dev/branches/bulkpostings/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/LineDocSourceTest.java
    lucene/dev/branches/bulkpostings/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TrecContentSourceTest.java
    lucene/dev/branches/bulkpostings/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTaskTest.java
    lucene/dev/branches/bulkpostings/modules/build.xml
    lucene/dev/branches/bulkpostings/solr/   (props changed)
    lucene/dev/branches/bulkpostings/solr/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/bulkpostings/solr/LICENSE.txt   (props changed)
    lucene/dev/branches/bulkpostings/solr/NOTICE.txt   (contents, props changed)
    lucene/dev/branches/bulkpostings/solr/README.txt   (props changed)
    lucene/dev/branches/bulkpostings/solr/build.xml   (contents, props changed)
    lucene/dev/branches/bulkpostings/solr/client/   (props changed)
    lucene/dev/branches/bulkpostings/solr/common-build.xml   (contents, props changed)
    lucene/dev/branches/bulkpostings/solr/contrib/   (props changed)
    lucene/dev/branches/bulkpostings/solr/contrib/analysis-extras/CHANGES.txt
    lucene/dev/branches/bulkpostings/solr/contrib/analysis-extras/build.xml
    lucene/dev/branches/bulkpostings/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUCollationKeyFilterFactory.java
    lucene/dev/branches/bulkpostings/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUCollationKeyFilterFactory.java
    lucene/dev/branches/bulkpostings/solr/contrib/clustering/build.xml
    lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/CHANGES.txt
    lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/build.xml
    lucene/dev/branches/bulkpostings/solr/contrib/extraction/build.xml
    lucene/dev/branches/bulkpostings/solr/contrib/uima/CHANGES.txt
    lucene/dev/branches/bulkpostings/solr/contrib/uima/build.xml
    lucene/dev/branches/bulkpostings/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/SolrUIMAConfiguration.java
    lucene/dev/branches/bulkpostings/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/SolrUIMAConfigurationReader.java
    lucene/dev/branches/bulkpostings/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/ae/AEProviderFactory.java
    lucene/dev/branches/bulkpostings/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/ae/OverridingParamsAEProvider.java
    lucene/dev/branches/bulkpostings/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java
    lucene/dev/branches/bulkpostings/solr/contrib/uima/src/test/resources/AggregateSentenceAE.xml
    lucene/dev/branches/bulkpostings/solr/contrib/uima/src/test/resources/TestAE.xml
    lucene/dev/branches/bulkpostings/solr/contrib/uima/src/test/resources/solr-uima/conf/schema.xml
    lucene/dev/branches/bulkpostings/solr/contrib/uima/src/test/resources/solr-uima/conf/solrconfig.xml
    lucene/dev/branches/bulkpostings/solr/example/   (props changed)
    lucene/dev/branches/bulkpostings/solr/example/solr/conf/solrconfig.xml
    lucene/dev/branches/bulkpostings/solr/lib/   (props changed)
    lucene/dev/branches/bulkpostings/solr/lib/easymock-LICENSE-MIT.txt
    lucene/dev/branches/bulkpostings/solr/site/   (props changed)
    lucene/dev/branches/bulkpostings/solr/site/features.html
    lucene/dev/branches/bulkpostings/solr/site/features.pdf
    lucene/dev/branches/bulkpostings/solr/site/index.html
    lucene/dev/branches/bulkpostings/solr/site/index.pdf
    lucene/dev/branches/bulkpostings/solr/site/issue_tracking.html
    lucene/dev/branches/bulkpostings/solr/site/linkmap.html
    lucene/dev/branches/bulkpostings/solr/site/linkmap.pdf
    lucene/dev/branches/bulkpostings/solr/site/mailing_lists.html
    lucene/dev/branches/bulkpostings/solr/site/skin/basic.css
    lucene/dev/branches/bulkpostings/solr/site/skin/print.css
    lucene/dev/branches/bulkpostings/solr/site/skin/profile.css
    lucene/dev/branches/bulkpostings/solr/site/skin/screen.css
    lucene/dev/branches/bulkpostings/solr/site/tutorial.html
    lucene/dev/branches/bulkpostings/solr/site/tutorial.pdf
    lucene/dev/branches/bulkpostings/solr/site/version_control.html
    lucene/dev/branches/bulkpostings/solr/src/   (props changed)
    lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/SolrDocument.java
    lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/util/FileUtils.java
    lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/util/JavaBinCodec.java
    lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/util/NamedList.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/CollationKeyFilterFactory.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/GalicianStemFilterFactory.java   (props changed)
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/PathHierarchyTokenizerFactory.java   (props changed)
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/PersianCharFilterFactory.java   (props changed)
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/PortugueseStemFilterFactory.java   (props changed)
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/UAX29URLEmailTokenizerFactory.java   (props changed)
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/core/MMapDirectoryFactory.java   (props changed)
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/core/RequestHandlers.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/core/SimpleFSDirectoryFactory.java   (props changed)
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/core/SolrConfig.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/core/SolrCore.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/handler/component/QueryComponent.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/response/BaseResponseWriter.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/response/BinaryResponseWriter.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/response/CSVResponseWriter.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/response/JSONResponseWriter.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/response/PHPSerializedResponseWriter.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/response/SolrQueryResponse.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/response/TextResponseWriter.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/response/XMLWriter.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/BinaryField.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/DateField.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/FieldProperties.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/FieldType.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/IndexSchema.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/LatLonType.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/PointType.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/SchemaField.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/SimilarityFactory.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/TrieDateField.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/TrieField.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/QueryParsing.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/SolrQueryParser.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/SolrSortField.java   (props changed)
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/ValueSourceParser.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/spelling/suggest/jaspell/JaspellTernarySearchTrie.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/update/DocumentBuilder.java
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/util/SentinelIntSet.java   (props changed)
    lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/util/SolrPluginUtils.java
    lucene/dev/branches/bulkpostings/solr/src/site/src/documentation/content/xdocs/features.xml
    lucene/dev/branches/bulkpostings/solr/src/site/src/documentation/content/xdocs/index.xml
    lucene/dev/branches/bulkpostings/solr/src/site/src/documentation/content/xdocs/site.xml
    lucene/dev/branches/bulkpostings/solr/src/site/src/documentation/content/xdocs/tutorial.xml
    lucene/dev/branches/bulkpostings/solr/src/site/src/documentation/resources/schema/catalog.xcat
    lucene/dev/branches/bulkpostings/solr/src/site/src/documentation/skinconf.xml
    lucene/dev/branches/bulkpostings/solr/src/solrj/org/apache/solr/client/solrj/impl/XMLResponseParser.java
    lucene/dev/branches/bulkpostings/solr/src/test-files/solr/conf/schema.xml
    lucene/dev/branches/bulkpostings/solr/src/test/org/apache/solr/BasicFunctionalityTest.java
    lucene/dev/branches/bulkpostings/solr/src/test/org/apache/solr/ConvertedLegacyTest.java
    lucene/dev/branches/bulkpostings/solr/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java
    lucene/dev/branches/bulkpostings/solr/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java
    lucene/dev/branches/bulkpostings/solr/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java
    lucene/dev/branches/bulkpostings/solr/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
    lucene/dev/branches/bulkpostings/solr/src/test/org/apache/solr/client/solrj/SolrJettyTestBase.java
    lucene/dev/branches/bulkpostings/solr/src/test/org/apache/solr/client/solrj/TestBatchUpdate.java
    lucene/dev/branches/bulkpostings/solr/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
    lucene/dev/branches/bulkpostings/solr/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeBinaryJettyTest.java
    lucene/dev/branches/bulkpostings/solr/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeEmbeddedTest.java
    lucene/dev/branches/bulkpostings/solr/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeJettyTest.java
    lucene/dev/branches/bulkpostings/solr/src/test/org/apache/solr/client/solrj/embedded/SolrExampleEmbeddedTest.java
    lucene/dev/branches/bulkpostings/solr/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java
    lucene/dev/branches/bulkpostings/solr/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java
    lucene/dev/branches/bulkpostings/solr/src/test/org/apache/solr/client/solrj/response/TermsResponseTest.java
    lucene/dev/branches/bulkpostings/solr/src/test/org/apache/solr/client/solrj/response/TestSpellCheckResponse.java
    lucene/dev/branches/bulkpostings/solr/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
    lucene/dev/branches/bulkpostings/solr/src/test/org/apache/solr/common/util/TestSystemIdResolver.java
    lucene/dev/branches/bulkpostings/solr/src/test/org/apache/solr/response/TestCSVResponseWriter.java
    lucene/dev/branches/bulkpostings/solr/src/test/org/apache/solr/schema/CustomSimilarityFactory.java
    lucene/dev/branches/bulkpostings/solr/src/test/org/apache/solr/schema/DateFieldTest.java
    lucene/dev/branches/bulkpostings/solr/src/test/org/apache/solr/schema/IndexSchemaTest.java
    lucene/dev/branches/bulkpostings/solr/src/test/org/apache/solr/search/TestRangeQuery.java
    lucene/dev/branches/bulkpostings/solr/src/test/org/apache/solr/search/TestSolrQueryParser.java
    lucene/dev/branches/bulkpostings/solr/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java
    lucene/dev/branches/bulkpostings/solr/src/test/org/apache/solr/spelling/suggest/PersistenceTest.java
    lucene/dev/branches/bulkpostings/solr/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java
    lucene/dev/branches/bulkpostings/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java
    lucene/dev/branches/bulkpostings/solr/src/webapp/web/admin/analysis.jsp
    lucene/dev/branches/bulkpostings/solr/src/webapp/web/admin/form.jsp
    lucene/dev/branches/bulkpostings/solr/testlogging.properties   (props changed)

Modified: lucene/dev/branches/bulkpostings/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/build.xml?rev=1101016&r1=1101015&r2=1101016&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/build.xml (original)
+++ lucene/dev/branches/bulkpostings/build.xml Mon May  9 13:19:28 2011
@@ -18,6 +18,7 @@
  -->
 
 <project name="lucene-solr" default="test" basedir=".">
+  <import file="common-build.xml"/>
   <target name="test" description="Test both Lucene and Solr">
     <sequential>
       <subant target="test" inheritall="false" failonerror="true">
@@ -27,9 +28,16 @@
       </subant>
     </sequential>
   </target>
-
-  <target name="compile" description="Compile Lucene and Solr">
+  <target name="validate" description="Validate dependencies, licenses, etc.">
+    <sequential><subant target="validate" inheritall="false" failonerror="true">
+        <fileset dir="lucene" includes="build.xml" />
+        <fileset dir="modules" includes="build.xml" />
+        <fileset dir="solr" includes="build.xml" />
+      </subant></sequential>
+  </target>
+  <target name="compile" depends="validate" description="Compile Lucene and Solr">
     <sequential>
+
       <subant target="compile" inheritall="false" failonerror="true">
         <fileset dir="lucene" includes="build.xml" />
         <fileset dir="modules" includes="build.xml" />

Modified: lucene/dev/branches/bulkpostings/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/eclipse/dot.classpath?rev=1101016&r1=1101015&r2=1101016&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/eclipse/dot.classpath Mon May  9 13:19:28 2011
@@ -57,6 +57,7 @@
 	<classpathentry kind="src" path="solr/src/webapp/src"/>
 	<classpathentry kind="src" path="solr/src/common"/>
 	<classpathentry kind="src" path="solr/src/solrj"/>
+	<classpathentry kind="src" path="solr/src/test-framework"/>
 	<classpathentry kind="src" path="solr/src/test"/>
 	<classpathentry kind="src" path="solr/src/test-files"/>
 	<classpathentry kind="src" path="solr/contrib/analysis-extras/src/java"/>
@@ -90,7 +91,7 @@
 	<classpathentry kind="lib" path="modules/analysis/phonetic/lib/commons-codec-1.4.jar"/>
 	<classpathentry kind="lib" path="modules/benchmark/lib/commons-beanutils-1.7.0.jar"/>
 	<classpathentry kind="lib" path="modules/benchmark/lib/commons-collections-3.1.jar"/>
-	<classpathentry kind="lib" path="modules/benchmark/lib/commons-compress-1.0.jar"/>
+	<classpathentry kind="lib" path="modules/benchmark/lib/commons-compress-1.1.jar"/>
 	<classpathentry kind="lib" path="modules/benchmark/lib/commons-digester-1.7.jar"/>
 	<classpathentry kind="lib" path="modules/benchmark/lib/commons-logging-1.0.4.jar"/>
 	<classpathentry kind="lib" path="modules/benchmark/lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar"/>

Modified: lucene/dev/branches/bulkpostings/dev-tools/idea/.idea/libraries/Servlet_API_2_4.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/idea/.idea/libraries/Servlet_API_2_4.xml?rev=1101016&r1=1101015&r2=1101016&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/idea/.idea/libraries/Servlet_API_2_4.xml (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/idea/.idea/libraries/Servlet_API_2_4.xml Mon May  9 13:19:28 2011
@@ -1,7 +1,7 @@
 <component name="libraryTable">
   <library name="Servlet API 2.4">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lucene/contrib/demo/lib/servlet-api-2.4.jar!/" />
+      <root url="jar://$PROJECT_DIR$/solr/lib/servlet-api-2.4.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

Modified: lucene/dev/branches/bulkpostings/dev-tools/idea/solr/solr.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/idea/solr/solr.iml?rev=1101016&r1=1101015&r2=1101016&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/idea/solr/solr.iml (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/idea/solr/solr.iml Mon May  9 13:19:28 2011
@@ -12,6 +12,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test-files" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test-framework" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
       <excludeFolder url="file://$MODULE_DIR$/dist" />
       <excludeFolder url="file://$MODULE_DIR$/lucene-libs" />

Modified: lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/ant/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/ant/pom.xml.template?rev=1101016&r1=1101015&r2=1101016&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/ant/pom.xml.template (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/ant/pom.xml.template Mon May  9 13:19:28 2011
@@ -45,7 +45,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/db/bdb-je/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/db/bdb-je/pom.xml.template?rev=1101016&r1=1101015&r2=1101016&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/db/bdb-je/pom.xml.template (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/db/bdb-je/pom.xml.template Mon May  9 13:19:28 2011
@@ -45,7 +45,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/db/bdb/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/db/bdb/pom.xml.template?rev=1101016&r1=1101015&r2=1101016&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/db/bdb/pom.xml.template (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/db/bdb/pom.xml.template Mon May  9 13:19:28 2011
@@ -45,7 +45,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/demo/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/demo/pom.xml.template?rev=1101016&r1=1101015&r2=1101016&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/demo/pom.xml.template (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/demo/pom.xml.template Mon May  9 13:19:28 2011
@@ -45,7 +45,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template?rev=1101016&r1=1101015&r2=1101016&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template Mon May  9 13:19:28 2011
@@ -47,7 +47,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/instantiated/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/instantiated/pom.xml.template?rev=1101016&r1=1101015&r2=1101016&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/instantiated/pom.xml.template (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/instantiated/pom.xml.template Mon May  9 13:19:28 2011
@@ -45,7 +45,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/lucli/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/lucli/pom.xml.template?rev=1101016&r1=1101015&r2=1101016&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/lucli/pom.xml.template (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/lucli/pom.xml.template Mon May  9 13:19:28 2011
@@ -45,7 +45,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/memory/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/memory/pom.xml.template?rev=1101016&r1=1101015&r2=1101016&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/memory/pom.xml.template (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/memory/pom.xml.template Mon May  9 13:19:28 2011
@@ -47,7 +47,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/misc/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/misc/pom.xml.template?rev=1101016&r1=1101015&r2=1101016&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/misc/pom.xml.template (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/misc/pom.xml.template Mon May  9 13:19:28 2011
@@ -52,7 +52,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/queries/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/queries/pom.xml.template?rev=1101016&r1=1101015&r2=1101016&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/queries/pom.xml.template (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/queries/pom.xml.template Mon May  9 13:19:28 2011
@@ -54,7 +54,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/queryparser/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/queryparser/pom.xml.template?rev=1101016&r1=1101015&r2=1101016&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/queryparser/pom.xml.template (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/queryparser/pom.xml.template Mon May  9 13:19:28 2011
@@ -54,7 +54,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/spatial/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/spatial/pom.xml.template?rev=1101016&r1=1101015&r2=1101016&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/spatial/pom.xml.template (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/spatial/pom.xml.template Mon May  9 13:19:28 2011
@@ -45,7 +45,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/spellchecker/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/spellchecker/pom.xml.template?rev=1101016&r1=1101015&r2=1101016&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/spellchecker/pom.xml.template (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/spellchecker/pom.xml.template Mon May  9 13:19:28 2011
@@ -45,7 +45,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/swing/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/swing/pom.xml.template?rev=1101016&r1=1101015&r2=1101016&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/swing/pom.xml.template (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/swing/pom.xml.template Mon May  9 13:19:28 2011
@@ -45,7 +45,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/wordnet/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/wordnet/pom.xml.template?rev=1101016&r1=1101015&r2=1101016&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/wordnet/pom.xml.template (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/wordnet/pom.xml.template Mon May  9 13:19:28 2011
@@ -45,7 +45,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml.template?rev=1101016&r1=1101015&r2=1101016&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml.template (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml.template Mon May  9 13:19:28 2011
@@ -45,7 +45,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/src/test-framework/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/src/test-framework/pom.xml.template?rev=1101016&r1=1101015&r2=1101016&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/src/test-framework/pom.xml.template (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/src/test-framework/pom.xml.template Mon May  9 13:19:28 2011
@@ -40,45 +40,31 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>lucene-core</artifactId>
       <version>${project.version}</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant-junit</artifactId>
-      <scope>test</scope>
     </dependency>
   </dependencies>
   <build>
-    <directory>${build-directory}/classes/test-framework</directory>
-    <testOutputDirectory>${build-directory}/classes/test-framework</testOutputDirectory>
-    <testSourceDirectory>.</testSourceDirectory>
-    <testResources>
-      <testResource>
-        <directory>${project.build.testSourceDirectory}</directory>
+    <directory>${build-directory}</directory>
+    <outputDirectory>${build-directory}/classes/test-framework</outputDirectory>
+    <sourceDirectory>.</sourceDirectory>
+    <resources>
+      <resource>
+        <directory>${project.build.sourceDirectory}</directory>
         <excludes>
           <exclude>**/*.java</exclude>
         </excludes>
-      </testResource>
-    </testResources>
+      </resource>
+    </resources>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>test-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <skip>true</skip>

Modified: lucene/dev/branches/bulkpostings/dev-tools/maven/modules/analysis/common/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/maven/modules/analysis/common/pom.xml.template?rev=1101016&r1=1101015&r2=1101016&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/maven/modules/analysis/common/pom.xml.template (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/maven/modules/analysis/common/pom.xml.template Mon May  9 13:19:28 2011
@@ -52,7 +52,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: lucene/dev/branches/bulkpostings/dev-tools/maven/modules/analysis/icu/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/maven/modules/analysis/icu/pom.xml.template?rev=1101016&r1=1101015&r2=1101016&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/maven/modules/analysis/icu/pom.xml.template (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/maven/modules/analysis/icu/pom.xml.template Mon May  9 13:19:28 2011
@@ -55,7 +55,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: lucene/dev/branches/bulkpostings/dev-tools/maven/modules/analysis/phonetic/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/maven/modules/analysis/phonetic/pom.xml.template?rev=1101016&r1=1101015&r2=1101016&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/maven/modules/analysis/phonetic/pom.xml.template (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/maven/modules/analysis/phonetic/pom.xml.template Mon May  9 13:19:28 2011
@@ -47,7 +47,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: lucene/dev/branches/bulkpostings/dev-tools/maven/modules/analysis/smartcn/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/maven/modules/analysis/smartcn/pom.xml.template?rev=1101016&r1=1101015&r2=1101016&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/maven/modules/analysis/smartcn/pom.xml.template (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/maven/modules/analysis/smartcn/pom.xml.template Mon May  9 13:19:28 2011
@@ -45,7 +45,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: lucene/dev/branches/bulkpostings/dev-tools/maven/modules/analysis/stempel/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/maven/modules/analysis/stempel/pom.xml.template?rev=1101016&r1=1101015&r2=1101016&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/maven/modules/analysis/stempel/pom.xml.template (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/maven/modules/analysis/stempel/pom.xml.template Mon May  9 13:19:28 2011
@@ -45,7 +45,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: lucene/dev/branches/bulkpostings/dev-tools/maven/modules/benchmark/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/maven/modules/benchmark/pom.xml.template?rev=1101016&r1=1101015&r2=1101016&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/maven/modules/benchmark/pom.xml.template (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/maven/modules/benchmark/pom.xml.template Mon May  9 13:19:28 2011
@@ -45,7 +45,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template?rev=1101016&r1=1101015&r2=1101016&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template Mon May  9 13:19:28 2011
@@ -44,9 +44,8 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>solr-core</artifactId>
+      <artifactId>solr-test-framework</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -78,7 +77,6 @@
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -86,6 +84,11 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <directory>${build-directory}</directory>
@@ -95,7 +98,7 @@
     <testSourceDirectory>src/test</testSourceDirectory>
     <testResources>
       <testResource>
-        <directory>test-files</directory>
+        <directory>src/test-files</directory>
       </testResource>
       <testResource>
         <directory>../../src/test-files</directory>

Modified: lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/clustering/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/clustering/pom.xml.template?rev=1101016&r1=1101015&r2=1101016&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/clustering/pom.xml.template (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/clustering/pom.xml.template Mon May  9 13:19:28 2011
@@ -44,9 +44,8 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>solr-core</artifactId>
+      <artifactId>solr-test-framework</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -63,7 +62,6 @@
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template?rev=1101016&r1=1101015&r2=1101016&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template Mon May  9 13:19:28 2011
@@ -44,9 +44,8 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>solr-core</artifactId>
+      <artifactId>solr-test-framework</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -70,7 +69,6 @@
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template?rev=1101016&r1=1101015&r2=1101016&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template Mon May  9 13:19:28 2011
@@ -43,10 +43,9 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>solr-core</artifactId>
+      <groupId>org.apache.solr</groupId>
+      <artifactId>solr-test-framework</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -63,7 +62,6 @@
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/extraction/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/extraction/pom.xml.template?rev=1101016&r1=1101015&r2=1101016&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/extraction/pom.xml.template (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/extraction/pom.xml.template Mon May  9 13:19:28 2011
@@ -47,9 +47,8 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>solr-core</artifactId>
+      <artifactId>solr-test-framework</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -66,7 +65,6 @@
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/uima/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/uima/pom.xml.template?rev=1101016&r1=1101015&r2=1101016&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/uima/pom.xml.template (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/uima/pom.xml.template Mon May  9 13:19:28 2011
@@ -44,9 +44,8 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>solr-core</artifactId>
+      <artifactId>solr-test-framework</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -58,7 +57,6 @@
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-test-framework</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: lucene/dev/branches/bulkpostings/dev-tools/maven/solr/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/maven/solr/pom.xml.template?rev=1101016&r1=1101015&r2=1101016&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/maven/solr/pom.xml.template (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/maven/solr/pom.xml.template Mon May  9 13:19:28 2011
@@ -35,6 +35,7 @@
     <module>src</module>
     <module>src/solrj</module>
     <module>src/webapp</module>
+    <module>src/test-framework</module>
     <module>contrib</module>
   </modules>
   <properties>