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/02/09 02:04:13 UTC
svn commit: r1068718 [2/21] - in /lucene/dev/branches/bulkpostings: ./
dev-tools/eclipse/ dev-tools/idea/.idea/ dev-tools/idea/lucene/
dev-tools/maven/ dev-tools/maven/lucene/ dev-tools/maven/lucene/contrib/ant/
dev-tools/maven/lucene/contrib/db/bdb-je...
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=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/eclipse/dot.classpath Wed Feb 9 01:03: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/ant/src/java"/>
<classpathentry kind="src" path="lucene/contrib/ant/src/resources"/>
@@ -92,8 +93,8 @@
<classpathentry kind="lib" path="modules/benchmark/lib/commons-compress-1.0.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.10.0.jar"/>
- <classpathentry kind="lib" path="modules/benchmark/lib/xml-apis-2.10.0.jar"/>
+ <classpathentry kind="lib" path="modules/benchmark/lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar"/>
+ <classpathentry kind="lib" path="modules/benchmark/lib/xml-apis-2.9.0.jar"/>
<classpathentry kind="lib" path="solr/lib/apache-solr-noggit-r944541.jar"/>
<classpathentry kind="lib" path="solr/lib/commons-beanutils-1.7.0.jar"/>
<classpathentry kind="lib" path="solr/lib/commons-codec-1.4.jar"/>
Modified: lucene/dev/branches/bulkpostings/dev-tools/idea/.idea/workspace.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/idea/.idea/workspace.xml?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/idea/.idea/workspace.xml (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/idea/.idea/workspace.xml Wed Feb 9 01:03:49 2011
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
- <component name="RunManager">
+ <component name="RunManager" selected="JUnit.lucene">
<configuration default="false" name="analysis-extras contrib" type="JUnit" factoryName="JUnit">
<module name="analysis-extras" />
<option name="TEST_OBJECT" value="package" />
@@ -92,7 +92,7 @@
<option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
- <configuration default="true" name="lucene" type="JUnit" factoryName="JUnit">
+ <configuration default="false" name="lucene" type="JUnit" factoryName="JUnit">
<module name="lucene" />
<option name="TEST_OBJECT" value="package" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build" />
Modified: lucene/dev/branches/bulkpostings/dev-tools/idea/lucene/lucene.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/idea/lucene/lucene.iml?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/idea/lucene/lucene.iml (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/idea/lucene/lucene.iml Wed Feb 9 01:03:49 2011
@@ -6,6 +6,7 @@
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/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/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=1068718&r1=1068717&r2=1068718&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 Wed Feb 9 01:03: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/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=1068718&r1=1068717&r2=1068718&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 Wed Feb 9 01:03: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/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=1068718&r1=1068717&r2=1068718&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 Wed Feb 9 01:03: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/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=1068718&r1=1068717&r2=1068718&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 Wed Feb 9 01:03: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/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=1068718&r1=1068717&r2=1068718&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 Wed Feb 9 01:03: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/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=1068718&r1=1068717&r2=1068718&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 Wed Feb 9 01:03: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/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=1068718&r1=1068717&r2=1068718&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 Wed Feb 9 01:03: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/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=1068718&r1=1068717&r2=1068718&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 Wed Feb 9 01:03: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/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=1068718&r1=1068717&r2=1068718&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 Wed Feb 9 01:03: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-common</artifactId>
<version>${project.version}</version>
</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=1068718&r1=1068717&r2=1068718&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 Wed Feb 9 01:03: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>jakarta-regexp</groupId>
<artifactId>jakarta-regexp</artifactId>
</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=1068718&r1=1068717&r2=1068718&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 Wed Feb 9 01:03: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/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=1068718&r1=1068717&r2=1068718&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 Wed Feb 9 01:03: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/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=1068718&r1=1068717&r2=1068718&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 Wed Feb 9 01:03: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/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=1068718&r1=1068717&r2=1068718&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 Wed Feb 9 01:03: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/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=1068718&r1=1068717&r2=1068718&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 Wed Feb 9 01:03: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/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=1068718&r1=1068717&r2=1068718&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 Wed Feb 9 01:03: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/bulkpostings/dev-tools/maven/lucene/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/pom.xml.template?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/pom.xml.template (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/pom.xml.template Wed Feb 9 01:03: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/bulkpostings/dev-tools/maven/lucene/src/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/src/pom.xml.template?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/src/pom.xml.template (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/src/pom.xml.template Wed Feb 9 01:03: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>
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=1068718&r1=1068717&r2=1068718&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 Wed Feb 9 01:03: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/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=1068718&r1=1068717&r2=1068718&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 Wed Feb 9 01:03: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-common</artifactId>
<version>${project.version}</version>
</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=1068718&r1=1068717&r2=1068718&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 Wed Feb 9 01:03: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/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=1068718&r1=1068717&r2=1068718&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 Wed Feb 9 01:03: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/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=1068718&r1=1068717&r2=1068718&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 Wed Feb 9 01:03: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/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=1068718&r1=1068717&r2=1068718&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 Wed Feb 9 01:03: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/bulkpostings/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/maven/pom.xml.template?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/maven/pom.xml.template Wed Feb 9 01:03:49 2011
@@ -365,12 +365,12 @@
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.10.0</version>
+ <version>2.9.1-patched-XERCESJ-1257</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
- <version>2.10.0</version>
+ <version>2.9.0</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -640,9 +640,9 @@
<configuration>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.10.0</version>
+ <version>2.9.1-patched-XERCESJ-1257</version>
<packaging>jar</packaging>
- <file>modules/benchmark/lib/xercesImpl-2.10.0.jar</file>
+ <file>modules/benchmark/lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar</file>
</configuration>
</execution>
<execution>
@@ -654,9 +654,9 @@
<configuration>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
- <version>2.10.0</version>
+ <version>2.9.0</version>
<packaging>jar</packaging>
- <file>modules/benchmark/lib/xml-apis-2.10.0.jar</file>
+ <file>modules/benchmark/lib/xml-apis-2.9.0.jar</file>
</configuration>
</execution>
<execution>
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=1068718&r1=1068717&r2=1068718&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 Wed Feb 9 01:03: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/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=1068718&r1=1068717&r2=1068718&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 Wed Feb 9 01:03: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/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=1068718&r1=1068717&r2=1068718&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 Wed Feb 9 01:03: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/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=1068718&r1=1068717&r2=1068718&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 Wed Feb 9 01:03: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/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=1068718&r1=1068717&r2=1068718&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 Wed Feb 9 01:03: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/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=1068718&r1=1068717&r2=1068718&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 Wed Feb 9 01:03: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/bulkpostings/dev-tools/maven/solr/src/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/maven/solr/src/pom.xml.template?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/maven/solr/src/pom.xml.template (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/maven/solr/src/pom.xml.template Wed Feb 9 01:03: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/bulkpostings/dev-tools/maven/solr/src/solrj/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/dev-tools/maven/solr/src/solrj/pom.xml.template?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/dev-tools/maven/solr/src/solrj/pom.xml.template (original)
+++ lucene/dev/branches/bulkpostings/dev-tools/maven/solr/src/solrj/pom.xml.template Wed Feb 9 01:03: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/bulkpostings/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/CHANGES.txt?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/bulkpostings/lucene/CHANGES.txt Wed Feb 9 01:03:49 2011
@@ -118,6 +118,10 @@ Changes in backwards compatibility polic
ParallelMultiSearcher into IndexSearcher as an optional
ExecutorServiced passed to its ctor. (Mike McCandless)
+* LUCENE-2908: Removed serialization code from lucene classes. It is recommended
+ that you serialize user search needs at a higher level in your application.
+ (Robert Muir)
+
* LUCENE-2831: Changed Weight#scorer, Weight#explain & Filter#getDocIdSet to
operate on a AtomicReaderContext instead of directly on IndexReader to enable
searches to be aware of IndexSearcher's context. (Simon Willnauer)
@@ -150,6 +154,12 @@ Changes in Runtime Behavior
* LUCENE-2720: IndexWriter throws IndexFormatTooOldException on open, rather
than later when e.g. a merge starts. (Shai Erera, Mike McCandless, Uwe Schindler)
+* LUCENE-1076: The default merge policy is now able to merge
+ non-contiguous segments, which means docIDs no longer necessarily
+ say "in order". If this is a problem then you can use either of the
+ LogMergePolicy impls, and call setRequireContiguousMerge(true).
+ (Mike McCandless)
+
API Changes
* LUCENE-2302, LUCENE-1458, LUCENE-2111, LUCENE-2514: Terms are no longer
@@ -324,6 +334,9 @@ Optimizations
seek the term dictionary in TermQuery / TermWeight.
(Simon Willnauer, Mike McCandless, Robert Muir)
+* LUCENE-2897: Apply deleted terms while flushing a segment. We still
+ buffer deleted terms to later apply to past segments. (Mike McCandless)
+
Bug fixes
* LUCENE-2633: PackedInts Packed32 and Packed64 did not support internal
@@ -629,7 +642,20 @@ API Changes
it should keep it itself. Fixed Scorers to pass their parent Weight, so that
Scorer.visitSubScorers (LUCENE-2590) will work correctly.
(Robert Muir, Doron Cohen)
-
+
+* LUCENE-2900: When opening a near-real-time (NRT) reader
+ (IndexReader.re/open(IndexWriter)) you can now specify whether
+ deletes should be applied. Applying deletes can be costly, and some
+ expert use cases can handle seeing deleted documents returned. The
+ deletes remain buffered so that the next time you open an NRT reader
+ and pass true, all deletes will be a applied. (Mike McCandless)
+
+* LUCENE-1253: LengthFilter (and Solr's KeepWordTokenFilter) now
+ require up front specification of enablePositionIncrement. Together with
+ StopFilter they have a common base class (FilteringTokenFilter) that handles
+ the position increments automatically. Implementors only need to override an
+ accept() method that filters tokens. (Uwe Schindler, Robert Muir)
+
Bug fixes
* LUCENE-2249: ParallelMultiSearcher should shut down thread pool on
@@ -698,6 +724,12 @@ Bug fixes
* LUCENE-2693: RAM used by IndexWriter was slightly incorrectly computed.
(Jason Rutherglen via Shai Erera)
+* LUCENE-1846: DateTools now uses the US locale everywhere, so DateTools.round()
+ is safe also in strange locales. (Uwe Schindler)
+
+* LUCENE-2891: IndexWriterConfig did not accept -1 in setReaderTermIndexDivisor,
+ which can be used to prevent loading the terms index into memory. (Shai Erera)
+
New features
* LUCENE-2128: Parallelized fetching document frequencies during weight
@@ -722,8 +754,8 @@ New features
stopwords, and implement many analyzers in contrib with it.
(Simon Willnauer via Robert Muir)
-* LUCENE-2198: Support protected words in stemming TokenFilters using a
- new KeywordAttribute. (Simon Willnauer via Uwe Schindler)
+* LUCENE-2198, LUCENE-2901: Support protected words in stemming TokenFilters using a
+ new KeywordAttribute. (Simon Willnauer, Drew Farris via Uwe Schindler)
* LUCENE-2183, LUCENE-2240, LUCENE-2241: Added Unicode 4 support
to CharTokenizer and its subclasses. CharTokenizer now has new
@@ -812,6 +844,11 @@ New features
* LUCENE-2864: Add getMaxTermFrequency (maximum within-document TF) to
FieldInvertState so that it can be used in Similarity.computeNorm.
(Robert Muir)
+
+* LUCENE-2474: Added expert ReaderFinishedListener API to
+ IndexReader, to allow apps that maintain external per-segment caches
+ to evict entries when a segment is finished. (Shay Banon, Yonik
+ Seeley, Mike McCandless)
Optimizations
@@ -911,6 +948,10 @@ Optimizations
* LUCENE-2010: Segments with 100% deleted documents are now removed on
IndexReader or IndexWriter commit. (Uwe Schindler, Mike McCandless)
+* LUCENE-1472: Removed synchronization from static DateTools methods
+ by using a ThreadLocal. Also converted DateTools.Resolution to a
+ Java 5 enum (this should not break backwards). (Uwe Schindler)
+
Build
* LUCENE-2124: Moved the JDK-based collation support from contrib/collation
@@ -941,6 +982,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
@@ -990,6 +1035,9 @@ Documentation
* LUCENE-2625: Add a note to IndexReader.termDocs() with additional verbiage
that the TermEnum must be seeked since it is unpositioned.
(Adriano Crestani via Robert Muir)
+
+* LUCENE-2894: Use google-code-prettify for syntax highlighting in javadoc.
+ (Koji Sekiguchi)
================== Release 2.9.4 / 3.0.3 2010-12-03 ====================
Modified: lucene/dev/branches/bulkpostings/lucene/NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/NOTICE.txt?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/NOTICE.txt (original)
+++ lucene/dev/branches/bulkpostings/lucene/NOTICE.txt Wed Feb 9 01:03:49 2011
@@ -27,3 +27,6 @@ The class org.apache.lucene.SorterTempla
the same name. The implementation part is mainly done using pre-existing
Lucene sorting code. In-place stable mergesort was borrowed from CGLIB,
which is Apache-licensed.
+
+The Google Code Prettify is Apache License 2.0.
+See http://code.google.com/p/google-code-prettify/
Modified: lucene/dev/branches/bulkpostings/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/build.xml?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/build.xml (original)
+++ lucene/dev/branches/bulkpostings/lucene/build.xml Wed Feb 9 01:03: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"/>
@@ -32,12 +33,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}"/>
@@ -48,7 +50,7 @@
excludes="contrib/db/*/lib/,contrib/*/ext-libs/,src/site/build/"
/>
<patternset id="binary.build.dist.patterns"
- includes="${final.name}.jar,docs/,contrib/*/*.jar,contrib/*/*.war, contrib/*/*/*.jar"
+ includes="${final.name}*.jar,docs/,contrib/*/*.jar,contrib/*/*.war, contrib/*/*/*.jar"
/>
<patternset id="binary.root.dist.patterns"
includes="docs/,*.txt,contrib/*/README*,**/CHANGES.txt"
@@ -153,7 +155,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>
@@ -259,7 +261,7 @@
<!-- ================================================================== -->
<!-- -->
<!-- ================================================================== -->
- <target name="package" depends="jar-core, 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>
@@ -389,7 +391,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=".."/>
@@ -401,8 +403,26 @@
classifier="sources"/>
<attach file="${build.dir}/${final.name}-javadoc.jar"
classifier="javadoc"/>
+ <attach file="${build.dir}/${final.name}-tests.jar"
+ classifier="tests"/>
</artifact-attachments>
</m2-deploy>
+
+ <artifact:install-provider artifactId="wagon-ssh" version="1.0-beta-7"/>
+ <artifact:pom id="test-framework-pom" file="src/test-framework/pom.xml"/>
+ <artifact:deploy>
+ <attach file="${build.dir}/${final.name}-tests.jar"
+ classifier="tests" />
+ <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>
@@ -600,20 +620,30 @@
<patch patchfile="${patch.file}" strip="0"/>
</target>
- <target name="rat-sources-typedef">
- <typedef resource="org/apache/rat/anttasks/antlib.xml" uri="antlib:rat.anttasks">
- <classpath>
- <fileset dir="." includes="rat*.jar"/>
- </classpath>
- </typedef>
+ <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="rat-sources" depends="rat-sources-typedef"
- description="runs the tasks over src/java">
- <rat:report xmlns:rat="antlib:org.apache.rat.anttasks">
- <fileset dir="src/java">
- </fileset>
- </rat:report>
+ <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/bulkpostings/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/common-build.xml?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/common-build.xml (original)
+++ lucene/dev/branches/bulkpostings/lucene/common-build.xml Wed Feb 9 01:03:49 2011
@@ -25,6 +25,9 @@
<dirname file="${ant.file.common}" property="common.dir"/>
+ <property name="dev-tools.dir" value="${common.dir}/../dev-tools"/>
+ <property name="prettify.dir" value="${dev-tools.dir}/prettify"/>
+
<!-- Give user a chance to override without editing this file
(and without typing -D each time it compiles it -->
<property file="${user.home}/lucene.build.properties"/>
@@ -110,6 +113,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"/>
@@ -360,6 +364,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>
@@ -369,12 +375,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>
@@ -387,7 +394,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>
@@ -550,6 +562,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>
@@ -580,6 +595,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>
@@ -638,6 +656,23 @@
<target name="default" depends="jar-core"/>
+ <target name="rat-sources-typedef">
+ <typedef resource="org/apache/rat/anttasks/antlib.xml" uri="antlib:rat.anttasks">
+ <classpath>
+ <fileset dir="." includes="rat*.jar"/>
+ </classpath>
+ </typedef>
+ </target>
+
+ <target name="rat-sources" depends="rat-sources-typedef"
+ 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>
+
<!--+
| M A C R O S
+-->
@@ -693,6 +728,9 @@
<attribute name="destdir"/>
<attribute name="title" default="${Name} ${version} API"/>
<sequential>
+ <copy todir="@{destdir}/../prettify" overwrite="false">
+ <fileset dir="${prettify.dir}"/>
+ </copy>
<javadoc
overview="${src.dir}/overview.html"
packagenames="org.apache.lucene.*"
@@ -708,6 +746,7 @@
link="${javadoc.link}"
windowtitle="${Name} ${version} API"
doctitle="@{title}"
+ stylesheetfile="@{destdir}/../prettify/stylesheet+prettify.css"
maxmemory="${javadoc.maxmemory}"
bottom="Copyright &copy; ${year} Apache Software Foundation. All Rights Reserved.">
<tag name="lucene.experimental"
@@ -715,6 +754,10 @@
<tag name="lucene.internal"
description="NOTE: This API is for Lucene internal purposes only and might change in incompatible ways in the next release."/>
<link offline="true" packagelistLoc="${javadoc.dir}"/>
+ <header><![CDATA[
+ <script src="{@docRoot}/../prettify/prettify.js" type="text/javascript"></script>
+ <script language="JavaScript">window.onload=function(){windowTitle();prettyPrint();}</script>
+ ]]></header>
<sources />
Modified: lucene/dev/branches/bulkpostings/lucene/contrib/contrib-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/contrib/contrib-build.xml?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/contrib/contrib-build.xml (original)
+++ lucene/dev/branches/bulkpostings/lucene/contrib/contrib-build.xml Wed Feb 9 01:03: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/bulkpostings/lucene/contrib/db/bdb-je/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/contrib/db/bdb-je/build.xml?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/contrib/db/bdb-je/build.xml (original)
+++ lucene/dev/branches/bulkpostings/lucene/contrib/db/bdb-je/build.xml Wed Feb 9 01:03: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/bulkpostings/lucene/contrib/db/bdb/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/contrib/db/bdb/build.xml?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/contrib/db/bdb/build.xml (original)
+++ lucene/dev/branches/bulkpostings/lucene/contrib/db/bdb/build.xml Wed Feb 9 01:03: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/bulkpostings/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/package.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/package.html?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/package.html (original)
+++ lucene/dev/branches/bulkpostings/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/package.html Wed Feb 9 01:03:49 2011
@@ -66,7 +66,7 @@ sample text.</p>
<h3>Step 1.</h3>
<p>In Step 1, Fast Vector Highlighter generates {@link org.apache.lucene.search.vectorhighlight.FieldQuery.QueryPhraseMap} from the user query.
<code>QueryPhraseMap</code> consists of the following members:</p>
-<pre>
+<pre class="prettyprint">
public class QueryPhraseMap {
boolean terminal;
int slop; // valid if terminal == true and phraseHighlight == true
Modified: lucene/dev/branches/bulkpostings/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java Wed Feb 9 01:03:49 2011
@@ -70,7 +70,7 @@ public class HighlighterPhraseTest exten
final IndexReader indexReader = IndexReader.open(directory, true);
try {
assertEquals(1, indexReader.numDocs());
- final IndexSearcher indexSearcher = new IndexSearcher(indexReader);
+ final IndexSearcher indexSearcher = newSearcher(indexReader);
try {
final PhraseQuery phraseQuery = new PhraseQuery();
phraseQuery.add(new Term(FIELD, "fox"));
@@ -114,7 +114,7 @@ public class HighlighterPhraseTest exten
final IndexReader indexReader = IndexReader.open(directory, true);
try {
assertEquals(1, indexReader.numDocs());
- final IndexSearcher indexSearcher = new IndexSearcher(indexReader);
+ final IndexSearcher indexSearcher = newSearcher(indexReader);
try {
final Query phraseQuery = new SpanNearQuery(new SpanQuery[] {
new SpanTermQuery(new Term(FIELD, "fox")),
@@ -184,7 +184,7 @@ public class HighlighterPhraseTest exten
final IndexReader indexReader = IndexReader.open(directory, true);
try {
assertEquals(1, indexReader.numDocs());
- final IndexSearcher indexSearcher = new IndexSearcher(indexReader);
+ final IndexSearcher indexSearcher = newSearcher(indexReader);
try {
final PhraseQuery phraseQuery = new PhraseQuery();
phraseQuery.add(new Term(FIELD, "did"));
@@ -227,7 +227,7 @@ public class HighlighterPhraseTest exten
final IndexReader indexReader = IndexReader.open(directory, true);
try {
assertEquals(1, indexReader.numDocs());
- final IndexSearcher indexSearcher = new IndexSearcher(indexReader);
+ final IndexSearcher indexSearcher = newSearcher(indexReader);
try {
final PhraseQuery phraseQuery = new PhraseQuery();
phraseQuery.add(new Term(FIELD, "did"));
@@ -268,7 +268,7 @@ public class HighlighterPhraseTest exten
final IndexReader indexReader = IndexReader.open(directory, true);
try {
assertEquals(1, indexReader.numDocs());
- final IndexSearcher indexSearcher = new IndexSearcher(indexReader);
+ final IndexSearcher indexSearcher = newSearcher(indexReader);
try {
final Query phraseQuery = new SpanNearQuery(new SpanQuery[] {
new SpanTermQuery(new Term(FIELD, "did")),
Modified: lucene/dev/branches/bulkpostings/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java Wed Feb 9 01:03:49 2011
@@ -113,7 +113,7 @@ public class TokenSourcesTest extends Lu
final IndexReader indexReader = IndexReader.open(directory, true);
try {
assertEquals(1, indexReader.numDocs());
- final IndexSearcher indexSearcher = new IndexSearcher(indexReader);
+ final IndexSearcher indexSearcher = newSearcher(indexReader);
try {
final DisjunctionMaxQuery query = new DisjunctionMaxQuery(1);
query.add(new SpanTermQuery(new Term(FIELD, "{fox}")));
@@ -159,7 +159,7 @@ public class TokenSourcesTest extends Lu
final IndexReader indexReader = IndexReader.open(directory, true);
try {
assertEquals(1, indexReader.numDocs());
- final IndexSearcher indexSearcher = new IndexSearcher(indexReader);
+ final IndexSearcher indexSearcher = newSearcher(indexReader);
try {
final DisjunctionMaxQuery query = new DisjunctionMaxQuery(1);
query.add(new SpanTermQuery(new Term(FIELD, "{fox}")));
Modified: lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/FieldSetting.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/FieldSetting.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/FieldSetting.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/FieldSetting.java Wed Feb 9 01:03:49 2011
@@ -1,7 +1,5 @@
package org.apache.lucene.store.instantiated;
-import java.io.Serializable;
-
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -22,7 +20,7 @@ import java.io.Serializable;
/**
* For non package access see {@link org.apache.lucene.index.IndexReader#getFieldNames(org.apache.lucene.index.IndexReader.FieldOption)}
*/
-class FieldSetting implements Serializable {
+class FieldSetting {
String fieldName;
boolean storeTermVector = false;
Modified: lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/FieldSettings.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/FieldSettings.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/FieldSettings.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/FieldSettings.java Wed Feb 9 01:03:49 2011
@@ -3,7 +3,6 @@ package org.apache.lucene.store.instanti
import java.util.HashMap;
import java.util.Map;
import java.util.Collection;
-import java.io.Serializable;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -25,7 +24,7 @@ import java.io.Serializable;
/**
* Essentially a Map<FieldName, {@link org.apache.lucene.store.instantiated.FieldSetting}>
*/
-class FieldSettings implements Serializable {
+class FieldSettings {
FieldSettings() {
Modified: lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedDocsAndPositionsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedDocsAndPositionsEnum.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedDocsAndPositionsEnum.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedDocsAndPositionsEnum.java Wed Feb 9 01:03:49 2011
@@ -82,14 +82,17 @@ public class InstantiatedDocsAndPosition
return currentDoc.getTermPositions().length;
}
+ @Override
public int nextPosition() {
return currentDoc.getTermPositions()[++posUpto];
}
+ @Override
public boolean hasPayload() {
return currentDoc.getPayloads()[posUpto] != null;
}
+ @Override
public BytesRef getPayload() {
payload.bytes = currentDoc.getPayloads()[posUpto];
payload.length = payload.bytes.length;
Modified: lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedDocument.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedDocument.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedDocument.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedDocument.java Wed Feb 9 01:03:49 2011
@@ -18,7 +18,6 @@ package org.apache.lucene.store.instanti
import org.apache.lucene.document.Document;
-import java.io.Serializable;
import java.util.List;
import java.util.Map;
@@ -27,10 +26,7 @@ import java.util.Map;
*
* @see org.apache.lucene.document.Document
*/
-public class InstantiatedDocument
- implements Serializable {
-
- private static final long serialVersionUID = 1l;
+public class InstantiatedDocument {
private Document document;
Modified: lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndex.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndex.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndex.java Wed Feb 9 01:03:49 2011
@@ -18,7 +18,6 @@ package org.apache.lucene.store.instanti
import java.io.Closeable;
import java.io.IOException;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -60,9 +59,7 @@ import org.apache.lucene.util.BytesRef;
* Consider using InstantiatedIndex as if it was immutable.
*/
public class InstantiatedIndex
- implements Serializable,Closeable {
-
- private static final long serialVersionUID = 1l;
+ implements Closeable {
private long version = System.currentTimeMillis();
Modified: lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexReader.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexReader.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexReader.java Wed Feb 9 01:03:49 2011
@@ -19,6 +19,7 @@ package org.apache.lucene.store.instanti
import java.io.IOException;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -52,6 +53,7 @@ public class InstantiatedIndexReader ext
public InstantiatedIndexReader(InstantiatedIndex index) {
super();
this.index = index;
+ readerFinishedListeners = Collections.synchronizedSet(new HashSet<ReaderFinishedListener>());
}
/**
Modified: lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexWriter.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexWriter.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexWriter.java Wed Feb 9 01:03:49 2011
@@ -114,14 +114,14 @@ public class InstantiatedIndexWriter imp
* MAddDocs_20000 - 7 4000 100 false - - 1 - - 20000 - - 535,8 - - 37,33 - 309 680 640 - 501 968 896
* </pre>
*
- * @see org.apache.lucene.index.IndexWriter#setMergeFactor(int)
+ * @see org.apache.lucene.index.LogMergePolicy#setMergeFactor(int)
*/
public void setMergeFactor(int mergeFactor) {
this.mergeFactor = mergeFactor;
}
/**
- * @see org.apache.lucene.index.IndexWriter#getMergeFactor()
+ * @see org.apache.lucene.index.LogMergePolicy#getMergeFactor()
*/
public int getMergeFactor() {
return mergeFactor;
Modified: lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTerm.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTerm.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTerm.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTerm.java Wed Feb 9 01:03:49 2011
@@ -16,7 +16,6 @@ package org.apache.lucene.store.instanti
* limitations under the License.
*/
-import java.io.Serializable;
import java.util.Comparator;
import org.apache.lucene.index.Term;
@@ -26,10 +25,7 @@ import org.apache.lucene.index.Term;
*
* @see org.apache.lucene.index.Term
*/
-public class InstantiatedTerm
- implements Serializable {
-
- private static final long serialVersionUID = 1l;
+public class InstantiatedTerm {
public static final Comparator<InstantiatedTerm> comparator = new Comparator<InstantiatedTerm>() {
public int compare(InstantiatedTerm instantiatedTerm, InstantiatedTerm instantiatedTerm1) {
Modified: lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTermDocumentInformation.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTermDocumentInformation.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTermDocumentInformation.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTermDocumentInformation.java Wed Feb 9 01:03:49 2011
@@ -2,7 +2,6 @@ package org.apache.lucene.store.instanti
import org.apache.lucene.index.TermVectorOffsetInfo;
-import java.io.Serializable;
import java.util.Comparator;
/**
@@ -38,10 +37,7 @@ import java.util.Comparator;
* </pre>
*
*/
-public class InstantiatedTermDocumentInformation
- implements Serializable {
-
- private static final long serialVersionUID = 1l;
+public class InstantiatedTermDocumentInformation {
public static final Comparator<InstantiatedTermDocumentInformation> termComparator = new Comparator<InstantiatedTermDocumentInformation>() {
public int compare(InstantiatedTermDocumentInformation instantiatedTermDocumentInformation, InstantiatedTermDocumentInformation instantiatedTermDocumentInformation1) {
Modified: lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTermFreqVector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTermFreqVector.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTermFreqVector.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTermFreqVector.java Wed Feb 9 01:03:49 2011
@@ -3,7 +3,6 @@ package org.apache.lucene.store.instanti
import org.apache.lucene.index.TermFreqVector;
import org.apache.lucene.util.BytesRef;
-import java.io.Serializable;
import java.util.Arrays;
import java.util.List;
@@ -29,9 +28,7 @@ import java.util.List;
* @see org.apache.lucene.index.TermFreqVector
*/
public class InstantiatedTermFreqVector
- implements TermFreqVector, Serializable {
-
- private static final long serialVersionUID = 1l;
+ implements TermFreqVector {
private final List<InstantiatedTermDocumentInformation> termDocumentInformations;
private final String field;
Modified: lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTermPositionVector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTermPositionVector.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTermPositionVector.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTermPositionVector.java Wed Feb 9 01:03:49 2011
@@ -19,8 +19,6 @@ package org.apache.lucene.store.instanti
import org.apache.lucene.index.TermPositionVector;
import org.apache.lucene.index.TermVectorOffsetInfo;
-import java.io.Serializable;
-
/**
* Extended vector space view of a document in an {@link InstantiatedIndexReader}.
*
@@ -28,9 +26,7 @@ import java.io.Serializable;
*/
public class InstantiatedTermPositionVector
extends InstantiatedTermFreqVector
- implements TermPositionVector, Serializable {
-
- private static final long serialVersionUID = 1l;
+ implements TermPositionVector {
public InstantiatedTermPositionVector(InstantiatedDocument document, String field) {
super(document, field);
Modified: lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestEmptyIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestEmptyIndex.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestEmptyIndex.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestEmptyIndex.java Wed Feb 9 01:03:49 2011
@@ -37,7 +37,7 @@ public class TestEmptyIndex extends Luce
InstantiatedIndex ii = new InstantiatedIndex();
IndexReader r = new InstantiatedIndexReader(ii);
- IndexSearcher s = new IndexSearcher(r);
+ IndexSearcher s = newSearcher(r);
TopDocs td = s.search(new TermQuery(new Term("foo", "bar")), 1);
Modified: lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java Wed Feb 9 01:03:49 2011
@@ -65,7 +65,7 @@ public class TestIndicesEquals extends L
// create dir data
IndexWriter indexWriter = new IndexWriter(dir, newIndexWriterConfig(
- TEST_VERSION_CURRENT, new MockAnalyzer()));
+ TEST_VERSION_CURRENT, new MockAnalyzer()).setMergePolicy(newInOrderLogMergePolicy()));
for (int i = 0; i < 20; i++) {
Document document = new Document();
@@ -91,7 +91,7 @@ public class TestIndicesEquals extends L
// create dir data
IndexWriter indexWriter = new IndexWriter(dir, newIndexWriterConfig(
- TEST_VERSION_CURRENT, new MockAnalyzer()));
+ TEST_VERSION_CURRENT, new MockAnalyzer()).setMergePolicy(newInOrderLogMergePolicy()));
indexWriter.setInfoStream(VERBOSE ? System.out : null);
if (VERBOSE) {
System.out.println("TEST: make test index");
Modified: lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestRealTime.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestRealTime.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestRealTime.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestRealTime.java Wed Feb 9 01:03:49 2011
@@ -36,7 +36,7 @@ public class TestRealTime extends Lucene
InstantiatedIndex index = new InstantiatedIndex();
InstantiatedIndexReader reader = new InstantiatedIndexReader(index);
- IndexSearcher searcher = new IndexSearcher(reader);
+ IndexSearcher searcher = newSearcher(reader);
InstantiatedIndexWriter writer = new InstantiatedIndexWriter(index);
Document doc;
Modified: lucene/dev/branches/bulkpostings/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java Wed Feb 9 01:03:49 2011
@@ -18,13 +18,13 @@ package org.apache.lucene.index.memory;
*/
import java.io.IOException;
-import java.io.Serializable;
import java.io.StringReader;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
@@ -186,7 +186,7 @@ import org.apache.lucene.util.Constants;
* hprof tracing </a>).
*
*/
-public class MemoryIndex implements Serializable {
+public class MemoryIndex {
/** info for each field: Map<String fieldName, Info field> */
private final HashMap<String,Info> fields = new HashMap<String,Info>();
@@ -199,8 +199,6 @@ public class MemoryIndex implements Seri
/** Could be made configurable; See {@link Document#setBoost(float)} */
private static final float docBoost = 1.0f;
-
- private static final long serialVersionUID = 2782195016849084649L;
private static final boolean DEBUG = false;
@@ -589,7 +587,7 @@ public class MemoryIndex implements Seri
* Index data structure for a field; Contains the tokenized term texts and
* their positions.
*/
- private static final class Info implements Serializable {
+ private static final class Info {
/**
* Term strings and their positions for this field: Map <String
@@ -614,8 +612,6 @@ public class MemoryIndex implements Seri
private final long sumTotalTermFreq;
- private static final long serialVersionUID = 2882195016849084649L;
-
public Info(HashMap<BytesRef,ArrayIntList> terms, int numTokens, int numOverlapTokens, float boost) {
this.terms = terms;
this.numTokens = numTokens;
@@ -668,12 +664,10 @@ public class MemoryIndex implements Seri
* Efficient resizable auto-expanding list holding <code>int</code> elements;
* implemented with arrays.
*/
- private static final class ArrayIntList implements Serializable {
+ private static final class ArrayIntList {
private int[] elements;
private int size = 0;
-
- private static final long serialVersionUID = 2282195016849084649L;
public ArrayIntList() {
this(10);
@@ -759,6 +753,7 @@ public class MemoryIndex implements Seri
private MemoryIndexReader() {
super(); // avoid as much superclass baggage as possible
+ readerFinishedListeners = Collections.synchronizedSet(new HashSet<ReaderFinishedListener>());
}
private Info getInfo(String fieldName) {
Modified: lucene/dev/branches/bulkpostings/lucene/contrib/misc/src/java/org/apache/lucene/store/NativePosixUtil.cpp
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/contrib/misc/src/java/org/apache/lucene/store/NativePosixUtil.cpp?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/contrib/misc/src/java/org/apache/lucene/store/NativePosixUtil.cpp (original)
+++ lucene/dev/branches/bulkpostings/lucene/contrib/misc/src/java/org/apache/lucene/store/NativePosixUtil.cpp Wed Feb 9 01:03:49 2011
@@ -1,3 +1,20 @@
+/**
+ * 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.
+ */
+
#include <jni.h>
#include <fcntl.h> // posix_fadvise, constants for open
#include <string.h> // strerror
Modified: lucene/dev/branches/bulkpostings/lucene/contrib/misc/src/java/org/apache/lucene/store/WindowsDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/contrib/misc/src/java/org/apache/lucene/store/WindowsDirectory.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/contrib/misc/src/java/org/apache/lucene/store/WindowsDirectory.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/contrib/misc/src/java/org/apache/lucene/store/WindowsDirectory.java Wed Feb 9 01:03:49 2011
@@ -64,6 +64,7 @@ public class WindowsDirectory extends FS
super(path, null);
}
+ @Override
public IndexInput openInput(String name, int bufferSize) throws IOException {
ensureOpen();
return new WindowsIndexInput(new File(getDirectory(), name), Math.max(bufferSize, DEFAULT_BUFFERSIZE));
@@ -82,14 +83,17 @@ public class WindowsDirectory extends FS
isOpen = true;
}
+ @Override
protected void readInternal(byte[] b, int offset, int length) throws IOException {
if (WindowsDirectory.read(fd, b, offset, length, getFilePointer()) != length)
throw new IOException("Read past EOF");
}
+ @Override
protected void seekInternal(long pos) throws IOException {
}
+ @Override
public synchronized void close() throws IOException {
// NOTE: we synchronize and track "isOpen" because Lucene sometimes closes IIs twice!
if (!isClone && isOpen) {
@@ -98,6 +102,7 @@ public class WindowsDirectory extends FS
}
}
+ @Override
public long length() {
return length;
}
Modified: lucene/dev/branches/bulkpostings/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java Wed Feb 9 01:03:49 2011
@@ -54,7 +54,7 @@ public class TestFieldNormModifier exten
super.setUp();
store = newDirectory();
IndexWriter writer = new IndexWriter(store, newIndexWriterConfig(
- TEST_VERSION_CURRENT, new MockAnalyzer()));
+ TEST_VERSION_CURRENT, new MockAnalyzer()).setMergePolicy(newInOrderLogMergePolicy()));
for (int i = 0; i < NUM_DOCS; i++) {
Document d = new Document();
Modified: lucene/dev/branches/bulkpostings/lucene/contrib/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/contrib/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/contrib/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/contrib/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java Wed Feb 9 01:03:49 2011
@@ -32,7 +32,7 @@ public class TestMultiPassIndexSplitter
public void setUp() throws Exception {
super.setUp();
dir = newDirectory();
- IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer()));
+ IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer()).setMergePolicy(newInOrderLogMergePolicy()));
Document doc;
for (int i = 0; i < NUM_DOCS; i++) {
doc = new Document();
Modified: lucene/dev/branches/bulkpostings/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java Wed Feb 9 01:03:49 2011
@@ -59,7 +59,7 @@ public class TestLengthNormModifier exte
super.setUp();
store = newDirectory();
IndexWriter writer = new IndexWriter(store, newIndexWriterConfig(
- TEST_VERSION_CURRENT, new MockAnalyzer()));
+ TEST_VERSION_CURRENT, new MockAnalyzer()).setMergePolicy(newInOrderLogMergePolicy()));
for (int i = 0; i < NUM_DOCS; i++) {
Document d = new Document();