You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2011/02/06 10:40:52 UTC
svn commit: r1067623 - in /lucene/dev/branches/branch_3x: dev-tools/eclipse/
dev-tools/idea/lucene/ dev-tools/maven/lucene/
dev-tools/maven/lucene/contrib/analyzers/common/
dev-tools/maven/lucene/contrib/analyzers/smartcn/
dev-tools/maven/lucene/contri...
Author: shaie
Date: Sun Feb 6 09:40:49 2011
New Revision: 1067623
URL: http://svn.apache.org/viewvc?rev=1067623&view=rev
Log:
LUCENE-2609: Generate jar containing test classes (3x)
Added:
lucene/dev/branches/branch_3x/dev-tools/maven/lucene/src/test-framework/
lucene/dev/branches/branch_3x/dev-tools/maven/lucene/src/test-framework/pom.xml.template
lucene/dev/branches/branch_3x/lucene/src/test-framework/
lucene/dev/branches/branch_3x/lucene/src/test-framework/org/
lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/
lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/
lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/analysis/
lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/analysis/BaseTokenStreamTestCase.java
- copied unchanged from r1065957, lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/BaseTokenStreamTestCase.java
lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/analysis/MockAnalyzer.java
- copied unchanged from r1065957, lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/MockAnalyzer.java
lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/index/
lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/index/DocHelper.java
- copied unchanged from r1065957, lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/DocHelper.java
lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/index/MockIndexInput.java
- copied unchanged from r1065957, lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/MockIndexInput.java
lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/index/RandomIndexWriter.java
- copied unchanged from r1065957, lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/RandomIndexWriter.java
lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/search/
lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/search/CheckHits.java
- copied unchanged from r1065957, lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/CheckHits.java
lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/search/QueryUtils.java
- copied unchanged from r1065957, lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/QueryUtils.java
lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/store/
lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/store/MockDirectoryWrapper.java
- copied unchanged from r1065957, lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/store/MockDirectoryWrapper.java
lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/store/MockIndexInputWrapper.java
- copied unchanged from r1065957, lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/store/MockIndexInputWrapper.java
lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/store/MockIndexOutputWrapper.java
- copied unchanged from r1065957, lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/store/MockIndexOutputWrapper.java
lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/store/_TestHelper.java
- copied unchanged from r1065957, lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/store/_TestHelper.java
lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/util/
lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/util/LineFileDocs.java
- copied unchanged from r1065957, lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/LineFileDocs.java
lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/util/LuceneJUnitDividingSelector.java
- copied unchanged from r1065957, lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/LuceneJUnitDividingSelector.java
lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/util/LuceneJUnitResultFormatter.java
- copied unchanged from r1065957, lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/LuceneJUnitResultFormatter.java
lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
- copied unchanged from r1066738, lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/LuceneTestCase.java
lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/util/_TestUtil.java
- copied unchanged from r1067612, lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/_TestUtil.java
Removed:
lucene/dev/branches/branch_3x/dev-tools/testjar/
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/BaseTokenStreamTestCase.java
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/MockAnalyzer.java
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/DocHelper.java
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/MockIndexInput.java
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/RandomIndexWriter.java
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/CheckHits.java
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/QueryUtils.java
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/store/MockDirectoryWrapper.java
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/store/MockIndexInputWrapper.java
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/store/MockIndexOutputWrapper.java
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/store/_TestHelper.java
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/LineFileDocs.java
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/LuceneJUnitDividingSelector.java
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/LuceneJUnitResultFormatter.java
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/LuceneTestCase.java
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/_TestUtil.java
Modified:
lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath
lucene/dev/branches/branch_3x/dev-tools/idea/lucene/lucene.iml
lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/analyzers/common/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/analyzers/smartcn/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/analyzers/stempel/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/ant/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/benchmark/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/db/bdb-je/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/db/bdb/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/demo/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/icu/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/instantiated/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/lucli/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/memory/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/misc/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/queries/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/queryparser/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/remote/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/spatial/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/spellchecker/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/swing/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/wordnet/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/lucene/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/lucene/src/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/clustering/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/extraction/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/uima/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/solrj/pom.xml.template
lucene/dev/branches/branch_3x/lucene/CHANGES.txt
lucene/dev/branches/branch_3x/lucene/build.xml
lucene/dev/branches/branch_3x/lucene/common-build.xml
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/build.xml
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/smartcn/build.xml
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/stempel/build.xml
lucene/dev/branches/branch_3x/lucene/contrib/contrib-build.xml
lucene/dev/branches/branch_3x/lucene/contrib/db/bdb-je/build.xml
lucene/dev/branches/branch_3x/lucene/contrib/db/bdb/build.xml
lucene/dev/branches/branch_3x/solr/build.xml
lucene/dev/branches/branch_3x/solr/contrib/analysis-extras/build.xml
lucene/dev/branches/branch_3x/solr/contrib/clustering/build.xml
lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/build.xml
lucene/dev/branches/branch_3x/solr/contrib/extraction/build.xml
lucene/dev/branches/branch_3x/solr/contrib/uima/build.xml
Modified: lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath Sun Feb 6 09:40:49 2011
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="lucene/src/java"/>
+ <classpathentry kind="src" path="lucene/src/test-framework"/>
<classpathentry kind="src" path="lucene/src/test"/>
<classpathentry kind="src" path="lucene/contrib/analyzers/common/src/java"/>
<classpathentry kind="src" path="lucene/contrib/analyzers/common/src/resources"/>
Modified: lucene/dev/branches/branch_3x/dev-tools/idea/lucene/lucene.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/idea/lucene/lucene.iml?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/idea/lucene/lucene.iml (original)
+++ lucene/dev/branches/branch_3x/dev-tools/idea/lucene/lucene.iml Sun Feb 6 09:40:49 2011
@@ -9,6 +9,7 @@
<sourceFolder url="file://$MODULE_DIR$/src/demo" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/jsp" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/tools/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test-framework" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build" />
</content>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/analyzers/common/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/analyzers/common/pom.xml.template?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/analyzers/common/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/analyzers/common/pom.xml.template Sun Feb 6 09:40:49 2011
@@ -49,6 +49,13 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>lucene-test-framework</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/analyzers/smartcn/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/analyzers/smartcn/pom.xml.template?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/analyzers/smartcn/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/analyzers/smartcn/pom.xml.template Sun Feb 6 09:40:49 2011
@@ -43,7 +43,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/analyzers/stempel/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/analyzers/stempel/pom.xml.template?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/analyzers/stempel/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/analyzers/stempel/pom.xml.template Sun Feb 6 09:40:49 2011
@@ -43,7 +43,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/ant/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/ant/pom.xml.template?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/ant/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/ant/pom.xml.template Sun Feb 6 09:40:49 2011
@@ -43,7 +43,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/benchmark/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/benchmark/pom.xml.template?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/benchmark/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/benchmark/pom.xml.template Sun Feb 6 09:40:49 2011
@@ -43,7 +43,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/db/bdb-je/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/db/bdb-je/pom.xml.template?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/db/bdb-je/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/db/bdb-je/pom.xml.template Sun Feb 6 09:40:49 2011
@@ -43,7 +43,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/db/bdb/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/db/bdb/pom.xml.template?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/db/bdb/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/db/bdb/pom.xml.template Sun Feb 6 09:40:49 2011
@@ -43,7 +43,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/demo/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/demo/pom.xml.template?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/demo/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/demo/pom.xml.template Sun Feb 6 09:40:49 2011
@@ -43,7 +43,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template Sun Feb 6 09:40:49 2011
@@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/icu/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/icu/pom.xml.template?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/icu/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/icu/pom.xml.template Sun Feb 6 09:40:49 2011
@@ -53,6 +53,13 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>lucene-test-framework</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>lucene-analyzers</artifactId>
<version>${project.version}</version>
</dependency>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/instantiated/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/instantiated/pom.xml.template?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/instantiated/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/instantiated/pom.xml.template Sun Feb 6 09:40:49 2011
@@ -43,7 +43,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/lucli/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/lucli/pom.xml.template?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/lucli/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/lucli/pom.xml.template Sun Feb 6 09:40:49 2011
@@ -43,7 +43,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/memory/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/memory/pom.xml.template?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/memory/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/memory/pom.xml.template Sun Feb 6 09:40:49 2011
@@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/misc/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/misc/pom.xml.template?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/misc/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/misc/pom.xml.template Sun Feb 6 09:40:49 2011
@@ -50,6 +50,13 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>lucene-test-framework</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>lucene-analyzers</artifactId>
<version>${project.version}</version>
</dependency>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/queries/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/queries/pom.xml.template?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/queries/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/queries/pom.xml.template Sun Feb 6 09:40:49 2011
@@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/queryparser/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/queryparser/pom.xml.template?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/queryparser/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/queryparser/pom.xml.template Sun Feb 6 09:40:49 2011
@@ -51,6 +51,13 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>lucene-test-framework</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/remote/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/remote/pom.xml.template?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/remote/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/remote/pom.xml.template Sun Feb 6 09:40:49 2011
@@ -49,6 +49,13 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>lucene-test-framework</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/spatial/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/spatial/pom.xml.template?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/spatial/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/spatial/pom.xml.template Sun Feb 6 09:40:49 2011
@@ -43,7 +43,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/spellchecker/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/spellchecker/pom.xml.template?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/spellchecker/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/spellchecker/pom.xml.template Sun Feb 6 09:40:49 2011
@@ -43,7 +43,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/swing/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/swing/pom.xml.template?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/swing/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/swing/pom.xml.template Sun Feb 6 09:40:49 2011
@@ -43,7 +43,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/wordnet/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/wordnet/pom.xml.template?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/wordnet/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/wordnet/pom.xml.template Sun Feb 6 09:40:49 2011
@@ -43,7 +43,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml.template?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml.template Sun Feb 6 09:40:49 2011
@@ -43,7 +43,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/lucene/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/lucene/pom.xml.template?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/lucene/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/lucene/pom.xml.template Sun Feb 6 09:40:49 2011
@@ -33,6 +33,7 @@
<description>Lucene parent POM</description>
<modules>
<module>src</module>
+ <module>src/test-framework</module>
<module>contrib</module>
</modules>
<build>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/lucene/src/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/lucene/src/pom.xml.template?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/lucene/src/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/lucene/src/pom.xml.template Sun Feb 6 09:40:49 2011
@@ -121,6 +121,24 @@
</programs>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-test-source</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>test-framework</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
Added: lucene/dev/branches/branch_3x/dev-tools/maven/lucene/src/test-framework/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/lucene/src/test-framework/pom.xml.template?rev=1067623&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/lucene/src/test-framework/pom.xml.template (added)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/lucene/src/test-framework/pom.xml.template Sun Feb 6 09:40:49 2011
@@ -0,0 +1,89 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ -->
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-parent</artifactId>
+ <version>@version@</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-test-framework</artifactId>
+ <packaging>jar</packaging>
+ <name>Lucene Test Framework</name>
+ <description>Apache Lucene Java Test Framework</description>
+ <properties>
+ <module-directory>lucene/src/test-framework</module-directory>
+ <build-directory>../../build</build-directory>
+ </properties>
+ <dependencies>
+ <dependency>
+ <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>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </testResource>
+ </testResources>
+ <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>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template Sun Feb 6 09:40:49 2011
@@ -76,7 +76,7 @@
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/clustering/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/clustering/pom.xml.template?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/clustering/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/clustering/pom.xml.template Sun Feb 6 09:40:49 2011
@@ -61,7 +61,7 @@
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template Sun Feb 6 09:40:49 2011
@@ -68,7 +68,7 @@
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template Sun Feb 6 09:40:49 2011
@@ -61,7 +61,7 @@
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/extraction/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/extraction/pom.xml.template?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/extraction/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/extraction/pom.xml.template Sun Feb 6 09:40:49 2011
@@ -64,7 +64,7 @@
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/uima/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/uima/pom.xml.template?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/uima/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/uima/pom.xml.template Sun Feb 6 09:40:49 2011
@@ -56,7 +56,7 @@
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/pom.xml.template?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/pom.xml.template Sun Feb 6 09:40:49 2011
@@ -48,7 +48,7 @@
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/solrj/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/solrj/pom.xml.template?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/solrj/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/solrj/pom.xml.template Sun Feb 6 09:40:49 2011
@@ -44,7 +44,7 @@
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Modified: lucene/dev/branches/branch_3x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/CHANGES.txt?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/lucene/CHANGES.txt Sun Feb 6 09:40:49 2011
@@ -642,6 +642,10 @@ Build
* LUCENE-2657: Switch from using Maven POM templates to full POMs when
generating Maven artifacts (Steven Rowe)
+* LUCENE-2609: Added jar-test-framework Ant target which packages Lucene's
+ tests' framework classes. (Drew Farris, Grant Ingersoll, Shai Erera,
+ Steven Rowe)
+
Test Cases
* LUCENE-2037 Allow Junit4 tests in our environment (Erick Erickson
Modified: lucene/dev/branches/branch_3x/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/build.xml?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/build.xml Sun Feb 6 09:40:49 2011
@@ -17,7 +17,8 @@
limitations under the License.
-->
-<project name="core" default="default" basedir=".">
+<project name="core" default="default" basedir="."
+ xmlns:artifact="antlib:org.apache.maven.artifact.ant">
<property name="junit.includes" value="**/Test*.java"/>
@@ -37,12 +38,13 @@
<path refid="classpath"/>
<path refid="junit-path"/>
<path refid="ant-path"/>
+ <pathelement location="${build.dir}/classes/test-framework"/>
<pathelement location="${build.dir}/classes/test"/>
</path>
-
<path id="junit.classpath">
<path refid="junit-path"/>
+ <pathelement location="${build.dir}/classes/test-framework"/>
<pathelement location="${build.dir}/classes/test"/>
<pathelement location="${build.dir}/classes/java"/>
<pathelement path="${java.class.path}"/>
@@ -158,7 +160,7 @@
</target>
<target name="javadocs" description="Generate javadoc"
- depends="javadocs-all, javadocs-core, javadocs-contrib">
+ depends="javadocs-all, javadocs-core, javadocs-contrib, javadocs-test-framework">
<echo file="${javadoc.dir}/index.html" append="false">
<![CDATA[<html><head><title>${Name} ${version} Javadoc Index</title></head>
<body>
@@ -272,7 +274,7 @@
<!-- ================================================================== -->
<!-- -->
<!-- ================================================================== -->
- <target name="package" depends="jar-core, jar-core-test, javadocs, build-contrib, init-dist, changes-to-html"/>
+ <target name="package" depends="jar-core, jar-test-framework, javadocs, build-contrib, init-dist, changes-to-html"/>
<target name="nightly" depends="test, package-tgz">
</target>
@@ -402,7 +404,7 @@
<target name="dist-all" depends="dist, dist-src"/>
- <target name="generate-maven-artifacts" depends="maven.ant.tasks-check, package, jar-src, javadocs">
+ <target name="generate-maven-artifacts" depends="maven.ant.tasks-check, package, jar-src, jar-test-framework-src, javadocs">
<sequential>
<ant target="get-maven-poms" dir=".."/>
@@ -418,6 +420,22 @@
classifier="tests"/>
</artifact-attachments>
</m2-deploy>
+
+ <artifact:install-provider artifactId="wagon-ssh" version="1.0-beta-7"/>
+ <artifact:pom id="test-framework-pom" file="src/test-framework/pom.xml"/>
+ <artifact:deploy>
+ <attach file="${build.dir}/${final.name}-tests.jar"
+ classifier="tests" />
+ <attach file="${build.dir}/${final.name}-tests-src.jar"
+ classifier="test-sources"/>
+ <attach file="${build.dir}/${final.name}-tests-javadoc.jar"
+ classifier="test-javadoc"/>
+ <remoteRepository url="${m2.repository.url}">
+ <authentication username="${m2.repository.username}" privateKey="${m2.repository.private.key}"/>
+ </remoteRepository>
+ <pom refid="test-framework-pom"/>
+ </artifact:deploy>
+
<contrib-crawl target="dist-maven"/>
</sequential>
</target>
@@ -648,16 +666,30 @@
<patch patchfile="${patch.file}" strip="0"/>
</target>
- <target name="jar-core-test" depends="compile-test">
- <!-- load the list of test files into a property named core.test.files -->
- <property file="../dev-tools/testjar/testfiles" />
- <!-- copy the files so that we can compile and include both .java and .class in the jar -->
- <copy todir="${build.dir}/testjar" >
- <fileset dir="src/test" includes="${core.test.files}" />
- </copy>
- <compile-test-macro srcdir="${build.dir}/testjar" destdir="${build.dir}/testjar"
- test.classpath="test.classpath"/>
- <jarify basedir="${build.dir}/testjar" destfile="${build.dir}/${final.name}-tests.jar"/>
+ <target name="jar-test-framework" depends="compile-test-framework">
+ <jarify basedir="${build.dir}/classes/test-framework" destfile="${build.dir}/${final.name}-tests.jar"
+ title="Lucene Search Engine: Test Framework" />
+ </target>
+
+ <target name="javadocs-test-framework">
+ <sequential>
+ <mkdir dir="${javadoc.dir}/test-framework"/>
+ <invoke-javadoc
+ destdir="${javadoc.dir}/test-framework"
+ title="${Name} ${version} Test Framework API">
+ <sources>
+ <packageset dir="src/test-framework"/>
+ <link href=""/>
+ </sources>
+ </invoke-javadoc>
+ <jarify basedir="${javadoc.dir}/test-framework" destfile="${build.dir}/${final.name}-tests-javadoc.jar"
+ title="Lucene Search Engine: Test Framework" />
+ </sequential>
+ </target>
+
+ <target name="jar-test-framework-src" depends="init">
+ <jarify basedir="${tests-framework.src.dir}" destfile="${build.dir}/${final.name}-tests-src.jar"
+ title="Lucene Search Engine: Test Framework" />
</target>
</project>
Modified: lucene/dev/branches/branch_3x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/common-build.xml?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/common-build.xml Sun Feb 6 09:40:49 2011
@@ -112,6 +112,7 @@
<property name="src.dir" location="src/java"/>
<property name="tests.src.dir" location="src/test"/>
+ <property name="tests-framework.src.dir" location="${common.dir}/src/test-framework"/>
<property name="build.dir" location="build"/>
<property name="dist.dir" location="dist"/>
<property name="maven.dist.dir" location="dist/maven"/>
@@ -357,6 +358,8 @@
<macrodef name="jarify" description="Builds a JAR file">
<attribute name="basedir" default="${build.dir}/classes/java"/>
<attribute name="destfile" default="${build.dir}/${final.name}.jar"/>
+ <attribute name="title" default="Lucene Search Engine: ${ant.project.name}"/>
+ <attribute name="excludes" default="**/pom.xml"/>
<element name="manifest-attributes" optional="yes"/>
<element name="metainf-includes" optional="yes"/>
<sequential>
@@ -366,12 +369,13 @@
<arg line="."/>
</exec>
- <build-manifest/>
+ <build-manifest title="@{title}"/>
<jar
destfile="@{destfile}"
basedir="@{basedir}"
- manifest="${manifest.file}">
+ manifest="${manifest.file}"
+ excludes="@{excludes}">
<manifest>
<manifest-attributes/>
</manifest>
@@ -384,7 +388,12 @@
</sequential>
</macrodef>
- <target name="compile-test" depends="compile-core">
+ <target name="compile-test-framework" depends="compile-core">
+ <compile-test-macro srcdir="${tests-framework.src.dir}" destdir="${common.dir}/build/classes/test-framework"
+ test.classpath="test.classpath"/>
+ </target>
+
+ <target name="compile-test" depends="compile-test-framework">
<compile-test-macro srcdir="${tests.src.dir}" destdir="${build.dir}/classes/test"
test.classpath="test.classpath"/>
</target>
@@ -545,6 +554,9 @@
<fileset dir="${src.dir}">
<include name="org/apache/**/*.java" />
</fileset>
+ <testsources dir="${tests-framework.src.dir}">
+ <include name="org/apache/**/*.java" />
+ </testsources>
<testsources dir="${tests.src.dir}">
<include name="org/apache/**/*.java" />
</testsources>
@@ -575,6 +587,9 @@
<fileset dir="contrib" id="clover.contrib.test.src.files">
<include name="**/test/**/*.java"/>
</fileset>
+ <fileset dir="${tests-framework.src.dir}" id="clover.test.src.files">
+ <include name="**/*.java" />
+ </fileset>
<fileset dir="${tests.src.dir}" id="clover.test.src.files">
<include name="**/*.java" />
</fileset>
@@ -645,6 +660,7 @@
description="runs the tasks over source and test files">
<rat:report xmlns:rat="antlib:org.apache.rat.anttasks">
<fileset dir="${src.dir}"/>
+ <fileset dir="${tests-framework.src.dir}"/>
<fileset dir="${tests.src.dir}"/>
</rat:report>
</target>
Modified: lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/build.xml?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/build.xml Sun Feb 6 09:40:49 2011
@@ -28,13 +28,6 @@
<property name="maven.dist.dir" location="../../../dist/maven" />
<import file="../../contrib-build.xml"/>
-
- <path id="test.classpath">
- <path refid="classpath"/>
- <pathelement location="../../../build/classes/test/"/>
- <path refid="junit-path"/>
- <pathelement location="${build.dir}/classes/java"/>
- </path>
<target name="compile-core" depends="jflex-notice, common.compile-core"/>
Modified: lucene/dev/branches/branch_3x/lucene/contrib/analyzers/smartcn/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/smartcn/build.xml?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/analyzers/smartcn/build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/analyzers/smartcn/build.xml Sun Feb 6 09:40:49 2011
@@ -28,11 +28,5 @@
<property name="maven.dist.dir" location="../../../dist/maven" />
<import file="../../contrib-build.xml"/>
-
- <path id="test.classpath">
- <path refid="classpath"/>
- <pathelement location="../../../build/classes/test/"/>
- <path refid="junit-path"/>
- <pathelement location="${build.dir}/classes/java"/>
- </path>
+
</project>
Modified: lucene/dev/branches/branch_3x/lucene/contrib/analyzers/stempel/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/stempel/build.xml?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/analyzers/stempel/build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/analyzers/stempel/build.xml Sun Feb 6 09:40:49 2011
@@ -28,11 +28,5 @@
<property name="maven.dist.dir" location="../../../dist/maven" />
<import file="../../contrib-build.xml"/>
-
- <path id="test.classpath">
- <path refid="classpath"/>
- <pathelement location="../../../build/classes/test/"/>
- <path refid="junit-path"/>
- <pathelement location="${build.dir}/classes/java"/>
- </path>
+
</project>
Modified: lucene/dev/branches/branch_3x/lucene/contrib/contrib-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/contrib-build.xml?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/contrib-build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/contrib-build.xml Sun Feb 6 09:40:49 2011
@@ -40,6 +40,7 @@
<path id="test.base.classpath">
<path refid="classpath"/>
+ <pathelement location="${common.dir}/build/classes/test-framework"/>
<pathelement location="${common.dir}/build/classes/test"/>
<path refid="junit-path"/>
<pathelement location="${build.dir}/classes/java"/>
@@ -50,7 +51,6 @@
<path id="junit.classpath">
<path refid="test.classpath"/>
<pathelement location="${build.dir}/classes/test"/>
- <pathelement location="${build.dir}/classes/java"/>
<pathelement path="${java.class.path}"/>
</path>
Modified: lucene/dev/branches/branch_3x/lucene/contrib/db/bdb-je/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/db/bdb-je/build.xml?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/db/bdb-je/build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/db/bdb-je/build.xml Sun Feb 6 09:40:49 2011
@@ -39,13 +39,6 @@
<import file="../../contrib-build.xml" />
- <path id="test.classpath">
- <path refid="classpath"/>
- <pathelement location="../../../build/classes/test/"/>
- <path refid="junit-path"/>
- <pathelement location="${build.dir}/classes/java"/>
- </path>
-
<target name="get-je-jar" unless="je.jar.exists">
<mkdir dir="lib" />
<get src="http://download.oracle.com/maven/com/sleepycat/je/${je.version}/je-${je.version}.jar"
Modified: lucene/dev/branches/branch_3x/lucene/contrib/db/bdb/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/db/bdb/build.xml?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/db/bdb/build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/db/bdb/build.xml Sun Feb 6 09:40:49 2011
@@ -39,13 +39,6 @@
<import file="../../contrib-build.xml" />
- <path id="test.classpath">
- <path refid="classpath"/>
- <pathelement location="../../../build/classes/test/"/>
- <path refid="junit-path"/>
- <pathelement location="${build.dir}/classes/java"/>
- </path>
-
<target name="get-db-jar" unless="db.jar.exists">
<mkdir dir="lib" />
<get src="http://downloads.osafoundation.org/db/db-${db.version}.jar"
Modified: lucene/dev/branches/branch_3x/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/build.xml?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/build.xml Sun Feb 6 09:40:49 2011
@@ -342,7 +342,7 @@
<path refid="compile.classpath.solrj" />
<pathelement location="${dest}/solr"/>
<pathelement location="${dest}/solrj"/> <!-- include solrj -->
- <pathelement location="${common-solr.dir}/../lucene/build/classes/test" /> <!-- include some lucene test code -->
+ <pathelement location="${common-solr.dir}/../lucene/build/classes/test-framework" /> <!-- include some lucene test code -->
</path>
<path id="test.run.classpath">
@@ -350,7 +350,7 @@
<pathelement location="${dest}/tests"/>
<!-- include the solrj classpath and jetty files included in example -->
<path refid="compile.classpath.solrj" />
- <pathelement location="${common-solr.dir}/../lucene/build/classes/test" /> <!-- include some lucene test code -->
+ <pathelement location="${common-solr.dir}/../lucene/build/classes/test-framework" /> <!-- include some lucene test code -->
<pathelement path="${java.class.path}"/>
</path>
Modified: lucene/dev/branches/branch_3x/solr/contrib/analysis-extras/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/analysis-extras/build.xml?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/analysis-extras/build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/analysis-extras/build.xml Sun Feb 6 09:40:49 2011
@@ -73,7 +73,7 @@
<pathelement path="${dest}/test-classes"/>
<pathelement path="${java.class.path}"/>
<pathelement location="${common-solr.dir}/build/tests"/> <!-- include solr test code -->
- <pathelement location="${common-solr.dir}/../lucene/build/classes/test" /> <!-- include some lucene test code -->
+ <pathelement location="${common-solr.dir}/../lucene/build/classes/test-framework" /> <!-- include some lucene test code -->
<path refid="common.classpath"/>
</path>
Modified: lucene/dev/branches/branch_3x/solr/contrib/clustering/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/clustering/build.xml?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/clustering/build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/clustering/build.xml Sun Feb 6 09:40:49 2011
@@ -42,7 +42,7 @@
<pathelement path="${dest}/test-classes"/>
<pathelement path="${java.class.path}"/>
<pathelement location="${common-solr.dir}/build/tests"/> <!-- include solr test code -->
- <pathelement location="${common-solr.dir}/../lucene/build/classes/test" /> <!-- include some lucene test code -->
+ <pathelement location="${common-solr.dir}/../lucene/build/classes/test-framework" /> <!-- include some lucene test code -->
<path refid="common.classpath"/>
<!-- DistributedClusteringComponentTest uses Jetty -->
<fileset dir="${solr-path}/example/lib">
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/build.xml?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/build.xml Sun Feb 6 09:40:49 2011
@@ -56,7 +56,7 @@
<pathelement path="target/classes" />
<pathelement path="target/test-classes" />
<pathelement location="${solr-path}/build/tests"/> <!-- include solr test code -->
- <pathelement location="${solr-path}/../lucene/build/classes/test" /> <!-- include some lucene test code -->
+ <pathelement location="${solr-path}/../lucene/build/classes/test-framework" /> <!-- include some lucene test code -->
<pathelement path="${java.class.path}"/>
</path>
@@ -68,7 +68,7 @@
<pathelement path="target/test-classes" />
<pathelement path="target/extras/test-classes" />
<pathelement location="${solr-path}/build/tests"/> <!-- include solr test code -->
- <pathelement location="${solr-path}/../lucene/build/classes/test" /> <!-- include some lucene test code -->
+ <pathelement location="${solr-path}/../lucene/build/classes/test-framework" /> <!-- include some lucene test code -->
<pathelement path="${java.class.path}"/>
</path>
Modified: lucene/dev/branches/branch_3x/solr/contrib/extraction/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/extraction/build.xml?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/extraction/build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/extraction/build.xml Sun Feb 6 09:40:49 2011
@@ -40,7 +40,7 @@
<pathelement path="${dest}/classes" />
<pathelement path="${dest}/test-classes" />
<pathelement location="${solr-path}/build/tests"/> <!-- include solr test code -->
- <pathelement location="${solr-path}/../lucene/build/classes/test" /> <!-- include some lucene test code -->
+ <pathelement location="${solr-path}/../lucene/build/classes/test-framework" /> <!-- include some lucene test code -->
<pathelement path="${java.class.path}"/>
</path>
Modified: lucene/dev/branches/branch_3x/solr/contrib/uima/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/uima/build.xml?rev=1067623&r1=1067622&r2=1067623&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/uima/build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/uima/build.xml Sun Feb 6 09:40:49 2011
@@ -41,7 +41,7 @@
<pathelement path="${dest}/classes" />
<pathelement path="${dest}/test-classes" />
<pathelement location="${solr-path}/build/tests"/> <!-- include solr test code -->
- <pathelement location="${solr-path}/../lucene/build/classes/test" /> <!-- include some lucene test code -->
+ <pathelement location="${solr-path}/../lucene/build/classes/test-framework" /> <!-- include some lucene test code -->
<pathelement path="${java.class.path}"/>
</path>