You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2011/05/14 15:51:59 UTC
svn commit: r1103112 [2/24] - in /lucene/dev/branches/flexscoring: ./
dev-tools/eclipse/ dev-tools/idea/.idea/ dev-tools/idea/lucene/contrib/ant/
dev-tools/idea/lucene/contrib/db/bdb-je/
dev-tools/idea/lucene/contrib/db/bdb/ dev-tools/idea/lucene/contr...
Modified: lucene/dev/branches/flexscoring/README.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/README.txt?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/README.txt (original)
+++ lucene/dev/branches/flexscoring/README.txt Sat May 14 13:51:35 2011
@@ -7,6 +7,7 @@ modules/ is shared code
To compile the sources run 'ant compile'
To run all the tests run 'ant test'
To setup your ide run 'ant idea' or 'ant eclipse'
+For Maven info, see dev-tools/maven/README.maven.
For more information on how to contribute see:
http://wiki.apache.org/lucene-java/HowToContribute
Modified: lucene/dev/branches/flexscoring/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/build.xml?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/build.xml (original)
+++ lucene/dev/branches/flexscoring/build.xml Sat May 14 13:51:35 2011
@@ -19,7 +19,7 @@
<project name="lucene-solr" default="test" basedir=".">
<import file="common-build.xml"/>
- <target name="test" description="Test both Lucene and Solr">
+ <target name="test" description="Test both Lucene and Solr" depends="validate">
<sequential>
<subant target="test" inheritall="false" failonerror="true">
<fileset dir="lucene" includes="build.xml" />
@@ -35,7 +35,7 @@
<fileset dir="solr" includes="build.xml" />
</subant></sequential>
</target>
- <target name="compile" depends="validate" description="Compile Lucene and Solr">
+ <target name="compile" description="Compile Lucene and Solr">
<sequential>
<subant target="compile" inheritall="false" failonerror="true">
Modified: lucene/dev/branches/flexscoring/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/eclipse/dot.classpath?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/flexscoring/dev-tools/eclipse/dot.classpath Sat May 14 13:51:35 2011
@@ -57,6 +57,7 @@
<classpathentry kind="src" path="solr/src/webapp/src"/>
<classpathentry kind="src" path="solr/src/common"/>
<classpathentry kind="src" path="solr/src/solrj"/>
+ <classpathentry kind="src" path="solr/src/test-framework"/>
<classpathentry kind="src" path="solr/src/test"/>
<classpathentry kind="src" path="solr/src/test-files"/>
<classpathentry kind="src" path="solr/contrib/analysis-extras/src/java"/>
@@ -94,7 +95,7 @@
<classpathentry kind="lib" path="modules/benchmark/lib/commons-digester-1.7.jar"/>
<classpathentry kind="lib" path="modules/benchmark/lib/commons-logging-1.0.4.jar"/>
<classpathentry kind="lib" path="modules/benchmark/lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar"/>
- <classpathentry kind="lib" path="solr/lib/apache-solr-noggit-r944541.jar"/>
+ <classpathentry kind="lib" path="solr/lib/apache-solr-noggit-r1099557.jar"/>
<classpathentry kind="lib" path="solr/lib/commons-beanutils-1.7.0.jar"/>
<classpathentry kind="lib" path="solr/lib/commons-codec-1.4.jar"/>
<classpathentry kind="lib" path="solr/lib/commons-collections-3.2.1.jar"/>
Modified: lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/ant/ant.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/ant/ant.iml?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/ant/ant.iml (original)
+++ lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/ant/ant.iml Sat May 14 13:51:35 2011
@@ -9,10 +9,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
</content>
- <orderEntry type="module" module-name="common" />
- <orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="queries" />
- <orderEntry type="module" module-name="misc" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
@@ -27,5 +23,9 @@
</orderEntry>
<orderEntry type="library" name="Ant" level="project" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="queries" />
+ <orderEntry type="module" module-name="misc" />
+ <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/db/bdb-je/bdb-je.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/db/bdb-je/bdb-je.iml?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/db/bdb-je/bdb-je.iml (original)
+++ lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/db/bdb-je/bdb-je.iml Sat May 14 13:51:35 2011
@@ -8,8 +8,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
</content>
- <orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="misc" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
@@ -23,5 +21,7 @@
</library>
</orderEntry>
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="misc" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/db/bdb/bdb.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/db/bdb/bdb.iml?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/db/bdb/bdb.iml (original)
+++ lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/db/bdb/bdb.iml Sat May 14 13:51:35 2011
@@ -8,8 +8,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
</content>
- <orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="misc" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
@@ -23,5 +21,7 @@
</library>
</orderEntry>
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="misc" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/demo/demo.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/demo/demo.iml?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/demo/demo.iml (original)
+++ lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/demo/demo.iml Sat May 14 13:51:35 2011
@@ -8,20 +8,10 @@
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
</content>
- <orderEntry type="module" module-name="common" />
- <orderEntry type="module" module-name="lucene" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="file://$MODULE_DIR$/lib" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- <jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" />
- </library>
- </orderEntry>
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/highlighter/highlighter.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/highlighter/highlighter.iml?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/highlighter/highlighter.iml (original)
+++ lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/highlighter/highlighter.iml Sat May 14 13:51:35 2011
@@ -8,12 +8,12 @@
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
</content>
- <orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="memory" />
- <orderEntry type="module" module-name="queries" />
- <orderEntry type="module" module-name="misc" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="memory" />
+ <orderEntry type="module" module-name="queries" />
+ <orderEntry type="module" module-name="misc" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/instantiated/instantiated.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/instantiated/instantiated.iml?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/instantiated/instantiated.iml (original)
+++ lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/instantiated/instantiated.iml Sat May 14 13:51:35 2011
@@ -8,11 +8,11 @@
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
</content>
- <orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="queries" />
- <orderEntry type="module" module-name="misc" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="queries" />
+ <orderEntry type="module" module-name="misc" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/lucli/lucli.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/lucli/lucli.iml?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/lucli/lucli.iml (original)
+++ lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/lucli/lucli.iml Sat May 14 13:51:35 2011
@@ -8,10 +8,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
</content>
- <orderEntry type="module" module-name="common" />
- <orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="queries" />
- <orderEntry type="module" module-name="misc" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
@@ -24,5 +20,9 @@
<jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" />
</library>
</orderEntry>
+ <orderEntry type="module" module-name="queries" />
+ <orderEntry type="module" module-name="misc" />
+ <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/memory/memory.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/memory/memory.iml?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/memory/memory.iml (original)
+++ lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/memory/memory.iml Sat May 14 13:51:35 2011
@@ -8,11 +8,11 @@
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
</content>
- <orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="queries" />
- <orderEntry type="module" module-name="misc" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="queries" />
+ <orderEntry type="module" module-name="misc" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/misc/misc.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/misc/misc.iml?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/misc/misc.iml (original)
+++ lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/misc/misc.iml Sat May 14 13:51:35 2011
@@ -8,10 +8,10 @@
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
</content>
- <orderEntry type="module" module-name="common" />
- <orderEntry type="module" module-name="lucene" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/queries/queries.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/queries/queries.iml?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/queries/queries.iml (original)
+++ lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/queries/queries.iml Sat May 14 13:51:35 2011
@@ -8,8 +8,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
</content>
- <orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="misc" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
@@ -22,5 +20,7 @@
</library>
</orderEntry>
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="misc" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/queryparser/queryparser.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/queryparser/queryparser.iml?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/queryparser/queryparser.iml (original)
+++ lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/queryparser/queryparser.iml Sat May 14 13:51:35 2011
@@ -9,11 +9,11 @@
<sourceFolder url="file://$MODULE_DIR$/src/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
</content>
- <orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="queries" />
- <orderEntry type="module" module-name="misc" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="queries" />
+ <orderEntry type="module" module-name="misc" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/spatial/spatial.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/spatial/spatial.iml?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/spatial/spatial.iml (original)
+++ lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/spatial/spatial.iml Sat May 14 13:51:35 2011
@@ -8,12 +8,12 @@
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
</content>
- <orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="queries" />
- <orderEntry type="module" module-name="misc" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="queries" />
+ <orderEntry type="module" module-name="misc" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/spellchecker/spellchecker.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/spellchecker/spellchecker.iml?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/spellchecker/spellchecker.iml (original)
+++ lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/spellchecker/spellchecker.iml Sat May 14 13:51:35 2011
@@ -8,12 +8,12 @@
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
</content>
- <orderEntry type="module" module-name="common" />
- <orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="queries" />
- <orderEntry type="module" module-name="misc" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="queries" />
+ <orderEntry type="module" module-name="misc" />
+ <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/swing/swing.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/swing/swing.iml?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/swing/swing.iml (original)
+++ lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/swing/swing.iml Sat May 14 13:51:35 2011
@@ -8,12 +8,12 @@
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
</content>
- <orderEntry type="module" module-name="common" />
- <orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="queries" />
- <orderEntry type="module" module-name="misc" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="queries" />
+ <orderEntry type="module" module-name="misc" />
+ <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/wordnet/wordnet.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/wordnet/wordnet.iml?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/wordnet/wordnet.iml (original)
+++ lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/wordnet/wordnet.iml Sat May 14 13:51:35 2011
@@ -8,12 +8,12 @@
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
</content>
- <orderEntry type="module" module-name="common" />
- <orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="queries" />
- <orderEntry type="module" module-name="misc" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="queries" />
+ <orderEntry type="module" module-name="misc" />
+ <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/xml-query-parser/xml-query-parser.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/xml-query-parser/xml-query-parser.iml?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/xml-query-parser/xml-query-parser.iml (original)
+++ lucene/dev/branches/flexscoring/dev-tools/idea/lucene/contrib/xml-query-parser/xml-query-parser.iml Sat May 14 13:51:35 2011
@@ -10,13 +10,13 @@
<sourceFolder url="file://$MODULE_DIR$/src/demo/WebContent" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
</content>
- <orderEntry type="module" module-name="common" />
- <orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="queries" />
- <orderEntry type="module" module-name="misc" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
<orderEntry type="library" name="Servlet API 2.4" level="project" />
+ <orderEntry type="module" module-name="queries" />
+ <orderEntry type="module" module-name="misc" />
+ <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/flexscoring/dev-tools/idea/modules/analysis/common/common.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/idea/modules/analysis/common/common.iml?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/idea/modules/analysis/common/common.iml (original)
+++ lucene/dev/branches/flexscoring/dev-tools/idea/modules/analysis/common/common.iml Sat May 14 13:51:35 2011
@@ -10,9 +10,9 @@
<sourceFolder url="file://$MODULE_DIR$/src/java/tools" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
</content>
- <orderEntry type="module" module-name="lucene" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/flexscoring/dev-tools/idea/modules/analysis/icu/icu.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/idea/modules/analysis/icu/icu.iml?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/idea/modules/analysis/icu/icu.iml (original)
+++ lucene/dev/branches/flexscoring/dev-tools/idea/modules/analysis/icu/icu.iml Sat May 14 13:51:35 2011
@@ -10,8 +10,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/resources" isTestSource="false" />
</content>
- <orderEntry type="module" module-name="common" />
- <orderEntry type="module" module-name="lucene" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
@@ -25,5 +23,7 @@
</library>
</orderEntry>
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/flexscoring/dev-tools/idea/modules/analysis/phonetic/phonetic.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/idea/modules/analysis/phonetic/phonetic.iml?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/idea/modules/analysis/phonetic/phonetic.iml (original)
+++ lucene/dev/branches/flexscoring/dev-tools/idea/modules/analysis/phonetic/phonetic.iml Sat May 14 13:51:35 2011
@@ -8,8 +8,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
</content>
- <orderEntry type="module" module-name="common" />
- <orderEntry type="module" module-name="lucene" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
@@ -23,5 +21,7 @@
</library>
</orderEntry>
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/flexscoring/dev-tools/idea/modules/analysis/smartcn/smartcn.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/idea/modules/analysis/smartcn/smartcn.iml?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/idea/modules/analysis/smartcn/smartcn.iml (original)
+++ lucene/dev/branches/flexscoring/dev-tools/idea/modules/analysis/smartcn/smartcn.iml Sat May 14 13:51:35 2011
@@ -9,10 +9,10 @@
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/resources" isTestSource="false" />
</content>
- <orderEntry type="module" module-name="common" />
- <orderEntry type="module" module-name="lucene" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/flexscoring/dev-tools/idea/modules/analysis/stempel/stempel.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/idea/modules/analysis/stempel/stempel.iml?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/idea/modules/analysis/stempel/stempel.iml (original)
+++ lucene/dev/branches/flexscoring/dev-tools/idea/modules/analysis/stempel/stempel.iml Sat May 14 13:51:35 2011
@@ -9,10 +9,10 @@
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/resources" isTestSource="false" />
</content>
- <orderEntry type="module" module-name="common" />
- <orderEntry type="module" module-name="lucene" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/flexscoring/dev-tools/idea/modules/benchmark/benchmark.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/idea/modules/benchmark/benchmark.iml?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/idea/modules/benchmark/benchmark.iml (original)
+++ lucene/dev/branches/flexscoring/dev-tools/idea/modules/benchmark/benchmark.iml Sat May 14 13:51:35 2011
@@ -10,13 +10,6 @@
<excludeFolder url="file://$MODULE_DIR$/temp" />
<excludeFolder url="file://$MODULE_DIR$/work" />
</content>
- <orderEntry type="module" module-name="highlighter" />
- <orderEntry type="module" module-name="common" />
- <orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="icu" />
- <orderEntry type="module" module-name="queries" />
- <orderEntry type="module" module-name="misc" />
- <orderEntry type="module" module-name="memory" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
@@ -30,5 +23,12 @@
</library>
</orderEntry>
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="highlighter" />
+ <orderEntry type="module" module-name="icu" />
+ <orderEntry type="module" module-name="queries" />
+ <orderEntry type="module" module-name="misc" />
+ <orderEntry type="module" module-name="memory" />
+ <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/flexscoring/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml (original)
+++ lucene/dev/branches/flexscoring/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml Sat May 14 13:51:35 2011
@@ -10,12 +10,6 @@
<excludeFolder url="file://$MODULE_DIR$/build" />
<excludeFolder url="file://$MODULE_DIR$/lucene-libs" />
</content>
- <orderEntry type="module" module-name="common" />
- <orderEntry type="module" module-name="icu" />
- <orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="smartcn" />
- <orderEntry type="module" module-name="solr" />
- <orderEntry type="module" module-name="stempel" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
@@ -30,5 +24,11 @@
</orderEntry>
<orderEntry type="library" name="Solr library" level="project" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="icu" />
+ <orderEntry type="module" module-name="smartcn" />
+ <orderEntry type="module" module-name="solr" />
+ <orderEntry type="module" module-name="stempel" />
+ <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/flexscoring/dev-tools/idea/solr/contrib/clustering/clustering.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/idea/solr/contrib/clustering/clustering.iml?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/idea/solr/contrib/clustering/clustering.iml (original)
+++ lucene/dev/branches/flexscoring/dev-tools/idea/solr/contrib/clustering/clustering.iml Sat May 14 13:51:35 2011
@@ -10,16 +10,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build" />
</content>
- <orderEntry type="module" module-name="common" />
- <orderEntry type="module" module-name="highlighter" />
- <orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="memory" />
- <orderEntry type="module" module-name="misc" />
- <orderEntry type="module" module-name="phonetic" />
- <orderEntry type="module" module-name="queries" />
- <orderEntry type="module" module-name="solr" />
- <orderEntry type="module" module-name="spatial" />
- <orderEntry type="module" module-name="spellchecker" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
@@ -35,5 +25,15 @@
<orderEntry type="library" name="Solr library" level="project" />
<orderEntry type="library" name="Solr DIH library" level="project" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="highlighter" />
+ <orderEntry type="module" module-name="memory" />
+ <orderEntry type="module" module-name="misc" />
+ <orderEntry type="module" module-name="phonetic" />
+ <orderEntry type="module" module-name="queries" />
+ <orderEntry type="module" module-name="solr" />
+ <orderEntry type="module" module-name="spatial" />
+ <orderEntry type="module" module-name="spellchecker" />
+ <orderEntry type="module" module-name="lucene" />
+ <orderEntry type="module" module-name="common" />
</component>
</module>
Modified: lucene/dev/branches/flexscoring/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml (original)
+++ lucene/dev/branches/flexscoring/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml Sat May 14 13:51:35 2011
@@ -11,12 +11,12 @@
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
- <orderEntry type="module" module-name="common" />
- <orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="solr" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Solr library" level="project" />
<orderEntry type="library" name="Solr DIH library" level="project" />
+ <orderEntry type="module" module-name="solr" />
+ <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/flexscoring/dev-tools/idea/solr/contrib/dataimporthandler/src/extras/extras.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/idea/solr/contrib/dataimporthandler/src/extras/extras.iml?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/idea/solr/contrib/dataimporthandler/src/extras/extras.iml (original)
+++ lucene/dev/branches/flexscoring/dev-tools/idea/solr/contrib/dataimporthandler/src/extras/extras.iml Sat May 14 13:51:35 2011
@@ -9,14 +9,14 @@
<sourceFolder url="file://$MODULE_DIR$/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/test/resources" isTestSource="true" />
</content>
- <orderEntry type="module" module-name="solr" />
- <orderEntry type="module" module-name="dataimporthandler" />
- <orderEntry type="module" module-name="lucene" scope="TEST" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Solr library" level="project" />
<orderEntry type="library" name="Solr DIH library" level="project" />
<orderEntry type="library" name="Solr extraction library" level="project" />
+ <orderEntry type="module" module-name="solr" />
+ <orderEntry type="module" module-name="dataimporthandler" />
+ <orderEntry type="module" module-name="lucene" scope="TEST" />
</component>
</module>
Modified: lucene/dev/branches/flexscoring/dev-tools/idea/solr/contrib/extraction/extraction.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/idea/solr/contrib/extraction/extraction.iml?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/idea/solr/contrib/extraction/extraction.iml (original)
+++ lucene/dev/branches/flexscoring/dev-tools/idea/solr/contrib/extraction/extraction.iml Sat May 14 13:51:35 2011
@@ -10,11 +10,11 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/build" />
</content>
- <orderEntry type="module" module-name="solr" />
- <orderEntry type="module" module-name="lucene" scope="TEST" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Solr library" level="project" />
<orderEntry type="library" name="Solr extraction library" level="project" />
+ <orderEntry type="module" module-name="solr" />
+ <orderEntry type="module" module-name="lucene" scope="TEST" />
</component>
</module>
Modified: lucene/dev/branches/flexscoring/dev-tools/idea/solr/contrib/uima/uima.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/idea/solr/contrib/uima/uima.iml?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/idea/solr/contrib/uima/uima.iml (original)
+++ lucene/dev/branches/flexscoring/dev-tools/idea/solr/contrib/uima/uima.iml Sat May 14 13:51:35 2011
@@ -11,8 +11,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/build" />
</content>
- <orderEntry type="module" module-name="solr" />
- <orderEntry type="module" module-name="lucene" scope="TEST" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Solr library" level="project" />
@@ -26,5 +24,7 @@
<jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" />
</library>
</orderEntry>
+ <orderEntry type="module" module-name="solr" />
+ <orderEntry type="module" module-name="lucene" scope="TEST" />
</component>
</module>
Modified: lucene/dev/branches/flexscoring/dev-tools/idea/solr/solr.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/idea/solr/solr.iml?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/idea/solr/solr.iml (original)
+++ lucene/dev/branches/flexscoring/dev-tools/idea/solr/solr.iml Sat May 14 13:51:35 2011
@@ -12,23 +12,24 @@
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test-files" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test-framework" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build" />
<excludeFolder url="file://$MODULE_DIR$/dist" />
<excludeFolder url="file://$MODULE_DIR$/lucene-libs" />
<excludeFolder url="file://$MODULE_DIR$/package" />
</content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="Solr library" level="project" />
+ <orderEntry type="library" name="Solr example library" level="project" />
<orderEntry type="module" module-name="spatial" />
<orderEntry type="module" module-name="highlighter" />
- <orderEntry type="module" module-name="common" />
<orderEntry type="module" module-name="icu" />
<orderEntry type="module" module-name="queries" />
<orderEntry type="module" module-name="misc" />
<orderEntry type="module" module-name="phonetic" />
<orderEntry type="module" module-name="spellchecker" />
+ <orderEntry type="module" module-name="common" />
<orderEntry type="module" module-name="lucene" />
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Solr library" level="project" />
- <orderEntry type="library" name="Solr example library" level="project" />
</component>
</module>
Modified: lucene/dev/branches/flexscoring/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/maven/pom.xml.template?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/flexscoring/dev-tools/maven/pom.xml.template Sat May 14 13:51:35 2011
@@ -133,6 +133,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>r05</version>
+ </dependency>
+ <dependency>
<groupId>com.sleepycat</groupId>
<artifactId>berkeleydb</artifactId>
<version>4.7.25</version>
@@ -694,7 +699,7 @@
<artifactId>solr-noggit</artifactId>
<version>${project.version}</version>
<packaging>jar</packaging>
- <file>solr/lib/apache-solr-noggit-r944541.jar</file>
+ <file>solr/lib/apache-solr-noggit-r1099557.jar</file>
</configuration>
</execution>
<execution>
Modified: lucene/dev/branches/flexscoring/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template (original)
+++ lucene/dev/branches/flexscoring/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template Sat May 14 13:51:35 2011
@@ -44,9 +44,8 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>solr-core</artifactId>
+ <artifactId>solr-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/branches/flexscoring/dev-tools/maven/solr/contrib/clustering/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/maven/solr/contrib/clustering/pom.xml.template?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/maven/solr/contrib/clustering/pom.xml.template (original)
+++ lucene/dev/branches/flexscoring/dev-tools/maven/solr/contrib/clustering/pom.xml.template Sat May 14 13:51:35 2011
@@ -44,9 +44,8 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>solr-core</artifactId>
+ <artifactId>solr-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/branches/flexscoring/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template (original)
+++ lucene/dev/branches/flexscoring/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template Sat May 14 13:51:35 2011
@@ -44,9 +44,8 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>solr-core</artifactId>
+ <artifactId>solr-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
@@ -104,8 +103,8 @@
</dependencies>
<build>
<directory>${build-directory}</directory>
- <outputDirectory>${build-directory}/extras/classes</outputDirectory>
- <testOutputDirectory>${build-directory}/extras/test-classes</testOutputDirectory>
+ <outputDirectory>${build-directory}/classes</outputDirectory>
+ <testOutputDirectory>${build-directory}/test-classes</testOutputDirectory>
<sourceDirectory>main/java</sourceDirectory>
<testSourceDirectory>test/java</testSourceDirectory>
<testResources>
Modified: lucene/dev/branches/flexscoring/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template (original)
+++ lucene/dev/branches/flexscoring/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template Sat May 14 13:51:35 2011
@@ -43,10 +43,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>solr-core</artifactId>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/branches/flexscoring/dev-tools/maven/solr/contrib/extraction/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/maven/solr/contrib/extraction/pom.xml.template?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/maven/solr/contrib/extraction/pom.xml.template (original)
+++ lucene/dev/branches/flexscoring/dev-tools/maven/solr/contrib/extraction/pom.xml.template Sat May 14 13:51:35 2011
@@ -47,9 +47,8 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>solr-core</artifactId>
+ <artifactId>solr-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/branches/flexscoring/dev-tools/maven/solr/contrib/uima/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/maven/solr/contrib/uima/pom.xml.template?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/maven/solr/contrib/uima/pom.xml.template (original)
+++ lucene/dev/branches/flexscoring/dev-tools/maven/solr/contrib/uima/pom.xml.template Sat May 14 13:51:35 2011
@@ -44,9 +44,8 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>solr-core</artifactId>
+ <artifactId>solr-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/branches/flexscoring/dev-tools/maven/solr/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/maven/solr/pom.xml.template?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/maven/solr/pom.xml.template (original)
+++ lucene/dev/branches/flexscoring/dev-tools/maven/solr/pom.xml.template Sat May 14 13:51:35 2011
@@ -35,6 +35,7 @@
<module>src</module>
<module>src/solrj</module>
<module>src/webapp</module>
+ <module>src/test-framework</module>
<module>contrib</module>
</modules>
<properties>
Modified: lucene/dev/branches/flexscoring/dev-tools/maven/solr/src/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/maven/solr/src/pom.xml.template?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/maven/solr/src/pom.xml.template (original)
+++ lucene/dev/branches/flexscoring/dev-tools/maven/solr/src/pom.xml.template Sat May 14 13:51:35 2011
@@ -157,6 +157,10 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -199,17 +203,6 @@
</plugin>
<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>
<systemPropertyVariables>
@@ -248,6 +241,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/flexscoring/dev-tools/maven/solr/src/solrj/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/dev-tools/maven/solr/src/solrj/pom.xml.template?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/dev-tools/maven/solr/src/solrj/pom.xml.template (original)
+++ lucene/dev/branches/flexscoring/dev-tools/maven/solr/src/solrj/pom.xml.template Sat May 14 13:51:35 2011
@@ -44,12 +44,6 @@
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-test-framework</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
<artifactId>lucene-analyzers-common</artifactId>
<version>${project.version}</version>
<scope>test</scope>
@@ -88,15 +82,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
- <outputDirectory>${build-directory}</outputDirectory>
+ <outputDirectory>${build-directory}/classes</outputDirectory>
<sourceDirectory>.</sourceDirectory>
<testResources/>
<plugins>
Modified: lucene/dev/branches/flexscoring/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/lucene/CHANGES.txt?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/flexscoring/lucene/CHANGES.txt Sat May 14 13:51:35 2011
@@ -141,6 +141,11 @@ Changes in backwards compatibility polic
* LUCENE-2315: AttributeSource's methods for accessing attributes are now final,
else its easy to corrupt the internal states. (Uwe Schindler)
+* LUCENE-2814: The IndexWriter.flush method no longer takes "boolean
+ flushDocStores" argument, as we now always flush doc stores (index
+ files holding stored fields and term vectors) while flushing a
+ segment. (Mike McCandless)
+
Changes in Runtime Behavior
* LUCENE-2846: omitNorms now behaves like omitTermFrequencyAndPositions, if you
@@ -157,11 +162,10 @@ 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)
+* LUCENE-1076: The default merge policy (TieredMergePolicy) 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. (Mike McCandless)
* LUCENE-2881: FieldInfos is now tracked per segment. Before it was tracked
per IndexWriter session, which resulted in FieldInfos that had the FieldInfo
@@ -169,6 +173,70 @@ Changes in Runtime Behavior
globally across IndexWriter sessions and persisted into a X.fnx file on
successful commit. The corresponding file format changes are backwards-
compatible. (Michael Busch, Simon Willnauer)
+
+* LUCENE-2956, LUCENE-2573, LUCENE-2324, LUCENE-2555: Changes from
+ DocumentsWriterPerThread:
+
+ - IndexWriter now uses a DocumentsWriter per thread when indexing documents.
+ Each DocumentsWriterPerThread indexes documents in its own private segment,
+ and the in memory segments are no longer merged on flush. Instead, each
+ segment is separately flushed to disk and subsequently merged with normal
+ segment merging.
+
+ - DocumentsWriterPerThread (DWPT) is now flushed concurrently based on a
+ FlushPolicy. When a DWPT is flushed, a fresh DWPT is swapped in so that
+ indexing may continue concurrently with flushing. The selected
+ DWPT flushes all its RAM resident documents do disk. Note: Segment flushes
+ don't flush all RAM resident documents but only the documents private to
+ the DWPT selected for flushing.
+
+ - Flushing is now controlled by FlushPolicy that is called for every add,
+ update or delete on IndexWriter. By default DWPTs are flushed either on
+ maxBufferedDocs per DWPT or the global active used memory. Once the active
+ memory exceeds ramBufferSizeMB only the largest DWPT is selected for
+ flushing and the memory used by this DWPT is substracted from the active
+ memory and added to a flushing memory pool, which can lead to temporarily
+ higher memory usage due to ongoing indexing.
+
+ - IndexWriter now can utilize ramBufferSize > 2048 MB. Each DWPT can address
+ up to 2048 MB memory such that the ramBufferSize is now bounded by the max
+ number of DWPT avaliable in the used DocumentsWriterPerThreadPool.
+ IndexWriters net memory consumption can grow far beyond the 2048 MB limit if
+ the applicatoin can use all available DWPTs. To prevent a DWPT from
+ exhausting its address space IndexWriter will forcefully flush a DWPT if its
+ hard memory limit is exceeded. The RAMPerThreadHardLimitMB can be controlled
+ via IndexWriterConfig and defaults to 1945 MB.
+ Since IndexWriter flushes DWPT concurrently not all memory is released
+ immediately. Applications should still use a ramBufferSize significantly
+ lower than the JVMs avaliable heap memory since under high load multiple
+ flushing DWPT can consume substantial transient memory when IO performance
+ is slow relative to indexing rate.
+
+ - IndexWriter#commit now doesn't block concurrent indexing while flushing all
+ 'currently' RAM resident documents to disk. Yet, flushes that occur while a
+ a full flush is running are queued and will happen after all DWPT involved
+ in the full flush are done flushing. Applications using multiple threads
+ during indexing and trigger a full flush (eg call commmit() or open a new
+ NRT reader) can use significantly more transient memory.
+
+ - IndexWriter#addDocument and IndexWriter.updateDocument can block indexing
+ threads if the number of active + number of flushing DWPT exceed a
+ safety limit. By default this happens if 2 * max number available thread
+ states (DWPTPool) is exceeded. This safety limit prevents applications from
+ exhausting their available memory if flushing can't keep up with
+ concurrently indexing threads.
+
+ - IndexWriter only applies and flushes deletes if the maxBufferedDelTerms
+ limit is reached during indexing. No segment flushes will be triggered
+ due to this setting.
+
+ - IndexWriter#flush(boolean, boolean) doesn't synchronized on IndexWriter
+ anymore. A dedicated flushLock has been introduced to prevent multiple full-
+ flushes happening concurrently.
+
+ - DocumentsWriter doesn't write shared doc stores anymore.
+
+ (Mike McCandless, Michael Busch, Simon Willnauer)
API Changes
@@ -212,6 +280,10 @@ API Changes
* LUCENE-2953: In addition to changes in 3.x, PriorityQueue#initialize(int)
function was moved into the ctor. (Uwe Schindler, Yonik Seeley)
+* LUCENE-3061: IndexWriter's getNextMerge() and merge(OneMerge) are now public
+ (though @lucene.experimental), allowing for custom MergeScheduler
+ implementations. (Shai Erera)
+
New features
* LUCENE-2604: Added RegexpQuery support to QueryParser. Regular expressions
@@ -333,10 +405,17 @@ New features
* LUCENE-2862: Added TermsEnum.totalTermFreq() and
Terms.getSumTotalTermFreq(). (Mike McCandless, Robert Muir)
-
+
* LUCENE-3001: Added TrieFieldHelper to write solr compatible numeric
fields without the solr dependency. (ryan)
+* LUCENE-3003: Added new expert class oal.index.DocTermsOrd,
+ refactored from Solr's UnInvertedField, for accessing term ords for
+ multi-valued fields, per document. This is similar to FieldCache in
+ that it inverts the index to compute the ords, but differs in that
+ it's able to handle multi-valued fields and does not hold the term
+ bytes in RAM. (Mike McCandless)
+
Optimizations
* LUCENE-2588: Don't store unnecessary suffixes when writing the terms
@@ -381,8 +460,8 @@ Test Cases
Build
-* LUCENE-3006: Building javadocs will fail on warnings by default. Override with -Dfailonjavadocwarning=false (sarowe, gsingers)
-
+* LUCENE-3006: Building javadocs will fail on warnings by default.
+ Override with -Dfailonjavadocwarning=false (sarowe, gsingers)
======================= Lucene 3.x (not yet released) =======================
@@ -393,11 +472,86 @@ Changes in backwards compatibility polic
a method getHeapArray() was added to retrieve the internal heap array as a
non-generic Object[]. (Uwe Schindler, Yonik Seeley)
+* LUCENE-1076: IndexWriter.setInfoStream now throws IOException
+ (Mike McCandless, Shai Erera)
+
+* LUCENE-3084: MergePolicy.OneMerge.segments was changed from
+ SegmentInfos to a List<SegmentInfo>; this is actually a minor change
+ because SegmentInfos itself extends Vector<SegmentInfo>. (Uwe
+ Schindler, Mike McCandless)
+
+Changes in runtime behavior
+
+* LUCENE-3065: When a NumericField is retrieved from a Document loaded
+ from IndexReader (or IndexSearcher), it will now come back as
+ NumericField not as a Field with a string-ified version of the
+ numeric value you had indexed. Note that this only applies for
+ newly-indexed Documents; older indices will still return Field
+ with the string-ified numeric value. If you call Document.get(),
+ the value comes still back as String, but Document.getFieldable()
+ returns NumericField instances. (Uwe Schindler, Ryan McKinley,
+ Mike McCandless)
+
+New features
+
+* LUCENE-3082: Added index upgrade tool oal.index.IndexUpgrader
+ that allows to upgrade all segments to last recent supported index
+ format without fully optimizing. (Uwe Schindler, Mike McCandless)
+
+* LUCENE-1076: Added TieredMergePolicy which is able to merge non-contiguous
+ segments, which means docIDs no longer necessarily stay "in order".
+ (Mike McCandless, Shai Erera)
+
+* LUCENE-3071: Adding ReversePathHierarchyTokenizer, added skip parameter to
+ PathHierarchyTokenizer (Olivier Favre via ryan)
+
+API Changes
+
+* LUCENE-3061: IndexWriter's getNextMerge() and merge(OneMerge) are now public
+ (though @lucene.experimental), allowing for custom MergeScheduler
+ implementations. (Shai Erera)
+
+* LUCENE-3065: Document.getField() was deprecated, as it throws
+ ClassCastException when loading lazy fields or NumericFields.
+ (Uwe Schindler, Ryan McKinley, Mike McCandless)
+
Optimizations
* LUCENE-2990: ArrayUtil/CollectionUtil.*Sort() methods now exit early
on empty or one-element lists/arrays. (Uwe Schindler)
+* 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-2996: addIndexes(IndexReader) did not flush before adding the new
+ indexes, causing existing deletions to be applied on the incoming indexes as
+ well. (Shai Erera, Mike McCandless)
+
+* LUCENE-3024: Index with more than 2.1B terms was hitting AIOOBE when
+ seeking TermEnum (eg used by Solr's faceting) (Tom Burton-West, Mike
+ McCandless)
+
+* LUCENE-3042: When a filter or consumer added Attributes to a TokenStream
+ chain after it was already (partly) consumed [or clearAttributes(),
+ captureState(), cloneAttributes(),... was called by the Tokenizer],
+ the Tokenizer calling clearAttributes() or capturing state after addition
+ may not do this on the newly added Attribute. This bug affected only
+ very special use cases of the TokenStream-API, most users would not
+ have recognized it. (Uwe Schindler, Robert Muir)
+
+* LUCENE-3054: PhraseQuery can in some cases stack overflow in
+ SorterTemplate.quickSort(). This fix also adds an optimization to
+ PhraseQuery as term with lower doc freq will also have less positions.
+ (Uwe Schindler, Robert Muir, Otis Gospodnetic)
+
+Test Cases
+
+* LUCENE-3002: added 'tests.iter.min' to control 'tests.iter' by allowing to
+ stop iterating if at least 'tests.iter.min' ran and a failure occured.
+ (Shai Erera, Chris Hostetter)
+
======================= Lucene 3.1.0 =======================
Changes in backwards compatibility policy
@@ -1379,6 +1533,10 @@ Bug fixes
that warming is free to do whatever it needs to. (Earwin Burrfoot
via Mike McCandless)
+* LUCENE-3029: Fix corner case when MultiPhraseQuery is used with zero
+ position-increment tokens that would sometimes assign different
+ scores to identical docs. (Mike McCandless)
+
* LUCENE-2486: Fixed intermittent FileNotFoundException on doc store
files when a mergedSegmentWarmer is set on IndexWriter. (Mike
McCandless)
Modified: lucene/dev/branches/flexscoring/lucene/MIGRATE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/lucene/MIGRATE.txt?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/lucene/MIGRATE.txt (original)
+++ lucene/dev/branches/flexscoring/lucene/MIGRATE.txt Sat May 14 13:51:35 2011
@@ -312,6 +312,8 @@ LUCENE-1458, LUCENE-2111: Flexible Index
- o.a.l.analysis.ReusableAnalyzerBase -> o.a.l.analysis.util.ReusableAnalyzerBase
- o.a.l.analysis.StopwordAnalyzerBase -> o.a.l.analysis.util.StopwordAnalyzerBase
- o.a.l.analysis.WordListLoader -> o.a.l.analysis.util.WordListLoader
+ - o.a.l.analysis.CharTokenizer -> o.a.l.analysis.util.CharTokenizer
+ - o.a.l.util.CharacterUtils -> o.a.l.analysis.util.CharacterUtils
* LUCENE-2514: The option to use a Collator's order (instead of binary order) for
sorting and range queries has been moved to contrib/queries.
@@ -356,3 +358,9 @@ LUCENE-1458, LUCENE-2111: Flexible Index
field as a parameter, this is removed due to the fact the entire Similarity (all methods)
can now be configured per-field.
Methods that apply to the entire query such as coord() and queryNorm() exist in SimilarityProvider.
+
+* LUCENE-1076: TieredMergePolicy is now the default merge policy.
+ It's able to merge non-contiguous segments; this may cause problems
+ for applications that rely on Lucene's internal document ID
+ assigment. If so, you should instead use LogByteSize/DocMergePolicy
+ during indexing.
Modified: lucene/dev/branches/flexscoring/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/lucene/common-build.xml?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/lucene/common-build.xml (original)
+++ lucene/dev/branches/flexscoring/lucene/common-build.xml Sat May 14 13:51:35 2011
@@ -73,6 +73,7 @@
</condition>
<property name="tests.multiplier" value="1" />
<property name="tests.codec" value="randomPerField" />
+ <property name="tests.codecprovider" value="random" />
<property name="tests.locale" value="random" />
<property name="tests.timezone" value="random" />
<property name="tests.directory" value="random" />
@@ -308,7 +309,7 @@
</copy>
</target>
- <target name="compile" depends="compile-core, validate-lucene">
+ <target name="compile" depends="compile-core">
<!-- convenience target to compile core -->
</target>
@@ -499,6 +500,8 @@
<sysproperty key="tests.verbose" value="${tests.verbose}"/>
<!-- set the codec tests should run with -->
<sysproperty key="tests.codec" value="${tests.codec}"/>
+ <!-- set the codec provider tests should run with -->
+ <sysproperty key="tests.codecprovider" value="${tests.codecprovider}"/>
<!-- set the locale tests should run with -->
<sysproperty key="tests.locale" value="${tests.locale}"/>
<!-- set the timezone tests should run with -->
@@ -565,7 +568,7 @@
</sequential>
</macrodef>
- <target name="test" depends="compile-test,junit-mkdir,junit-sequential,junit-parallel" description="Runs unit tests"/>
+ <target name="test" depends="compile-test,validate-lucene,junit-mkdir,junit-sequential,junit-parallel" description="Runs unit tests"/>
<target name="junit-mkdir">
<mkdir dir="${junit.output.dir}"/>
Modified: lucene/dev/branches/flexscoring/lucene/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/lucene/contrib/CHANGES.txt?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/lucene/contrib/CHANGES.txt (original)
+++ lucene/dev/branches/flexscoring/lucene/contrib/CHANGES.txt Sat May 14 13:51:35 2011
@@ -42,10 +42,47 @@ API Changes
Instead, use SimilarityProvider to return different SweetSpotSimilaritys
for different fields, this way all parameters (such as TF factors) can be
customized on a per-field basis. (Robert Muir)
+
+Bug Fixes
+
+ * LUCENE-3045: fixed QueryNodeImpl.containsTag(String key) that was
+ not lowercasing the key before checking for the tag (Adriano Crestani)
======================= Lucene 3.x (not yet released) =======================
-(No changes)
+Changes in runtime behavior
+
+ * LUCENE-3086: ItalianAnalyzer now uses ElisionFilter with a set of Italian
+ contractions by default. (Robert Muir)
+
+Bug Fixes
+
+ * LUCENE-3045: fixed QueryNodeImpl.containsTag(String key) that was
+ not lowercasing the key before checking for the tag (Adriano Crestani)
+
+ * LUCENE-3026: SmartChineseAnalyzer's WordTokenFilter threw NullPointerException
+ on sentences longer than 32,767 characters. (wangzhenghang via Robert Muir)
+
+ * LUCENE-2939: Highlighter should try and use maxDocCharsToAnalyze in
+ WeightedSpanTermExtractor when adding a new field to MemoryIndex as well as
+ when using CachingTokenStream. This can be a significant performance bug for
+ large documents. (Mark Miller)
+
+ * LUCENE-3043: GermanStemmer threw IndexOutOfBoundsException if it encountered
+ a zero-length token. (Robert Muir)
+
+ * LUCENE-3044: ThaiWordFilter didn't reset its cached state correctly, this only
+ caused a problem if you consumed a tokenstream, then reused it, added different
+ attributes to it, and consumed it again. (Robert Muir, Uwe Schindler)
+
+New Features
+
+ * LUCENE-3016: Add analyzer for Latvian. (Robert Muir)
+
+Optimizations
+
+ * LUCENE-3040: Switch all analysis consumers (highlighter, morelikethis, memory, ...)
+ over to reusableTokenStream(). (Robert Muir)
======================= Lucene 3.1.0 =======================
@@ -156,6 +193,10 @@ Bug fixes
* LUCENE-2943: Fix thread-safety issues with ICUCollationKeyFilter.
(Robert Muir)
+ * LUCENE-3087: Highlighter: fix case that was preventing highlighting
+ of exact phrase when tokens overlap. (Pierre Gossé via Mike
+ McCandless)
+
API Changes
* LUCENE-2867: Some contrib queryparser methods that receives CharSequence as
Modified: lucene/dev/branches/flexscoring/lucene/contrib/ant/src/java/org/apache/lucene/ant/IndexTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/lucene/contrib/ant/src/java/org/apache/lucene/ant/IndexTask.java?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/lucene/contrib/ant/src/java/org/apache/lucene/ant/IndexTask.java (original)
+++ lucene/dev/branches/flexscoring/lucene/contrib/ant/src/java/org/apache/lucene/ant/IndexTask.java Sat May 14 13:51:35 2011
@@ -39,7 +39,7 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
-import org.apache.lucene.index.LogMergePolicy;
+import org.apache.lucene.index.TieredMergePolicy;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.search.IndexSearcher;
@@ -285,9 +285,9 @@ public class IndexTask extends Task {
IndexWriterConfig conf = new IndexWriterConfig(
Version.LUCENE_CURRENT, analyzer).setOpenMode(
create ? OpenMode.CREATE : OpenMode.APPEND);
- LogMergePolicy lmp = (LogMergePolicy) conf.getMergePolicy();
- lmp.setUseCompoundFile(useCompoundIndex);
- lmp.setMergeFactor(mergeFactor);
+ TieredMergePolicy tmp = (TieredMergePolicy) conf.getMergePolicy();
+ tmp.setUseCompoundFile(useCompoundIndex);
+ tmp.setMaxMergeAtOnce(mergeFactor);
IndexWriter writer = new IndexWriter(dir, conf);
int totalFiles = 0;
int totalIndexed = 0;
Modified: lucene/dev/branches/flexscoring/lucene/contrib/demo/src/test/org/apache/lucene/demo/TestDemo.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/lucene/contrib/demo/src/test/org/apache/lucene/demo/TestDemo.java?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/lucene/contrib/demo/src/test/org/apache/lucene/demo/TestDemo.java (original)
+++ lucene/dev/branches/flexscoring/lucene/contrib/demo/src/test/org/apache/lucene/demo/TestDemo.java Sat May 14 13:51:35 2011
@@ -22,16 +22,17 @@ import java.io.File;
import java.io.PrintStream;
import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util._TestUtil;
public class TestDemo extends LuceneTestCase {
- private void testOneSearch(String query, int expectedHitCount) throws Exception {
+ private void testOneSearch(File indexPath, String query, int expectedHitCount) throws Exception {
PrintStream outSave = System.out;
try {
ByteArrayOutputStream bytes = new ByteArrayOutputStream();
PrintStream fakeSystemOut = new PrintStream(bytes);
System.setOut(fakeSystemOut);
- SearchFiles.main(new String[] {"-query", query});
+ SearchFiles.main(new String[] {"-query", query, "-index", indexPath.getPath()});
fakeSystemOut.flush();
String output = bytes.toString(); // intentionally use default encoding
assertTrue("output=" + output, output.contains(expectedHitCount + " total matching documents"));
@@ -42,12 +43,13 @@ public class TestDemo extends LuceneTest
public void testIndexSearch() throws Exception {
File dir = getDataFile("test-files/docs");
- IndexFiles.main(new String[] { "-create", "-docs", dir.getPath() });
- testOneSearch("apache", 3);
- testOneSearch("patent", 8);
- testOneSearch("lucene", 0);
- testOneSearch("gnu", 6);
- testOneSearch("derivative", 8);
- testOneSearch("license", 13);
+ File indexDir = _TestUtil.getTempDir("ContribDemoTest");
+ IndexFiles.main(new String[] { "-create", "-docs", dir.getPath(), "-index", indexDir.getPath()});
+ testOneSearch(indexDir, "apache", 3);
+ testOneSearch(indexDir, "patent", 8);
+ testOneSearch(indexDir, "lucene", 0);
+ testOneSearch(indexDir, "gnu", 6);
+ testOneSearch(indexDir, "derivative", 8);
+ testOneSearch(indexDir, "license", 13);
}
}
Modified: lucene/dev/branches/flexscoring/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/Highlighter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/Highlighter.java?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/Highlighter.java (original)
+++ lucene/dev/branches/flexscoring/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/Highlighter.java Sat May 14 13:51:35 2011
@@ -78,7 +78,7 @@ public class Highlighter
public final String getBestFragment(Analyzer analyzer, String fieldName,String text)
throws IOException, InvalidTokenOffsetsException
{
- TokenStream tokenStream = analyzer.tokenStream(fieldName, new StringReader(text));
+ TokenStream tokenStream = analyzer.reusableTokenStream(fieldName, new StringReader(text));
return getBestFragment(tokenStream, text);
}
@@ -130,7 +130,7 @@ public class Highlighter
int maxNumFragments)
throws IOException, InvalidTokenOffsetsException
{
- TokenStream tokenStream = analyzer.tokenStream(fieldName, new StringReader(text));
+ TokenStream tokenStream = analyzer.reusableTokenStream(fieldName, new StringReader(text));
return getBestFragments(tokenStream, text, maxNumFragments);
}
@@ -197,6 +197,11 @@ public class Highlighter
tokenStream.reset();
TextFragment currentFrag = new TextFragment(newText,newText.length(), docFrags.size());
+
+ if (fragmentScorer instanceof QueryScorer) {
+ ((QueryScorer) fragmentScorer).setMaxDocCharsToAnalyze(maxDocCharsToAnalyze);
+ }
+
TokenStream newStream = fragmentScorer.init(tokenStream);
if(newStream != null) {
tokenStream = newStream;
@@ -350,6 +355,7 @@ public class Highlighter
{
try
{
+ tokenStream.end();
tokenStream.close();
}
catch (Exception e)
Modified: lucene/dev/branches/flexscoring/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryScorer.java?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryScorer.java (original)
+++ lucene/dev/branches/flexscoring/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryScorer.java Sat May 14 13:51:35 2011
@@ -54,6 +54,7 @@ public class QueryScorer implements Scor
private IndexReader reader;
private boolean skipInitExtractor;
private boolean wrapToCaching = true;
+ private int maxCharsToAnalyze;
/**
* @param query Query to use for highlighting
@@ -209,7 +210,7 @@ public class QueryScorer implements Scor
private TokenStream initExtractor(TokenStream tokenStream) throws IOException {
WeightedSpanTermExtractor qse = defaultField == null ? new WeightedSpanTermExtractor()
: new WeightedSpanTermExtractor(defaultField);
-
+ qse.setMaxDocCharsToAnalyze(maxCharsToAnalyze);
qse.setExpandMultiTermQuery(expandMultiTermQuery);
qse.setWrapIfNotCachingTokenFilter(wrapToCaching);
if (reader == null) {
@@ -265,4 +266,8 @@ public class QueryScorer implements Scor
public void setWrapIfNotCachingTokenFilter(boolean wrap) {
this.wrapToCaching = wrap;
}
+
+ public void setMaxDocCharsToAnalyze(int maxDocCharsToAnalyze) {
+ this.maxCharsToAnalyze = maxDocCharsToAnalyze;
+ }
}
Modified: lucene/dev/branches/flexscoring/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java (original)
+++ lucene/dev/branches/flexscoring/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java Sat May 14 13:51:35 2011
@@ -30,6 +30,7 @@ import org.apache.lucene.analysis.Token;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
+import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.TermFreqVector;
@@ -158,10 +159,13 @@ public class TokenSources {
OffsetAttribute offsetAtt;
+ PositionIncrementAttribute posincAtt;
+
StoredTokenStream(Token tokens[]) {
this.tokens = tokens;
termAtt = addAttribute(CharTermAttribute.class);
offsetAtt = addAttribute(OffsetAttribute.class);
+ posincAtt = (PositionIncrementAttribute) addAttribute(PositionIncrementAttribute.class);
}
@Override
@@ -173,6 +177,10 @@ public class TokenSources {
clearAttributes();
termAtt.setEmpty().append(token);
offsetAtt.setOffset(token.startOffset(), token.endOffset());
+ posincAtt
+ .setPositionIncrement(currentToken <= 1
+ || tokens[currentToken - 1].startOffset() > tokens[currentToken - 2]
+ .startOffset() ? 1 : 0);
return true;
}
}
@@ -180,7 +188,6 @@ public class TokenSources {
BytesRef[] terms = tpv.getTerms();
int[] freq = tpv.getTermFrequencies();
int totalTokens = 0;
-
for (int t = 0; t < freq.length; t++) {
totalTokens += freq[t];
}
@@ -189,7 +196,8 @@ public class TokenSources {
for (int t = 0; t < freq.length; t++) {
TermVectorOffsetInfo[] offsets = tpv.getOffsets(t);
if (offsets == null) {
- throw new IllegalArgumentException("Required TermVector Offset information was not found");
+ throw new IllegalArgumentException(
+ "Required TermVector Offset information was not found");
}
int[] pos = null;
@@ -205,8 +213,8 @@ public class TokenSources {
unsortedTokens = new ArrayList<Token>();
}
for (int tp = 0; tp < offsets.length; tp++) {
- Token token = new Token(terms[t].utf8ToString(), offsets[tp].getStartOffset(), offsets[tp]
- .getEndOffset());
+ Token token = new Token(terms[t].utf8ToString(),
+ offsets[tp].getStartOffset(), offsets[tp].getEndOffset());
unsortedTokens.add(token);
}
} else {
@@ -221,8 +229,8 @@ public class TokenSources {
// tokens stored with positions - can use this to index straight into
// sorted array
for (int tp = 0; tp < pos.length; tp++) {
- Token token = new Token(terms[t].utf8ToString(), offsets[tp].getStartOffset(),
- offsets[tp].getEndOffset());
+ Token token = new Token(terms[t].utf8ToString(),
+ offsets[tp].getStartOffset(), offsets[tp].getEndOffset());
tokensInOriginalOrder[pos[tp]] = token;
}
}
@@ -231,12 +239,11 @@ public class TokenSources {
if (unsortedTokens != null) {
tokensInOriginalOrder = unsortedTokens.toArray(new Token[unsortedTokens
.size()]);
- ArrayUtil.quickSort(tokensInOriginalOrder, new Comparator<Token>() {
+ ArrayUtil.mergeSort(tokensInOriginalOrder, new Comparator<Token>() {
public int compare(Token t1, Token t2) {
- if (t1.startOffset() == t2.startOffset())
- return t1.endOffset() - t2.endOffset();
- else
- return t1.startOffset() - t2.startOffset();
+ if (t1.startOffset() == t2.startOffset()) return t1.endOffset()
+ - t2.endOffset();
+ else return t1.startOffset() - t2.startOffset();
}
});
}
@@ -279,7 +286,11 @@ public class TokenSources {
// convenience method
public static TokenStream getTokenStream(String field, String contents,
Analyzer analyzer) {
- return analyzer.tokenStream(field, new StringReader(contents));
+ try {
+ return analyzer.reusableTokenStream(field, new StringReader(contents));
+ } catch (IOException ex) {
+ throw new RuntimeException(ex);
+ }
}
}
Modified: lucene/dev/branches/flexscoring/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java?rev=1103112&r1=1103111&r2=1103112&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java (original)
+++ lucene/dev/branches/flexscoring/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java Sat May 14 13:51:35 2011
@@ -56,6 +56,7 @@ public class WeightedSpanTermExtractor {
private boolean expandMultiTermQuery;
private boolean cachedTokenStream;
private boolean wrapToCaching = true;
+ private int maxDocCharsToAnalyze;
public WeightedSpanTermExtractor() {
}
@@ -320,13 +321,13 @@ public class WeightedSpanTermExtractor {
private AtomicReaderContext getLeafContextForField(String field) throws IOException {
if(wrapToCaching && !cachedTokenStream && !(tokenStream instanceof CachingTokenFilter)) {
- tokenStream = new CachingTokenFilter(tokenStream);
+ tokenStream = new CachingTokenFilter(new OffsetLimitTokenFilter(tokenStream, maxDocCharsToAnalyze));
cachedTokenStream = true;
}
AtomicReaderContext context = readers.get(field);
if (context == null) {
MemoryIndex indexer = new MemoryIndex();
- indexer.addField(field, tokenStream);
+ indexer.addField(field, new OffsetLimitTokenFilter(tokenStream, maxDocCharsToAnalyze));
tokenStream.reset();
IndexSearcher searcher = indexer.createSearcher();
// MEM index has only atomic ctx
@@ -545,4 +546,8 @@ public class WeightedSpanTermExtractor {
public void setWrapIfNotCachingTokenFilter(boolean wrap) {
this.wrapToCaching = wrap;
}
+
+ protected final void setMaxDocCharsToAnalyze(int maxDocCharsToAnalyze) {
+ this.maxDocCharsToAnalyze = maxDocCharsToAnalyze;
+ }
}