You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2011/07/07 11:04:29 UTC
svn commit: r1143719 [2/20] - in /lucene/dev/branches/LUCENE2793: ./
dev-tools/eclipse/ dev-tools/idea/.idea/ dev-tools/idea/lucene/contrib/
dev-tools/idea/lucene/contrib/demo/
dev-tools/idea/lucene/contrib/highlighter/
dev-tools/idea/lucene/contrib/in...
Modified: lucene/dev/branches/LUCENE2793/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/dev-tools/eclipse/dot.classpath?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/LUCENE2793/dev-tools/eclipse/dot.classpath Thu Jul 7 09:03:58 2011
@@ -38,10 +38,17 @@
<classpathentry kind="src" path="modules/analysis/stempel/src/java"/>
<classpathentry kind="src" path="modules/analysis/stempel/src/resources"/>
<classpathentry kind="src" path="modules/analysis/stempel/src/test"/>
+ <classpathentry kind="src" path="modules/analysis/morfologik/src/java"/>
+ <classpathentry kind="src" path="modules/analysis/morfologik/src/test"/>
<classpathentry kind="src" path="modules/benchmark/src/java"/>
<classpathentry kind="src" path="modules/benchmark/src/test"/>
+ <classpathentry kind="src" path="modules/facet/src/java"/>
+ <classpathentry kind="src" path="modules/facet/src/examples"/>
+ <classpathentry kind="src" path="modules/facet/src/test"/>
<classpathentry kind="src" path="modules/grouping/src/java"/>
<classpathentry kind="src" path="modules/grouping/src/test"/>
+ <classpathentry kind="src" path="modules/queries/src/java"/>
+ <classpathentry kind="src" path="modules/queries/src/test"/>
<classpathentry kind="src" path="modules/suggest/src/java"/>
<classpathentry kind="src" path="modules/suggest/src/test"/>
<classpathentry kind="src" path="solr/src/java"/>
@@ -76,6 +83,9 @@
<classpathentry kind="lib" path="lucene/contrib/queries/lib/jakarta-regexp-1.4.jar"/>
<classpathentry kind="lib" path="modules/analysis/icu/lib/icu4j-4_8.jar"/>
<classpathentry kind="lib" path="modules/analysis/phonetic/lib/commons-codec-1.4.jar"/>
+ <classpathentry kind="lib" path="modules/analysis/morfologik/lib/morfologik-fsa-1.5.2.jar"/>
+ <classpathentry kind="lib" path="modules/analysis/morfologik/lib/morfologik-polish-1.5.2.jar"/>
+ <classpathentry kind="lib" path="modules/analysis/morfologik/lib/morfologik-stemming-1.5.2.jar"/>
<classpathentry kind="lib" path="modules/benchmark/lib/commons-beanutils-1.7.0.jar"/>
<classpathentry kind="lib" path="modules/benchmark/lib/commons-collections-3.1.jar"/>
<classpathentry kind="lib" path="modules/benchmark/lib/commons-compress-1.1.jar"/>
Modified: lucene/dev/branches/LUCENE2793/dev-tools/eclipse/lucene-codestyle.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/dev-tools/eclipse/lucene-codestyle.xml?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/dev-tools/eclipse/lucene-codestyle.xml (original)
+++ lucene/dev/branches/LUCENE2793/dev-tools/eclipse/lucene-codestyle.xml Thu Jul 7 09:03:58 2011
@@ -158,7 +158,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.compiler.source" value="1.5"/>
+<setting id="org.eclipse.jdt.core.compiler.source" value="1.6"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
@@ -167,7 +167,7 @@
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.5"/>
+<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.6"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
@@ -203,7 +203,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.5"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.6"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="do not insert"/>
Modified: lucene/dev/branches/LUCENE2793/dev-tools/idea/.idea/ant.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/dev-tools/idea/.idea/ant.xml?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/dev-tools/idea/.idea/ant.xml (original)
+++ lucene/dev/branches/LUCENE2793/dev-tools/idea/.idea/ant.xml Thu Jul 7 09:03:58 2011
@@ -15,11 +15,14 @@
<buildFile url="file://$PROJECT_DIR$/lucene/contrib/xml-query-parser/build.xml" />
<buildFile url="file://$PROJECT_DIR$/modules/analysis/common/build.xml" />
<buildFile url="file://$PROJECT_DIR$/modules/analysis/icu/build.xml" />
+ <buildFile url="file://$PROJECT_DIR$/modules/analysis/morfologik/build.xml" />
<buildFile url="file://$PROJECT_DIR$/modules/analysis/phonetic/build.xml" />
<buildFile url="file://$PROJECT_DIR$/modules/analysis/smartcn/build.xml" />
<buildFile url="file://$PROJECT_DIR$/modules/analysis/stempel/build.xml" />
<buildFile url="file://$PROJECT_DIR$/modules/benchmark/build.xml" />
+ <buildFile url="file://$PROJECT_DIR$/modules/facet/build.xml" />
<buildFile url="file://$PROJECT_DIR$/modules/grouping/build.xml" />
+ <buildFile url="file://$PROJECT_DIR$/modules/join/build.xml" />
<buildFile url="file://$PROJECT_DIR$/modules/suggest/build.xml" />
<buildFile url="file://$PROJECT_DIR$/solr/build.xml" />
<buildFile url="file://$PROJECT_DIR$/solr/contrib/analysis-extras/build.xml" />
Modified: lucene/dev/branches/LUCENE2793/dev-tools/idea/.idea/modules.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/dev-tools/idea/.idea/modules.xml?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/dev-tools/idea/.idea/modules.xml (original)
+++ lucene/dev/branches/LUCENE2793/dev-tools/idea/.idea/modules.xml Thu Jul 7 09:03:58 2011
@@ -9,18 +9,22 @@
<module filepath="$PROJECT_DIR$/lucene/contrib/instantiated/instantiated.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/memory/memory.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/misc/misc.iml" />
- <module filepath="$PROJECT_DIR$/lucene/contrib/queries/queries.iml" />
- <module filepath="$PROJECT_DIR$/lucene/contrib/queryparser/queryparser.iml" />
+ <module filepath="$PROJECT_DIR$/lucene/contrib/queries/queries-contrib.iml" />
+ <module filepath="$PROJECT_DIR$/lucene/contrib/queryparser/queryparser-contrib.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/spatial/spatial.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/wordnet/wordnet.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/xml-query-parser/xml-query-parser.iml" />
- <module filepath="$PROJECT_DIR$/modules/analysis/common/common.iml" />
+ <module filepath="$PROJECT_DIR$/modules/analysis/common/analysis-common.iml" />
<module filepath="$PROJECT_DIR$/modules/analysis/icu/icu.iml" />
+ <module filepath="$PROJECT_DIR$/modules/analysis/morfologik/morfologik.iml" />
<module filepath="$PROJECT_DIR$/modules/analysis/phonetic/phonetic.iml" />
<module filepath="$PROJECT_DIR$/modules/analysis/smartcn/smartcn.iml" />
<module filepath="$PROJECT_DIR$/modules/analysis/stempel/stempel.iml" />
<module filepath="$PROJECT_DIR$/modules/benchmark/benchmark.iml" />
+ <module filepath="$PROJECT_DIR$/modules/facet/facet.iml" />
<module filepath="$PROJECT_DIR$/modules/grouping/grouping.iml" />
+ <module filepath="$PROJECT_DIR$/modules/join/join.iml" />
+ <module filepath="$PROJECT_DIR$/modules/queries/queries.iml" />
<module filepath="$PROJECT_DIR$/modules/suggest/suggest.iml" />
<module filepath="$PROJECT_DIR$/solr/solr.iml" />
<module filepath="$PROJECT_DIR$/solr/contrib/analysis-extras/analysis-extras.iml" />
Modified: lucene/dev/branches/LUCENE2793/dev-tools/idea/.idea/workspace.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/dev-tools/idea/.idea/workspace.xml?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/dev-tools/idea/.idea/workspace.xml (original)
+++ lucene/dev/branches/LUCENE2793/dev-tools/idea/.idea/workspace.xml Thu Jul 7 09:03:58 2011
@@ -23,7 +23,7 @@
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="common analysis module" type="JUnit" factoryName="JUnit">
- <module name="common" />
+ <module name="analysis-common" />
<option name="TEST_OBJECT" value="package" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/modules/analysis/build/common" />
<option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
@@ -50,6 +50,13 @@
<option name="VM_PARAMETERS" value="-ea -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
+ <configuration default="false" name="facet module" type="JUnit" factoryName="JUnit">
+ <module name="facet" />
+ <option name="TEST_OBJECT" value="package" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/modules/facet/build" />
+ <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
+ <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
+ </configuration>
<configuration default="false" name="grouping module" type="JUnit" factoryName="JUnit">
<module name="grouping" />
<option name="TEST_OBJECT" value="package" />
@@ -78,6 +85,13 @@
<option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
+ <configuration default="false" name="join module" type="JUnit" factoryName="JUnit">
+ <module name="join" />
+ <option name="TEST_OBJECT" value="package" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/modules/join/build" />
+ <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
+ <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
+ </configuration>
<configuration default="false" name="lucene" type="JUnit" factoryName="JUnit">
<module name="lucene" />
<option name="TEST_OBJECT" value="package" />
@@ -99,6 +113,13 @@
<option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
+ <configuration default="false" name="morfologik analysis module" type="JUnit" factoryName="JUnit">
+ <module name="morfologik" />
+ <option name="TEST_OBJECT" value="package" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/modules/analysis/build/morfologik" />
+ <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
+ <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
+ </configuration>
<configuration default="false" name="phonetic analysis module" type="JUnit" factoryName="JUnit">
<module name="phonetic" />
<option name="TEST_OBJECT" value="package" />
@@ -107,14 +128,21 @@
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="queries contrib" type="JUnit" factoryName="JUnit">
- <module name="queries" />
+ <module name="queries-contrib" />
<option name="TEST_OBJECT" value="package" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/queries" />
<option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
+ <configuration default="false" name="queries module" type="JUnit" factoryName="JUnit">
+ <module name="queries" />
+ <option name="TEST_OBJECT" value="package" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/modules/queries/build" />
+ <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
+ <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
+ </configuration>
<configuration default="false" name="queryparser contrib" type="JUnit" factoryName="JUnit">
- <module name="queryparser" />
+ <module name="queryparser-contrib" />
<option name="TEST_OBJECT" value="package" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/queryparser" />
<option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
@@ -176,7 +204,7 @@
<option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
- <list size="25">
+ <list size="29">
<item index="0" class="java.lang.String" itemvalue="JUnit.analysis-extras contrib" />
<item index="1" class="java.lang.String" itemvalue="JUnit.benchmark module" />
<item index="2" class="java.lang.String" itemvalue="JUnit.clustering contrib" />
@@ -184,24 +212,28 @@
<item index="4" class="java.lang.String" itemvalue="JUnit.dataimporthandler contrib" />
<item index="5" class="java.lang.String" itemvalue="JUnit.extraction contrib" />
<item index="6" class="java.lang.String" itemvalue="JUnit.extras from dataimporthandler contrib" />
- <item index="7" class="java.lang.String" itemvalue="JUnit.grouping module" />
- <item index="8" class="java.lang.String" itemvalue="JUnit.highlighter contrib" />
- <item index="9" class="java.lang.String" itemvalue="JUnit.icu analysis module" />
- <item index="10" class="java.lang.String" itemvalue="JUnit.instantiated contrib" />
- <item index="11" class="java.lang.String" itemvalue="JUnit.lucene" />
- <item index="12" class="java.lang.String" itemvalue="JUnit.memory contrib" />
- <item index="13" class="java.lang.String" itemvalue="JUnit.misc contrib" />
- <item index="14" class="java.lang.String" itemvalue="JUnit.phonetic analysis module" />
- <item index="15" class="java.lang.String" itemvalue="JUnit.queries contrib" />
- <item index="16" class="java.lang.String" itemvalue="JUnit.queryparser contrib" />
- <item index="17" class="java.lang.String" itemvalue="JUnit.smartcn analysis module" />
- <item index="18" class="java.lang.String" itemvalue="JUnit.solr" />
- <item index="19" class="java.lang.String" itemvalue="JUnit.spatial contrib" />
- <item index="20" class="java.lang.String" itemvalue="JUnit.stempel analysis module" />
- <item index="21" class="java.lang.String" itemvalue="JUnit.suggest module" />
- <item index="22" class="java.lang.String" itemvalue="JUnit.uima contrib" />
- <item index="23" class="java.lang.String" itemvalue="JUnit.wordnet contrib" />
- <item index="24" class="java.lang.String" itemvalue="JUnit.xml-query-parser contrib" />
+ <item index="7" class="java.lang.String" itemvalue="JUnit.facet module" />
+ <item index="8" class="java.lang.String" itemvalue="JUnit.grouping module" />
+ <item index="9" class="java.lang.String" itemvalue="JUnit.highlighter contrib" />
+ <item index="10" class="java.lang.String" itemvalue="JUnit.icu analysis module" />
+ <item index="11" class="java.lang.String" itemvalue="JUnit.instantiated contrib" />
+ <item index="12" class="java.lang.String" itemvalue="JUnit.join module" />
+ <item index="13" class="java.lang.String" itemvalue="JUnit.lucene" />
+ <item index="14" class="java.lang.String" itemvalue="JUnit.memory contrib" />
+ <item index="15" class="java.lang.String" itemvalue="JUnit.misc contrib" />
+ <item index="16" class="java.lang.String" itemvalue="JUnit.morfologik analysis module" />
+ <item index="17" class="java.lang.String" itemvalue="JUnit.phonetic analysis module" />
+ <item index="18" class="java.lang.String" itemvalue="JUnit.queries contrib" />
+ <item index="19" class="java.lang.String" itemvalue="JUnit.queries module" />
+ <item index="20" class="java.lang.String" itemvalue="JUnit.queryparser contrib" />
+ <item index="21" class="java.lang.String" itemvalue="JUnit.smartcn analysis module" />
+ <item index="22" class="java.lang.String" itemvalue="JUnit.solr" />
+ <item index="23" class="java.lang.String" itemvalue="JUnit.spatial contrib" />
+ <item index="24" class="java.lang.String" itemvalue="JUnit.stempel analysis module" />
+ <item index="25" class="java.lang.String" itemvalue="JUnit.suggest module" />
+ <item index="26" class="java.lang.String" itemvalue="JUnit.uima contrib" />
+ <item index="27" class="java.lang.String" itemvalue="JUnit.wordnet contrib" />
+ <item index="28" class="java.lang.String" itemvalue="JUnit.xml-query-parser contrib" />
</list>
</component>
</project>
Modified: lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/demo/demo.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/demo/demo.iml?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/demo/demo.iml (original)
+++ lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/demo/demo.iml Thu Jul 7 09:03:58 2011
@@ -11,7 +11,7 @@
<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="analysis-common" />
<orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/highlighter/highlighter.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/highlighter/highlighter.iml?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/highlighter/highlighter.iml (original)
+++ lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/highlighter/highlighter.iml Thu Jul 7 09:03:58 2011
@@ -12,7 +12,7 @@
<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="queries-contrib" />
<orderEntry type="module" module-name="misc" />
<orderEntry type="module" module-name="lucene" />
</component>
Modified: lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/instantiated/instantiated.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/instantiated/instantiated.iml?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/instantiated/instantiated.iml (original)
+++ lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/instantiated/instantiated.iml Thu Jul 7 09:03:58 2011
@@ -11,7 +11,7 @@
<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="queries-contrib" />
<orderEntry type="module" module-name="misc" />
<orderEntry type="module" module-name="lucene" />
</component>
Modified: lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/memory/memory.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/memory/memory.iml?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/memory/memory.iml (original)
+++ lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/memory/memory.iml Thu Jul 7 09:03:58 2011
@@ -11,7 +11,7 @@
<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="queries-contrib" />
<orderEntry type="module" module-name="misc" />
<orderEntry type="module" module-name="lucene" />
</component>
Modified: lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/misc/misc.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/misc/misc.iml?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/misc/misc.iml (original)
+++ lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/misc/misc.iml Thu Jul 7 09:03:58 2011
@@ -11,7 +11,6 @@
<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/LUCENE2793/dev-tools/idea/lucene/contrib/spatial/spatial.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/spatial/spatial.iml?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/spatial/spatial.iml (original)
+++ lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/spatial/spatial.iml Thu Jul 7 09:03:58 2011
@@ -11,7 +11,7 @@
<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="queries-contrib" />
<orderEntry type="module" module-name="misc" />
<orderEntry type="module" module-name="lucene" />
</component>
Modified: lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/wordnet/wordnet.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/wordnet/wordnet.iml?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/wordnet/wordnet.iml (original)
+++ lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/wordnet/wordnet.iml Thu Jul 7 09:03:58 2011
@@ -11,9 +11,8 @@
<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="queries-contrib" />
<orderEntry type="module" module-name="misc" />
- <orderEntry type="module" module-name="common" />
<orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/xml-query-parser/xml-query-parser.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/xml-query-parser/xml-query-parser.iml?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/xml-query-parser/xml-query-parser.iml (original)
+++ lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/xml-query-parser/xml-query-parser.iml Thu Jul 7 09:03:58 2011
@@ -14,9 +14,9 @@
<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="queries-contrib" />
<orderEntry type="module" module-name="misc" />
- <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="analysis-common" />
<orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/analysis/icu/icu.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/analysis/icu/icu.iml?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/analysis/icu/icu.iml (original)
+++ lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/analysis/icu/icu.iml Thu Jul 7 09:03:58 2011
@@ -23,7 +23,7 @@
</library>
</orderEntry>
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
- <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="analysis-common" />
<orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/analysis/phonetic/phonetic.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/analysis/phonetic/phonetic.iml?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/analysis/phonetic/phonetic.iml (original)
+++ lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/analysis/phonetic/phonetic.iml Thu Jul 7 09:03:58 2011
@@ -21,7 +21,7 @@
</library>
</orderEntry>
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
- <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="analysis-common" />
<orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/analysis/smartcn/smartcn.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/analysis/smartcn/smartcn.iml?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/analysis/smartcn/smartcn.iml (original)
+++ lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/analysis/smartcn/smartcn.iml Thu Jul 7 09:03:58 2011
@@ -12,7 +12,7 @@
<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="analysis-common" />
<orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/analysis/stempel/stempel.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/analysis/stempel/stempel.iml?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/analysis/stempel/stempel.iml (original)
+++ lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/analysis/stempel/stempel.iml Thu Jul 7 09:03:58 2011
@@ -12,7 +12,7 @@
<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="analysis-common" />
<orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/benchmark/benchmark.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/benchmark/benchmark.iml?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/benchmark/benchmark.iml (original)
+++ lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/benchmark/benchmark.iml Thu Jul 7 09:03:58 2011
@@ -25,10 +25,10 @@
<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="queries-contrib" />
<orderEntry type="module" module-name="misc" />
<orderEntry type="module" module-name="memory" />
- <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="analysis-common" />
<orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/suggest/suggest.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/suggest/suggest.iml?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/suggest/suggest.iml (original)
+++ lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/suggest/suggest.iml Thu Jul 7 09:03:58 2011
@@ -11,7 +11,6 @@
<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/LUCENE2793/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml (original)
+++ lucene/dev/branches/LUCENE2793/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml Thu Jul 7 09:03:58 2011
@@ -28,7 +28,7 @@
<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="analysis-common" />
<orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/LUCENE2793/dev-tools/idea/solr/contrib/clustering/clustering.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/dev-tools/idea/solr/contrib/clustering/clustering.iml?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/dev-tools/idea/solr/contrib/clustering/clustering.iml (original)
+++ lucene/dev/branches/LUCENE2793/dev-tools/idea/solr/contrib/clustering/clustering.iml Thu Jul 7 09:03:58 2011
@@ -29,11 +29,11 @@
<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="queries-contrib" />
<orderEntry type="module" module-name="solr" />
<orderEntry type="module" module-name="spatial" />
<orderEntry type="module" module-name="suggest" />
<orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="analysis-common" />
</component>
</module>
Modified: lucene/dev/branches/LUCENE2793/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml (original)
+++ lucene/dev/branches/LUCENE2793/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml Thu Jul 7 09:03:58 2011
@@ -16,7 +16,7 @@
<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="analysis-common" />
<orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/LUCENE2793/dev-tools/idea/solr/solr.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/dev-tools/idea/solr/solr.iml?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/dev-tools/idea/solr/solr.iml (original)
+++ lucene/dev/branches/LUCENE2793/dev-tools/idea/solr/solr.iml Thu Jul 7 09:03:58 2011
@@ -26,11 +26,12 @@
<orderEntry type="module" module-name="grouping" />
<orderEntry type="module" module-name="highlighter" />
<orderEntry type="module" module-name="icu" />
+ <orderEntry type="module" module-name="queries-contrib" />
<orderEntry type="module" module-name="queries" />
<orderEntry type="module" module-name="misc" />
<orderEntry type="module" module-name="phonetic" />
<orderEntry type="module" module-name="suggest" />
- <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="analysis-common" />
<orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/LUCENE2793/dev-tools/maven/README.maven
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/dev-tools/maven/README.maven?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/dev-tools/maven/README.maven (original)
+++ lucene/dev/branches/LUCENE2793/dev-tools/maven/README.maven Thu Jul 7 09:03:58 2011
@@ -21,7 +21,7 @@ A. How to use nightly Jenkins-built Luce
B. How to generate Lucene Maven artifacts
- 1. Prerequisites: JDK 1.5+ and Ant 1.7.X
+ 1. Prerequisites: JDK 1.6+ and Ant 1.7.X
2. Run the following command from the lucene/ directory:
@@ -59,8 +59,7 @@ D. How to use Maven to build Lucene/Solr
The details, followed by some example Maven commands:
- 1. Prerequisites: JDK 1.5+ (for Lucene); JDK 1.6+ (for Solr);
- Maven 2.2.1 or 3.0.X
+ 1. Prerequisites: JDK 1.6+ and Maven 2.2.1 or 3.0.X
2. Make sure your sources are up to date. If you checked your sources out
from the Apache Subversion repository, run "svn update" from the top
Modified: lucene/dev/branches/LUCENE2793/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE2793/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template Thu Jul 7 09:03:58 2011
@@ -56,7 +56,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-queries</artifactId>
+ <artifactId>lucene-queries-contrib</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Modified: lucene/dev/branches/LUCENE2793/dev-tools/maven/lucene/contrib/misc/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/dev-tools/maven/lucene/contrib/misc/pom.xml.template?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/dev-tools/maven/lucene/contrib/misc/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE2793/dev-tools/maven/lucene/contrib/misc/pom.xml.template Thu Jul 7 09:03:58 2011
@@ -55,11 +55,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>lucene-analyzers-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: lucene/dev/branches/LUCENE2793/dev-tools/maven/lucene/contrib/queries/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/dev-tools/maven/lucene/contrib/queries/pom.xml.template?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/dev-tools/maven/lucene/contrib/queries/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE2793/dev-tools/maven/lucene/contrib/queries/pom.xml.template Thu Jul 7 09:03:58 2011
@@ -27,9 +27,9 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-queries</artifactId>
+ <artifactId>lucene-queries-contrib</artifactId>
<packaging>jar</packaging>
- <name>Lucene Queries</name>
+ <name>Lucene Queries Contrib</name>
<description>
Queries - various query object exotica not in core
</description>
Modified: lucene/dev/branches/LUCENE2793/dev-tools/maven/lucene/contrib/queryparser/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/dev-tools/maven/lucene/contrib/queryparser/pom.xml.template?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/dev-tools/maven/lucene/contrib/queryparser/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE2793/dev-tools/maven/lucene/contrib/queryparser/pom.xml.template Thu Jul 7 09:03:58 2011
@@ -27,7 +27,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-queryparser</artifactId>
+ <artifactId>lucene-queryparser-contrib</artifactId>
<packaging>jar</packaging>
<name>Lucene Query Parser</name>
<description>
Modified: lucene/dev/branches/LUCENE2793/dev-tools/maven/lucene/contrib/spatial/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/dev-tools/maven/lucene/contrib/spatial/pom.xml.template?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/dev-tools/maven/lucene/contrib/spatial/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE2793/dev-tools/maven/lucene/contrib/spatial/pom.xml.template Thu Jul 7 09:03:58 2011
@@ -49,7 +49,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-queries</artifactId>
+ <artifactId>lucene-queries-contrib</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Modified: lucene/dev/branches/LUCENE2793/dev-tools/maven/lucene/contrib/wordnet/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/dev-tools/maven/lucene/contrib/wordnet/pom.xml.template?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/dev-tools/maven/lucene/contrib/wordnet/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE2793/dev-tools/maven/lucene/contrib/wordnet/pom.xml.template Thu Jul 7 09:03:58 2011
@@ -48,11 +48,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>lucene-analyzers-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: lucene/dev/branches/LUCENE2793/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml.template?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE2793/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml.template Thu Jul 7 09:03:58 2011
@@ -49,7 +49,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-queries</artifactId>
+ <artifactId>lucene-queries-contrib</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Modified: lucene/dev/branches/LUCENE2793/dev-tools/maven/modules/analysis/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/dev-tools/maven/modules/analysis/pom.xml.template?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/dev-tools/maven/modules/analysis/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE2793/dev-tools/maven/modules/analysis/pom.xml.template Thu Jul 7 09:03:58 2011
@@ -33,6 +33,7 @@
<modules>
<module>common</module>
<module>icu</module>
+ <module>morfologik</module>
<module>phonetic</module>
<module>smartcn</module>
<module>stempel</module>
Modified: lucene/dev/branches/LUCENE2793/dev-tools/maven/modules/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/dev-tools/maven/modules/pom.xml.template?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/dev-tools/maven/modules/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE2793/dev-tools/maven/modules/pom.xml.template Thu Jul 7 09:03:58 2011
@@ -33,7 +33,10 @@
<modules>
<module>analysis</module>
<module>benchmark</module>
+ <module>facet</module>
<module>grouping</module>
+ <module>join</module>
+ <module>queries</module>
<module>suggest</module>
</modules>
<build>
Modified: lucene/dev/branches/LUCENE2793/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/dev-tools/maven/pom.xml.template?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE2793/dev-tools/maven/pom.xml.template Thu Jul 7 09:03:58 2011
@@ -41,7 +41,7 @@
<properties>
<base.specification.version>4.0.0</base.specification.version>
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
- <java.compat.version>1.5</java.compat.version>
+ <java.compat.version>1.6</java.compat.version>
<jetty.version>6.1.26</jetty.version>
<patched.jetty.version>6.1.26-patched-JETTY-1340</patched.jetty.version>
<slf4j.version>1.6.1</slf4j.version>
@@ -281,6 +281,11 @@
<version>3.5.0</version>
</dependency>
<dependency>
+ <groupId>org.carrot2</groupId>
+ <artifactId>morfologik-polish</artifactId>
+ <version>1.5.2</version>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
<version>3.2.7</version>
Modified: lucene/dev/branches/LUCENE2793/dev-tools/maven/solr/src/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/dev-tools/maven/solr/src/pom.xml.template?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/dev-tools/maven/solr/src/pom.xml.template (original)
+++ lucene/dev/branches/LUCENE2793/dev-tools/maven/solr/src/pom.xml.template Thu Jul 7 09:03:58 2011
@@ -78,7 +78,12 @@
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-queries</artifactId>
+ <artifactId>lucene-queries-contrib</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-queries-contrib</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -97,6 +102,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-queries</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-commons-csv</artifactId>
</dependency>
@@ -152,6 +162,11 @@
<artifactId>slf4j-jdk14</artifactId>
</dependency>
<dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
Modified: lucene/dev/branches/LUCENE2793/dev-tools/scripts/smokeTestRelease.py
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/dev-tools/scripts/smokeTestRelease.py?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/dev-tools/scripts/smokeTestRelease.py (original)
+++ lucene/dev/branches/LUCENE2793/dev-tools/scripts/smokeTestRelease.py Thu Jul 7 09:03:58 2011
@@ -29,6 +29,9 @@ import HTMLParser
# http://s.apache.org/lusolr32rc2
+JAVA5_HOME = '/usr/local/src/jdk1.5.0_22'
+JAVA6_HOME = '/usr/local/src/jdk1.6.0_21'
+
# TODO
# + verify KEYS contains key that signed the release
# + make sure changes HTML looks ok
@@ -212,13 +215,40 @@ def testChanges(project, version, change
raise RuntimeError('did not see Contrib-Changes.html link from %s' % changesURLString)
s = load(changesURL)
+ checkChangesContent(s, version, changesURL, project, True)
+
+def testChangesText(dir, version, project):
+ "Checks all CHANGES.txt under this dir."
+ for root, dirs, files in os.walk(dir):
+
+ # NOTE: O(N) but N should be smallish:
+ if 'CHANGES.txt' in files:
+ fullPath = '%s/CHANGES.txt' % root
+ print 'CHECK %s' % fullPath
+ checkChangesContent(open(fullPath).read(), version, fullPath, project, False)
+
+def checkChangesContent(s, version, name, project, isHTML):
+
+ if isHTML and s.find('Release %s' % version) == -1:
+ raise RuntimeError('did not see "Release %s" in %s' % (version, name))
+
+ if s.lower().find('not yet released') != -1:
+ raise RuntimeError('saw "not yet released" in %s' % name)
- if s.find('Release %s' % version) == -1:
- raise RuntimeError('did not see "Release %s" in %s' % (version, changesURL))
+ if not isHTML:
+ if project == 'lucene':
+ sub = 'Lucene %s' % version
+ else:
+ sub = version
+
+ if s.find(sub) == -1:
+ # contrib/benchmark never seems to include release info:
+ if name.find('/benchmark/') == -1:
+ raise RuntimeError('did not see "%s" in %s' % (sub, name))
def run(command, logFile):
if os.system('%s > %s 2>&1' % (command, logFile)):
- raise RuntimeError('command "%s" failed; see log file %s' % (command, logFile))
+ raise RuntimeError('command "%s" failed; see log file %s/%s' % (command, os.getcwd(), logFile))
def verifyDigests(artifact, urlString, tmpDir):
print ' verify md5/sha1 digests'
@@ -327,26 +357,33 @@ def verifyUnpacked(project, artifact, un
if isSrc:
if project == 'lucene':
print ' run tests w/ Java 5...'
- run('export JAVA_HOME=/usr/local/src/jdk1.5.0_22; ant test', '%s/test.log' % unpackPath)
- run('export JAVA_HOME=/usr/local/src/jdk1.5.0_22; ant jar', '%s/compile.log' % unpackPath)
- testDemo(isSrc)
+ run('export JAVA_HOME=%s; ant test' % JAVA5_HOME, '%s/test.log' % unpackPath)
+ run('export JAVA_HOME=%s; ant jar' % JAVA5_HOME, '%s/compile.log' % unpackPath)
+ testDemo(isSrc, version)
else:
print ' run tests w/ Java 6...'
- run('export JAVA_HOME=/usr/local/src/jdk1.6.0_21; ant test', '%s/test.log' % unpackPath)
+ run('export JAVA_HOME=%s; ant test' % JAVA6_HOME, '%s/test.log' % unpackPath)
else:
if project == 'lucene':
- testDemo(isSrc)
+ testDemo(isSrc, version)
-def testDemo(isSrc):
+ testChangesText('.', version, project)
+
+def testDemo(isSrc, version):
print ' test demo...'
if isSrc:
- cp = 'build/lucene-core-3.2-SNAPSHOT.jar:build/contrib/demo/lucene-demo-3.2-SNAPSHOT.jar'
+ # allow lucene dev version to be either 3.3 or 3.3.0:
+ if version.endswith('.0'):
+ cp = 'build/lucene-core-%s-SNAPSHOT.jar:build/contrib/demo/lucene-demo-%s-SNAPSHOT.jar' % (version, version)
+ cp += ':build/lucene-core-%s-SNAPSHOT.jar:build/contrib/demo/lucene-demo-%s-SNAPSHOT.jar' % (version[:-2], version[:-2])
+ else:
+ cp = 'build/lucene-core-%s-SNAPSHOT.jar:build/contrib/demo/lucene-demo-%s-SNAPSHOT.jar' % (version, version)
docsDir = 'src'
else:
- cp = 'lucene-core-3.2.0.jar:contrib/demo/lucene-demo-3.2.0.jar'
+ cp = 'lucene-core-%s.jar:contrib/demo/lucene-demo-%s.jar' % (version, version)
docsDir = 'docs'
- run('export JAVA_HOME=/usr/local/src/jdk1.5.0_22; java -cp %s org.apache.lucene.demo.IndexFiles -index index -docs %s' % (cp, docsDir), 'index.log')
- run('export JAVA_HOME=/usr/local/src/jdk1.5.0_22; java -cp %s org.apache.lucene.demo.SearchFiles -index index -query lucene' % cp, 'search.log')
+ run('export JAVA_HOME=%s; %s/bin/java -cp %s org.apache.lucene.demo.IndexFiles -index index -docs %s' % (JAVA5_HOME, JAVA5_HOME, cp, docsDir), 'index.log')
+ run('export JAVA_HOME=%s; %s/bin/java -cp %s org.apache.lucene.demo.SearchFiles -index index -query lucene' % (JAVA5_HOME, JAVA5_HOME, cp), 'search.log')
reMatchingDocs = re.compile('(\d+) total matching documents')
m = reMatchingDocs.search(open('search.log', 'rb').read())
if m is None:
Modified: lucene/dev/branches/LUCENE2793/lucene/BUILD.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/lucene/BUILD.txt?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/lucene/BUILD.txt (original)
+++ lucene/dev/branches/LUCENE2793/lucene/BUILD.txt Thu Jul 7 09:03:58 2011
@@ -1,14 +1,14 @@
Lucene Build Instructions
Basic steps:
- 0) Install JDK 1.5 (or greater), Ant 1.7.0 (or greater)
+ 0) Install JDK 1.5 (or greater), Ant 1.7.x (not 1.6.x, not 1.8.x)
1) Download Lucene from Apache and unpack it
2) Connect to the top-level of your Lucene installation
3) Install JavaCC (optional)
4) Run ant
Step 0) Set up your development environment (JDK 1.5 or greater,
-Ant 1.7.0 or greater)
+Ant 1.7.x)
We'll assume that you know how to get and set up the JDK - if you
don't, then we suggest starting at http://java.sun.com and learning
@@ -16,7 +16,7 @@ more about Java, before returning to thi
JDK 1.5 and later.
Like many Open Source java projects, Lucene uses Apache Ant for build
-control. Specifically, you MUST use Ant version 1.7.0 or greater.
+control. Specifically, you MUST use Ant version 1.7.x
Ant is "kind of like make without make's wrinkles". Ant is
implemented in java and uses XML-based configuration files. You can
Modified: lucene/dev/branches/LUCENE2793/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/lucene/CHANGES.txt?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/LUCENE2793/lucene/CHANGES.txt Thu Jul 7 09:03:58 2011
@@ -149,6 +149,13 @@ Changes in backwards compatibility polic
files holding stored fields and term vectors) while flushing a
segment. (Mike McCandless)
+* LUCENE-2548: Field names (eg in Term, FieldInfo) are no longer
+ interned. (Mike McCandless)
+
+* LUCENE-2883: The contents of o.a.l.search.function has been consolidated into
+ the queries module and can be found at o.a.l.queries.function. See MIGRATE.txt
+ for more information (Chris Male)
+
Changes in Runtime Behavior
* LUCENE-2846: omitNorms now behaves like omitTermFrequencyAndPositions, if you
@@ -281,6 +288,17 @@ 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-3219: SortField type properties have been moved to an enum
+ SortField.Type. In be consistent, CachedArrayCreator.getSortTypeID() has
+ been changed CachedArrayCreator.getSortType(). (Chris Male)
+
+* LUCENE-3225: Add TermsEnum.seekExact for faster seeking when you
+ don't need the ceiling term; renamed existing seek methods to either
+ seekCeil or seekExact; changed seekExact(ord) to return no value.
+ Fixed MemoryCodec and SimpleTextCodec to optimize the seekExact
+ case, and fixed places in Lucene to use seekExact when possible.
+ (Mike McCandless)
+
New features
* LUCENE-2604: Added RegexpQuery support to QueryParser. Regular expressions
@@ -458,7 +476,7 @@ Optimizations
MultiTermQuery now stores TermState per leaf reader during rewrite to re-
seek the term dictionary in TermQuery / TermWeight.
(Simon Willnauer, Mike McCandless, Robert Muir)
-
+
Bug fixes
* LUCENE-2633: PackedInts Packed32 and Packed64 did not support internal
@@ -474,6 +492,26 @@ Bug fixes
======================= Lucene 3.x (not yet released) ================
+Bug fixes
+
+* LUCENE-3251: Directory#copy failed to close target output if opening the
+ source stream failed. (Simon Willnauer)
+
+* LUCENE-3254: Fixed minor bug in deletes were written to disk,
+ causing the file to sometimes be larger than it needed to be. (Mike
+ McCandless)
+
+Optimizations
+
+* LUCENE-3201, LUCENE-3218: CompoundFileSystem code has been consolidated
+ into a Directory implementation. Reading is optimized for MMapDirectory,
+ NIOFSDirectory and SimpleFSDirectory to only map requested parts of the
+ CFS into an IndexInput. Writing to a CFS now tries to append to the CF
+ directly if possible and merges separately written files on the fly instead
+ of during close. (Simon Willnauer, Robert Muir)
+
+======================= Lucene 3.3.0 =======================
+
Changes in backwards compatibility policy
* LUCENE-3140: IndexOutput.copyBytes now takes a DataInput (superclass
@@ -489,6 +527,13 @@ Changes in backwards compatibility polic
overridden one of these methods, cut over to the non-deprecated
implementation. (Uwe Schindler, Robert Muir, Yonik Seeley)
+* LUCENE-3238: Made MultiTermQuery.rewrite() final, to prevent
+ problems (such as not properly setting rewrite methods, or
+ not working correctly with things like SpanMultiTermQueryWrapper).
+ To rewrite to a simpler form, instead return a simpler enum
+ from getEnum(IndexReader). For example, to rewrite to a single term,
+ return a SingleTermEnum. (ludovic Boutros, Uwe Schindler, Robert Muir)
+
Changes in runtime behavior
* LUCENE-2834: the hash used to compute the lock file name when the
@@ -537,6 +582,14 @@ Bug fixes
background optimize when documents are still being deleted
concurrently with the optimize (Mike McCandless)
+* LUCENE-3222: The RAM accounting for buffered delete terms was
+ failing to measure the space required to hold the term's field and
+ text character data. (Mike McCandless)
+
+* LUCENE-3238: Fixed bug where using WildcardQuery("prefix*") inside
+ of a SpanMultiTermQueryWrapper rewrote incorrectly and returned
+ an error instead. (ludovic Boutros, Uwe Schindler, Robert Muir)
+
API Changes
* LUCENE-3208: Renamed protected IndexSearcher.createWeight() to expert
Modified: lucene/dev/branches/LUCENE2793/lucene/MIGRATE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/lucene/MIGRATE.txt?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/lucene/MIGRATE.txt (original)
+++ lucene/dev/branches/LUCENE2793/lucene/MIGRATE.txt Thu Jul 7 09:03:58 2011
@@ -364,3 +364,21 @@ LUCENE-1458, LUCENE-2111: Flexible Index
for applications that rely on Lucene's internal document ID
assigment. If so, you should instead use LogByteSize/DocMergePolicy
during indexing.
+
+* LUCENE-2883: Lucene's o.a.l.search.function ValueSource based functionality, was consolidated
+ into module/queries along with Solr's similar functionality. The following classes were moved:
+ - o.a.l.search.function.CustomScoreQuery -> o.a.l.queries.CustomScoreQuery
+ - o.a.l.search.function.CustomScoreProvider -> o.a.l.queries.CustomScoreProvider
+ - o.a.l.search.function.NumericIndexDocValueSource -> o.a.l.queries.function.valuesource.NumericIndexDocValueSource
+ The following lists the replacement classes for those removed:
+ - o.a.l.search.function.ByteFieldSource -> o.a.l.queries.function.valuesource.ByteFieldSource
+ - o.a.l.search.function.DocValues -> o.a.l.queries.function.DocValues
+ - o.a.l.search.function.FieldCacheSource -> o.a.l.queries.function.valuesource.FieldCacheSource
+ - o.a.l.search.function.FieldScoreQuery ->o.a.l.queries.function.FunctionQuery
+ - o.a.l.search.function.FloatFieldSource -> o.a.l.queries.function.valuesource.FloatFieldSource
+ - o.a.l.search.function.IntFieldSource -> o.a.l.queries.function.valuesource.IntFieldSource
+ - o.a.l.search.function.OrdFieldSource -> o.a.l.queries.function.valuesource.OrdFieldSource
+ - o.a.l.search.function.ReverseOrdFieldSource -> o.a.l.queries.function.valuesource.ReverseOrdFieldSource
+ - o.a.l.search.function.ShortFieldSource -> o.a.l.queries.function.valuesource.ShortFieldSource
+ - o.a.l.search.function.ValueSource -> o.a.l.queries.function.ValueSource
+ - o.a.l.search.function.ValueSourceQuery -> o.a.l.queries.function.FunctionQuery
Modified: lucene/dev/branches/LUCENE2793/lucene/README.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/lucene/README.txt?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/lucene/README.txt (original)
+++ lucene/dev/branches/LUCENE2793/lucene/README.txt Thu Jul 7 09:03:58 2011
@@ -22,6 +22,7 @@ lucene-core-XX-javadoc.jar
lucene-test-framework-XX.jar
The compiled Lucene test-framework library.
+ Depends on junit 4.7.x (not 4.6.x, not 4.8.x), and Apache Ant 1.7.x (not 1.6.x, not 1.8.x)
lucene-test-framework-XX-javadoc.jar
The Javadoc jar for the compiled Lucene test-framework library.
Modified: lucene/dev/branches/LUCENE2793/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/lucene/common-build.xml?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/lucene/common-build.xml (original)
+++ lucene/dev/branches/LUCENE2793/lucene/common-build.xml Thu Jul 7 09:03:58 2011
@@ -95,15 +95,15 @@
<property name="javac.deprecation" value="off"/>
<property name="javac.debug" value="on"/>
- <property name="javac.source" value="1.5"/>
- <property name="javac.target" value="1.5"/>
- <property name="javac.source.backwards" value="1.5"/>
- <property name="javac.target.backwards" value="1.5"/>
+ <property name="javac.source" value="1.6"/>
+ <property name="javac.target" value="1.6"/>
+ <property name="javac.source.backwards" value="1.6"/>
+ <property name="javac.target.backwards" value="1.6"/>
<!-- clover wants to run with -lib, otherwise we prefer a repeatable
classpath -->
<property name="javac.includeAntRuntime" value="${run.clover}"/>
- <property name="javadoc.link" value="http://java.sun.com/j2se/1.5/docs/api/"/>
+ <property name="javadoc.link" value="http://download.oracle.com/javase/6/docs/api/"/>
<property name="javadoc.access" value="protected"/>
<property name="javadoc.charset" value="utf-8"/>
<property name="javadoc.dir" value="${common.dir}/build/docs/api"/>
@@ -838,8 +838,6 @@
<!-- Lucene -->
<arg value="-c" />
<arg value="${basedir}/lib" />
- <arg value="-c" />
- <arg value="${basedir}/contrib/queries/lib" />
</java>
</target>
Modified: lucene/dev/branches/LUCENE2793/lucene/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/lucene/contrib/CHANGES.txt?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/lucene/contrib/CHANGES.txt (original)
+++ lucene/dev/branches/LUCENE2793/lucene/contrib/CHANGES.txt Thu Jul 7 09:03:58 2011
@@ -4,6 +4,11 @@ For more information on past and future
http://s.apache.org/luceneversions
======================= Trunk (not yet released) =======================
+
+Changes in runtime behavior
+
+ * LUCENE-3250: Wordnet's SynExpand requires a non-null Analyzer (it no longer
+ treats null as StandardAnalyzer). (Robert Muir)
Build
@@ -57,6 +62,31 @@ Bug Fixes
New Features
+ * LUCENE-3234: provide a limit on phrase analysis in FastVectorHighlighter for
+ highlighting speed up. Use FastVectorHighlighter.setPhraseLimit() to set limit
+ (e.g. 5000). (Mike Sokolov via Koji Sekiguchi)
+
+ * LUCENE-3079: a new facet module which provides faceted indexing & search
+ capabilities. It allows managing a taxonomy of categories, and index them
+ with documents. It also provides search API for aggregating (e.g. count)
+ the weights of the categories that are relevant to the search results.
+ (Shai Erera)
+
+ * LUCENE-3171: Added BlockJoinQuery and BlockJoinCollector, under the
+ new contrib/join module, to enable searches that require joining
+ between parent and child documents. Joined (children + parent)
+ documents must be indexed as a document block, using
+ IndexWriter.add/UpdateDocuments (Mark Harwood, Mike McCandless)
+
+API Changes
+
+Bug Fixes
+
+
+======================= Lucene 3.3.0 =======================
+
+New Features
+
* LUCENE-152: Add KStem (light stemmer for English).
(Yonik Seeley via Robert Muir)
Modified: lucene/dev/branches/LUCENE2793/lucene/contrib/contrib-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/lucene/contrib/contrib-build.xml?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/lucene/contrib/contrib-build.xml (original)
+++ lucene/dev/branches/LUCENE2793/lucene/contrib/contrib-build.xml Thu Jul 7 09:03:58 2011
@@ -75,7 +75,7 @@
property="pom.xml.present">
</available>
- <target name="dist-maven" if="pom.xml.present" depends="compile-core, jar-src">
+ <target name="dist-maven" if="pom.xml.present" depends="jar-core, jar-src, javadocs">
<taskdef resource="org/apache/maven/artifact/ant/antlib.xml"
uri="antlib:org.apache.maven.artifact.ant"
classpathref="maven-ant-tasks.classpath"/>
@@ -116,6 +116,7 @@
<macrodef name="contrib-uptodate">
<attribute name="name"/>
<attribute name="property" default="@{name}.uptodate"/>
+ <attribute name="contrib-src-name" default="@{name}"/>
<attribute name="classpath.property" default="@{name}.jar"/>
<!-- set jarfile only, if the target jar file has no generic name, applies to analyzers with its common and smartcn subdir -->
<attribute name="jarfile" default="${common.dir}/build/contrib/@{name}/lucene-@{name}-${version}.jar"/>
@@ -123,7 +124,7 @@
<!--<echo message="Checking '@{jarfile}' against source folder '${common.dir}/contrib/@{name}/src/java'"/>-->
<property name="@{classpath.property}" location="@{jarfile}"/>
<uptodate property="@{property}" targetfile="@{jarfile}">
- <srcfiles dir="${common.dir}/contrib/@{name}/src/java" includes="**/*.java"/>
+ <srcfiles dir="${common.dir}/contrib/@{contrib-src-name}/src/java" includes="**/*.java"/>
</uptodate>
</sequential>
</macrodef>
@@ -131,13 +132,14 @@
<macrodef name="module-uptodate">
<attribute name="name"/>
<attribute name="property" default="@{name}.uptodate"/>
+ <attribute name="module-src-name" default="@{name}"/>
<attribute name="classpath.property" default="@{name}.jar"/>
<!-- set jarfile only, if the target jar file has no generic name, applies to analyzers with its common and smartcn subdir -->
- <attribute name="jarfile" default="${common.dir}/../modules/@{name}/build/lucene-@{name}-${version}.jar"/>
+ <attribute name="jarfile" default="${common.dir}/../modules/@{module-src-name}/build/lucene-@{name}-${version}.jar"/>
<sequential>
<property name="@{classpath.property}" location="@{jarfile}"/>
<uptodate property="@{property}" targetfile="@{jarfile}">
- <srcfiles dir="${common.dir}/../modules/@{name}/src/java" includes="**/*.java"/>
+ <srcfiles dir="${common.dir}/../modules/@{module-src-name}/src/java" includes="**/*.java"/>
</uptodate>
</sequential>
</macrodef>
Modified: lucene/dev/branches/LUCENE2793/lucene/contrib/demo/src/java/org/apache/lucene/demo/IndexFiles.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/lucene/contrib/demo/src/java/org/apache/lucene/demo/IndexFiles.java?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/lucene/contrib/demo/src/java/org/apache/lucene/demo/IndexFiles.java (original)
+++ lucene/dev/branches/LUCENE2793/lucene/contrib/demo/src/java/org/apache/lucene/demo/IndexFiles.java Thu Jul 7 09:03:58 2011
@@ -38,7 +38,11 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.util.Date;
-/** Index all text files under a directory. See http://lucene.apache.org/java/4_0/demo.html. */
+/** Index all text files under a directory.
+ * <p>
+ * This is a command-line application demonstrating simple Lucene indexing.
+ * Run it with no command-line arguments for usage information.
+ */
public class IndexFiles {
private IndexFiles() {}
@@ -47,8 +51,8 @@ public class IndexFiles {
public static void main(String[] args) {
String usage = "java org.apache.lucene.demo.IndexFiles"
+ " [-index INDEX_PATH] [-docs DOCS_PATH] [-update]\n\n"
- // TODO: Change the link with every release (or: fill in some less error-prone alternative here...)
- + "See http://lucene.apache.org/java/4_0/demo.html for details.";
+ + "This indexes the documents in DOCS_PATH, creating a Lucene index"
+ + "in INDEX_PATH that can be searched with SearchFiles";
String indexPath = "index";
String docsPath = null;
boolean create = true;
Modified: lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/build.xml?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/build.xml (original)
+++ lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/build.xml Thu Jul 7 09:03:58 2011
@@ -26,7 +26,7 @@
<import file="../contrib-build.xml"/>
<contrib-uptodate name="memory" property="memory.uptodate" classpath.property="memory.jar"/>
- <contrib-uptodate name="queries" property="queries.uptodate" classpath.property="queries.jar"/>
+ <contrib-uptodate name="queries-contrib" contrib-src-name="queries" property="queries.uptodate" classpath.property="queries.jar"/>
<path id="classpath">
<pathelement path="${memory.jar}"/>
Modified: lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryScorer.java?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryScorer.java (original)
+++ lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryScorer.java Thu Jul 7 09:03:58 2011
@@ -31,7 +31,6 @@ import org.apache.lucene.index.IndexRead
import org.apache.lucene.index.memory.MemoryIndex;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.spans.SpanQuery;
-import org.apache.lucene.util.StringHelper;
/**
* {@link Scorer} implementation which scores text fragments by the number of
@@ -88,7 +87,7 @@ public class QueryScorer implements Scor
* @param defaultField
*/
public QueryScorer(Query query, IndexReader reader, String field, String defaultField) {
- this.defaultField = StringHelper.intern(defaultField);
+ this.defaultField = defaultField;
init(query, field, reader, true);
}
@@ -96,7 +95,7 @@ public class QueryScorer implements Scor
* @param defaultField - The default field for queries with the field name unspecified
*/
public QueryScorer(Query query, String field, String defaultField) {
- this.defaultField = StringHelper.intern(defaultField);
+ this.defaultField = defaultField;
init(query, field, null, true);
}
Modified: lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryTermExtractor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryTermExtractor.java?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryTermExtractor.java (original)
+++ lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryTermExtractor.java Thu Jul 7 09:03:58 2011
@@ -26,7 +26,6 @@ import org.apache.lucene.search.BooleanC
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.FilteredQuery;
import org.apache.lucene.search.Query;
-import org.apache.lucene.util.StringHelper;
/**
* Utility class used to extract the terms used in a query, plus any weights.
@@ -94,10 +93,6 @@ public final class QueryTermExtractor
public static final WeightedTerm[] getTerms(Query query, boolean prohibited, String fieldName)
{
HashSet<WeightedTerm> terms=new HashSet<WeightedTerm>();
- if(fieldName!=null)
- {
- fieldName= StringHelper.intern(fieldName);
- }
getTerms(query,terms,prohibited,fieldName);
return terms.toArray(new WeightedTerm[0]);
}
@@ -114,7 +109,6 @@ public final class QueryTermExtractor
return getTerms(query,prohibited,null);
}
- //fieldname MUST be interned prior to this call
private static final void getTerms(Query query, HashSet<WeightedTerm> terms,boolean prohibited, String fieldName)
{
try
@@ -131,7 +125,7 @@ public final class QueryTermExtractor
for (Iterator<Term> iter = nonWeightedTerms.iterator(); iter.hasNext();)
{
Term term = iter.next();
- if((fieldName==null)||(term.field()==fieldName))
+ if((fieldName==null)||(term.field().equals(fieldName)))
{
terms.add(new WeightedTerm(query.getBoost(),term.text()));
}
Modified: lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java (original)
+++ lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java Thu Jul 7 09:03:58 2011
@@ -41,7 +41,6 @@ import org.apache.lucene.search.spans.Sp
import org.apache.lucene.search.spans.SpanQuery;
import org.apache.lucene.search.spans.SpanTermQuery;
import org.apache.lucene.search.spans.Spans;
-import org.apache.lucene.util.StringHelper;
/**
* Class used to extract {@link WeightedSpanTerm}s from a {@link Query} based on whether
@@ -63,7 +62,7 @@ public class WeightedSpanTermExtractor {
public WeightedSpanTermExtractor(String defaultField) {
if (defaultField != null) {
- this.defaultField = StringHelper.intern(defaultField);
+ this.defaultField = defaultField;
}
}
@@ -314,8 +313,8 @@ public class WeightedSpanTermExtractor {
* Necessary to implement matches for queries against <code>defaultField</code>
*/
private boolean fieldNameComparator(String fieldNameToCheck) {
- boolean rv = fieldName == null || fieldNameToCheck == fieldName
- || fieldNameToCheck == defaultField;
+ boolean rv = fieldName == null || fieldName.equals(fieldNameToCheck)
+ || (defaultField != null && defaultField.equals(fieldNameToCheck));
return rv;
}
@@ -372,7 +371,7 @@ public class WeightedSpanTermExtractor {
public Map<String,WeightedSpanTerm> getWeightedSpanTerms(Query query, TokenStream tokenStream,
String fieldName) throws IOException {
if (fieldName != null) {
- this.fieldName = StringHelper.intern(fieldName);
+ this.fieldName = fieldName;
} else {
this.fieldName = null;
}
@@ -408,7 +407,7 @@ public class WeightedSpanTermExtractor {
public Map<String,WeightedSpanTerm> getWeightedSpanTermsWithScores(Query query, TokenStream tokenStream, String fieldName,
IndexReader reader) throws IOException {
if (fieldName != null) {
- this.fieldName = StringHelper.intern(fieldName);
+ this.fieldName = fieldName;
} else {
this.fieldName = null;
}
Modified: lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FastVectorHighlighter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FastVectorHighlighter.java?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FastVectorHighlighter.java (original)
+++ lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FastVectorHighlighter.java Thu Jul 7 09:03:58 2011
@@ -35,6 +35,7 @@ public class FastVectorHighlighter {
private final boolean fieldMatch;
private final FragListBuilder fragListBuilder;
private final FragmentsBuilder fragmentsBuilder;
+ private int phraseLimit = Integer.MAX_VALUE;
/**
* the default constructor.
@@ -173,7 +174,7 @@ public class FastVectorHighlighter {
final FieldQuery fieldQuery, IndexReader reader, int docId,
String fieldName, int fragCharSize ) throws IOException {
FieldTermStack fieldTermStack = new FieldTermStack( reader, docId, fieldName, fieldQuery );
- FieldPhraseList fieldPhraseList = new FieldPhraseList( fieldTermStack, fieldQuery );
+ FieldPhraseList fieldPhraseList = new FieldPhraseList( fieldTermStack, fieldQuery, phraseLimit );
return fragListBuilder.createFieldFragList( fieldPhraseList, fragCharSize );
}
@@ -190,4 +191,15 @@ public class FastVectorHighlighter {
* @return whether fieldMatch or not
*/
public boolean isFieldMatch(){ return fieldMatch; }
+
+ /**
+ * @return the maximum number of phrases to analyze when searching for the highest-scoring phrase.
+ */
+ public int getPhraseLimit () { return phraseLimit; }
+
+ /**
+ * set the maximum number of phrases to analyze when searching for the highest-scoring phrase.
+ * The default is unlimited (Integer.MAX_VALUE).
+ */
+ public void setPhraseLimit (int phraseLimit) { this.phraseLimit = phraseLimit; }
}
Modified: lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldPhraseList.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldPhraseList.java?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldPhraseList.java (original)
+++ lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldPhraseList.java Thu Jul 7 09:03:58 2011
@@ -30,21 +30,32 @@ import org.apache.lucene.search.vectorhi
public class FieldPhraseList {
LinkedList<WeightedPhraseInfo> phraseList = new LinkedList<WeightedPhraseInfo>();
-
+
+ /**
+ * create a FieldPhraseList that has no limit on the number of phrases to analyze
+ *
+ * @param fieldTermStack FieldTermStack object
+ * @param fieldQuery FieldQuery object
+ */
+ public FieldPhraseList( FieldTermStack fieldTermStack, FieldQuery fieldQuery){
+ this (fieldTermStack, fieldQuery, Integer.MAX_VALUE);
+ }
+
/**
* a constructor.
*
* @param fieldTermStack FieldTermStack object
* @param fieldQuery FieldQuery object
+ * @param phraseLimit maximum size of phraseList
*/
- public FieldPhraseList( FieldTermStack fieldTermStack, FieldQuery fieldQuery ){
+ public FieldPhraseList( FieldTermStack fieldTermStack, FieldQuery fieldQuery, int phraseLimit){
final String field = fieldTermStack.getFieldName();
LinkedList<TermInfo> phraseCandidate = new LinkedList<TermInfo>();
QueryPhraseMap currMap = null;
QueryPhraseMap nextMap = null;
- while( !fieldTermStack.isEmpty() ){
-
+ while( !fieldTermStack.isEmpty() && (phraseList.size() < phraseLimit) )
+ {
phraseCandidate.clear();
TermInfo ti = fieldTermStack.pop();
Modified: lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldQuery.java?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldQuery.java (original)
+++ lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldQuery.java Thu Jul 7 09:03:58 2011
@@ -34,8 +34,8 @@ import org.apache.lucene.search.TermQuer
import org.apache.lucene.search.vectorhighlight.FieldTermStack.TermInfo;
/**
- * FieldQuery breaks down query object into terms/phrases and keep
- * them in QueryPhraseMap structure.
+ * FieldQuery breaks down query object into terms/phrases and keeps
+ * them in a QueryPhraseMap structure.
*/
public class FieldQuery {
Modified: lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java (original)
+++ lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java Thu Jul 7 09:03:58 2011
@@ -115,8 +115,7 @@ public class FieldTermStack {
* @param termInfo the TermInfo object to be put on the top of the stack
*/
public void push( TermInfo termInfo ){
- // termList.push( termInfo ); // avoid Java 1.6 feature
- termList.addFirst( termInfo );
+ termList.push( termInfo );
}
/**
Modified: lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldPhraseListTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldPhraseListTest.java?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldPhraseListTest.java (original)
+++ lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldPhraseListTest.java Thu Jul 7 09:03:58 2011
@@ -188,4 +188,34 @@ public class FieldPhraseListTest extends
assertEquals( 1, fpl.phraseList.size() );
assertEquals( "sppeeeed(1.0)((88,93))", fpl.phraseList.get( 0 ).toString() );
}
+
+ /* This test shows a big speedup from limiting the number of analyzed phrases in
+ * this bad case for FieldPhraseList */
+ /* But it is not reliable as a unit test since it is timing-dependent
+ public void testManyRepeatedTerms() throws Exception {
+ long t = System.currentTimeMillis();
+ testManyTermsWithLimit (-1);
+ long t1 = System.currentTimeMillis();
+ testManyTermsWithLimit (1);
+ long t2 = System.currentTimeMillis();
+ assertTrue (t2-t1 * 1000 < t1-t);
+ }
+ private void testManyTermsWithLimit (int limit) throws Exception {
+ StringBuilder buf = new StringBuilder ();
+ for (int i = 0; i < 16000; i++) {
+ buf.append("a b c ");
+ }
+ make1d1fIndex( buf.toString());
+
+ Query query = tq("a");
+ FieldQuery fq = new FieldQuery( query, true, true );
+ FieldTermStack stack = new FieldTermStack( reader, 0, F, fq );
+ FieldPhraseList fpl = new FieldPhraseList( stack, fq, limit);
+ if (limit < 0 || limit > 16000)
+ assertEquals( 16000, fpl.phraseList.size() );
+ else
+ assertEquals( limit, fpl.phraseList.size() );
+ assertEquals( "a(1.0)((0,1))", fpl.phraseList.get( 0 ).toString() );
+ }
+ */
}
Modified: lucene/dev/branches/LUCENE2793/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedDocsAndPositionsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE2793/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedDocsAndPositionsEnum.java?rev=1143719&r1=1143718&r2=1143719&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE2793/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedDocsAndPositionsEnum.java (original)
+++ lucene/dev/branches/LUCENE2793/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedDocsAndPositionsEnum.java Thu Jul 7 09:03:58 2011
@@ -23,13 +23,13 @@ import org.apache.lucene.util.BytesRef;
public class InstantiatedDocsAndPositionsEnum extends DocsAndPositionsEnum {
private int upto;
private int posUpto;
- private Bits skipDocs;
+ private Bits liveDocs;
private InstantiatedTerm term;
protected InstantiatedTermDocumentInformation currentDoc;
private final BytesRef payload = new BytesRef();
- public InstantiatedDocsAndPositionsEnum reset(Bits skipDocs, InstantiatedTerm term) {
- this.skipDocs = skipDocs;
+ public InstantiatedDocsAndPositionsEnum reset(Bits liveDocs, InstantiatedTerm term) {
+ this.liveDocs = liveDocs;
this.term = term;
upto = -1;
return this;
@@ -47,7 +47,7 @@ public class InstantiatedDocsAndPosition
return NO_MORE_DOCS;
} else {
currentDoc = term.getAssociatedDocuments()[upto];
- if (skipDocs == null || !skipDocs.get(currentDoc.getDocument().getDocumentNumber())) {
+ if (liveDocs == null || liveDocs.get(currentDoc.getDocument().getDocumentNumber())) {
posUpto = -1;
return docID();
} else {
@@ -69,7 +69,7 @@ public class InstantiatedDocsAndPosition
}
currentDoc = term.getAssociatedDocuments()[upto];
- if (skipDocs != null && skipDocs.get(currentDoc.getDocument().getDocumentNumber())) {
+ if (liveDocs != null && !liveDocs.get(currentDoc.getDocument().getDocumentNumber())) {
return nextDoc();
} else {
posUpto = -1;