You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ch...@apache.org on 2011/07/11 05:37:05 UTC
svn commit: r1145016 [1/2] - in /lucene/dev/trunk: dev-tools/eclipse/
dev-tools/idea/.idea/ dev-tools/idea/lucene/contrib/demo/
dev-tools/idea/lucene/contrib/memory/
dev-tools/idea/lucene/contrib/queryparser/
dev-tools/idea/lucene/contrib/xml-query-par...
Author: chrism
Date: Mon Jul 11 03:37:00 2011
New Revision: 1145016
URL: http://svn.apache.org/viewvc?rev=1145016&view=rev
Log:
LUCENE-3283: Moved core QueryParsers to queryparser module
Added:
lucene/dev/trunk/dev-tools/idea/modules/queryparser/
lucene/dev/trunk/dev-tools/idea/modules/queryparser/queryparser.iml
lucene/dev/trunk/dev-tools/maven/modules/queryparser/
lucene/dev/trunk/dev-tools/maven/modules/queryparser/pom.xml.template
lucene/dev/trunk/modules/queryparser/
lucene/dev/trunk/modules/queryparser/LICENSE.txt
lucene/dev/trunk/modules/queryparser/NOTICE.txt
lucene/dev/trunk/modules/queryparser/build.xml
lucene/dev/trunk/modules/queryparser/src/
lucene/dev/trunk/modules/queryparser/src/java/
lucene/dev/trunk/modules/queryparser/src/java/org/
lucene/dev/trunk/modules/queryparser/src/java/org/apache/
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/classic/
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/classic/CharStream.java
- copied, changed from r1144777, lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/CharStream.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/classic/FastCharStream.java
- copied, changed from r1144777, lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/FastCharStream.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/classic/MultiFieldQueryParser.java
- copied, changed from r1144777, lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/MultiFieldQueryParser.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/classic/ParseException.java
- copied, changed from r1144777, lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/ParseException.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.java
- copied, changed from r1144777, lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/QueryParser.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.jj
- copied, changed from r1144777, lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/QueryParser.jj
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserBase.java
- copied, changed from r1144777, lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/QueryParserBase.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserConstants.java
- copied, changed from r1144777, lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/QueryParserConstants.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserTokenManager.java
- copied, changed from r1144777, lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/QueryParserTokenManager.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/classic/Token.java
- copied, changed from r1144777, lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/Token.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/classic/TokenMgrError.java
- copied, changed from r1144777, lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/TokenMgrError.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/classic/package.html
- copied unchanged from r1144777, lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/package.html
lucene/dev/trunk/modules/queryparser/src/java/overview.html
lucene/dev/trunk/modules/queryparser/src/test/
lucene/dev/trunk/modules/queryparser/src/test/org/
lucene/dev/trunk/modules/queryparser/src/test/org/apache/
lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/
lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/
lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/classic/
lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiAnalyzer.java
- copied, changed from r1144777, lucene/dev/trunk/lucene/src/test/org/apache/lucene/queryParser/TestMultiAnalyzer.java
lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java
- copied, changed from r1144777, lucene/dev/trunk/lucene/src/test/org/apache/lucene/queryParser/TestMultiFieldQueryParser.java
lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiPhraseQueryParsing.java
- copied, changed from r1144777, lucene/dev/trunk/lucene/src/test/org/apache/lucene/queryParser/TestMultiPhraseQueryParsing.java
lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/classic/TestQueryParser.java
- copied, changed from r1144777, lucene/dev/trunk/lucene/src/test/org/apache/lucene/queryParser/TestQueryParser.java
Removed:
lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/CharStream.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/FastCharStream.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/MultiFieldQueryParser.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/ParseException.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/QueryParser.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/QueryParser.jj
lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/QueryParserBase.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/QueryParserConstants.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/QueryParserTokenManager.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/Token.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/TokenMgrError.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/queryParser/package.html
lucene/dev/trunk/lucene/src/test/org/apache/lucene/queryParser/TestMultiAnalyzer.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/queryParser/TestMultiFieldQueryParser.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/queryParser/TestMultiPhraseQueryParsing.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/queryParser/TestQueryParser.java
Modified:
lucene/dev/trunk/dev-tools/eclipse/dot.classpath
lucene/dev/trunk/dev-tools/idea/.idea/modules.xml
lucene/dev/trunk/dev-tools/idea/.idea/workspace.xml
lucene/dev/trunk/dev-tools/idea/lucene/contrib/demo/demo.iml
lucene/dev/trunk/dev-tools/idea/lucene/contrib/memory/memory.iml
lucene/dev/trunk/dev-tools/idea/lucene/contrib/queryparser/queryparser-contrib.iml
lucene/dev/trunk/dev-tools/idea/lucene/contrib/xml-query-parser/xml-query-parser.iml
lucene/dev/trunk/dev-tools/idea/modules/benchmark/benchmark.iml
lucene/dev/trunk/dev-tools/idea/solr/solr.iml
lucene/dev/trunk/dev-tools/maven/lucene/contrib/demo/pom.xml.template
lucene/dev/trunk/dev-tools/maven/lucene/contrib/memory/pom.xml.template
lucene/dev/trunk/dev-tools/maven/lucene/contrib/queryparser/pom.xml.template
lucene/dev/trunk/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml.template
lucene/dev/trunk/dev-tools/maven/modules/benchmark/pom.xml.template
lucene/dev/trunk/dev-tools/maven/modules/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template
lucene/dev/trunk/lucene/MIGRATE.txt
lucene/dev/trunk/lucene/build.xml
lucene/dev/trunk/lucene/contrib/demo/build.xml
lucene/dev/trunk/lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java
lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java
lucene/dev/trunk/lucene/contrib/memory/build.xml
lucene/dev/trunk/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java
lucene/dev/trunk/lucene/contrib/queryparser/build.xml
lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java
lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/complexPhrase/ComplexPhraseQueryParser.java
lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ExtendableQueryParser.java
lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ExtensionQuery.java
lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/Extensions.java
lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ParserExtension.java
lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/analyzing/TestAnalyzingQueryParser.java
lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java
lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/ExtensionStub.java
lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/TestExtendableQueryParser.java
lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/precedence/TestPrecedenceQueryParser.java
lucene/dev/trunk/lucene/contrib/xml-query-parser/build.xml
lucene/dev/trunk/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/CoreParser.java
lucene/dev/trunk/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/CorePlusExtensionsParser.java
lucene/dev/trunk/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/UserInputQueryBuilder.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/package.html
lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/MultiTermQuery.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/Query.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSort.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/core/StopFilter.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/util/FilteringTokenFilter.java
lucene/dev/trunk/modules/benchmark/build.xml
lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java
lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java
lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishQueryMaker.java
lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java
lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java
lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/QualityQueryParser.java
lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/SimpleQQParser.java
lucene/dev/trunk/modules/build.xml
lucene/dev/trunk/solr/common-build.xml
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/BoostQParserPlugin.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DisMaxQParser.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/FieldQParserPlugin.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/FunctionQParser.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/Grouping.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/LuceneQParserPlugin.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/NestedQParserPlugin.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/PrefixQParserPlugin.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/QParser.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/QueryParsing.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/RawQParserPlugin.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ReturnFields.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrQueryParser.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SpatialFilterQParser.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/TermQParserPlugin.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ValueSourceParser.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/DummyValueSourceParser.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/FooQParserPlugin.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/function/NvlValueSourceParser.java
Modified: lucene/dev/trunk/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/eclipse/dot.classpath?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/trunk/dev-tools/eclipse/dot.classpath Mon Jul 11 03:37:00 2011
@@ -49,6 +49,8 @@
<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/queryparser/src/java"/>
+ <classpathentry kind="src" path="modules/queryparser/src/test"/>
<classpathentry kind="src" path="modules/suggest/src/java"/>
<classpathentry kind="src" path="modules/suggest/src/test"/>
<classpathentry kind="src" path="solr/core/src/java"/>
Modified: lucene/dev/trunk/dev-tools/idea/.idea/modules.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/.idea/modules.xml?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/.idea/modules.xml (original)
+++ lucene/dev/trunk/dev-tools/idea/.idea/modules.xml Mon Jul 11 03:37:00 2011
@@ -25,6 +25,7 @@
<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/queryparser/queryparser.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/trunk/dev-tools/idea/.idea/workspace.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/.idea/workspace.xml?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/.idea/workspace.xml (original)
+++ lucene/dev/trunk/dev-tools/idea/.idea/workspace.xml Mon Jul 11 03:37:00 2011
@@ -141,6 +141,13 @@
<option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
+ <configuration default="false" name="queryparser module" type="JUnit" factoryName="JUnit">
+ <module name="queryparser" />
+ <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-contrib" />
<option name="TEST_OBJECT" value="package" />
@@ -204,7 +211,7 @@
<option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
- <list size="29">
+ <list size="30">
<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" />
@@ -225,15 +232,16 @@
<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" />
+ <item index="20" class="java.lang.String" itemvalue="JUnit.queryparser module" />
+ <item index="21" class="java.lang.String" itemvalue="JUnit.queryparser contrib" />
+ <item index="22" class="java.lang.String" itemvalue="JUnit.smartcn analysis module" />
+ <item index="23" class="java.lang.String" itemvalue="JUnit.solr" />
+ <item index="24" class="java.lang.String" itemvalue="JUnit.spatial contrib" />
+ <item index="25" class="java.lang.String" itemvalue="JUnit.stempel analysis module" />
+ <item index="26" class="java.lang.String" itemvalue="JUnit.suggest module" />
+ <item index="27" class="java.lang.String" itemvalue="JUnit.uima contrib" />
+ <item index="28" class="java.lang.String" itemvalue="JUnit.wordnet contrib" />
+ <item index="29" class="java.lang.String" itemvalue="JUnit.xml-query-parser contrib" />
</list>
</component>
</project>
Modified: lucene/dev/trunk/dev-tools/idea/lucene/contrib/demo/demo.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/contrib/demo/demo.iml?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/contrib/demo/demo.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/lucene/contrib/demo/demo.iml Mon Jul 11 03:37:00 2011
@@ -13,5 +13,6 @@
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
<orderEntry type="module" module-name="analysis-common" />
<orderEntry type="module" module-name="lucene" />
+ <orderEntry type="module" module-name="queryparser" />
</component>
</module>
Modified: lucene/dev/trunk/dev-tools/idea/lucene/contrib/memory/memory.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/contrib/memory/memory.iml?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/contrib/memory/memory.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/lucene/contrib/memory/memory.iml Mon Jul 11 03:37:00 2011
@@ -14,5 +14,6 @@
<orderEntry type="module" module-name="queries-contrib" />
<orderEntry type="module" module-name="misc" />
<orderEntry type="module" module-name="lucene" />
+ <orderEntry type="module" module-name="queryparser" />
</component>
</module>
Modified: lucene/dev/trunk/dev-tools/idea/lucene/contrib/queryparser/queryparser-contrib.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/contrib/queryparser/queryparser-contrib.iml?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/contrib/queryparser/queryparser-contrib.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/lucene/contrib/queryparser/queryparser-contrib.iml Mon Jul 11 03:37:00 2011
@@ -15,5 +15,6 @@
<orderEntry type="module" module-name="queries-contrib" />
<orderEntry type="module" module-name="misc" />
<orderEntry type="module" module-name="lucene" />
+ <orderEntry type="module" module-name="queryparser" />
</component>
</module>
Modified: lucene/dev/trunk/dev-tools/idea/lucene/contrib/xml-query-parser/xml-query-parser.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/contrib/xml-query-parser/xml-query-parser.iml?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/contrib/xml-query-parser/xml-query-parser.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/lucene/contrib/xml-query-parser/xml-query-parser.iml Mon Jul 11 03:37:00 2011
@@ -18,5 +18,6 @@
<orderEntry type="module" module-name="misc" />
<orderEntry type="module" module-name="analysis-common" />
<orderEntry type="module" module-name="lucene" />
+ <orderEntry type="module" module-name="queryparser" />
</component>
</module>
Modified: lucene/dev/trunk/dev-tools/idea/modules/benchmark/benchmark.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/modules/benchmark/benchmark.iml?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/modules/benchmark/benchmark.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/modules/benchmark/benchmark.iml Mon Jul 11 03:37:00 2011
@@ -30,5 +30,6 @@
<orderEntry type="module" module-name="memory" />
<orderEntry type="module" module-name="analysis-common" />
<orderEntry type="module" module-name="lucene" />
+ <orderEntry type="module" module-name="queryparser" />
</component>
</module>
Added: lucene/dev/trunk/dev-tools/idea/modules/queryparser/queryparser.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/modules/queryparser/queryparser.iml?rev=1145016&view=auto
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/modules/queryparser/queryparser.iml (added)
+++ lucene/dev/trunk/dev-tools/idea/modules/queryparser/queryparser.iml Mon Jul 11 03:37:00 2011
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/build/classes/java" />
+ <output-test url="file://$MODULE_DIR$/build/classes/test" />
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/work" />
+ </content>
+ <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/trunk/dev-tools/idea/solr/solr.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/solr/solr.iml?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/solr/solr.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/solr/solr.iml Mon Jul 11 03:37:00 2011
@@ -31,5 +31,6 @@
<orderEntry type="module" module-name="suggest" />
<orderEntry type="module" module-name="analysis-common" />
<orderEntry type="module" module-name="lucene" />
+ <orderEntry type="module" module-name="queryparser" />
</component>
</module>
Modified: lucene/dev/trunk/dev-tools/maven/lucene/contrib/demo/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/contrib/demo/pom.xml.template?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/contrib/demo/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/contrib/demo/pom.xml.template Mon Jul 11 03:37:00 2011
@@ -53,6 +53,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>lucene-queryparser</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: lucene/dev/trunk/dev-tools/maven/lucene/contrib/memory/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/contrib/memory/pom.xml.template?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/contrib/memory/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/contrib/memory/pom.xml.template Mon Jul 11 03:37:00 2011
@@ -45,6 +45,12 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>lucene-queryparser</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
<scope>test</scope>
Modified: lucene/dev/trunk/dev-tools/maven/lucene/contrib/queryparser/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/contrib/queryparser/pom.xml.template?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/contrib/queryparser/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/contrib/queryparser/pom.xml.template Mon Jul 11 03:37:00 2011
@@ -45,6 +45,11 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>lucene-queryparser</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>lucene-core</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
Modified: lucene/dev/trunk/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml.template?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml.template Mon Jul 11 03:37:00 2011
@@ -53,6 +53,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>lucene-queryparser</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
Modified: lucene/dev/trunk/dev-tools/maven/modules/benchmark/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/modules/benchmark/pom.xml.template?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/modules/benchmark/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/modules/benchmark/pom.xml.template Mon Jul 11 03:37:00 2011
@@ -63,6 +63,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>lucene-queryparser</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</dependency>
Modified: lucene/dev/trunk/dev-tools/maven/modules/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/modules/pom.xml.template?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/modules/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/modules/pom.xml.template Mon Jul 11 03:37:00 2011
@@ -37,6 +37,7 @@
<module>grouping</module>
<module>join</module>
<module>queries</module>
+ <module>queryparser</module>
<module>suggest</module>
</modules>
<build>
Added: lucene/dev/trunk/dev-tools/maven/modules/queryparser/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/modules/queryparser/pom.xml.template?rev=1145016&view=auto
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/modules/queryparser/pom.xml.template (added)
+++ lucene/dev/trunk/dev-tools/maven/modules/queryparser/pom.xml.template Mon Jul 11 03:37:00 2011
@@ -0,0 +1,71 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ -->
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-parent</artifactId>
+ <version>@version@</version>
+ <relativePath>../../lucene/pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-queryparser</artifactId>
+ <packaging>jar</packaging>
+ <name>Lucene QueryParsers</name>
+ <description>Lucene QueryParsers module</description>
+ <properties>
+ <module-directory>modules/queryparser</module-directory>
+ <build-directory>build</build-directory>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>lucene-test-framework</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <directory>${build-directory}</directory>
+ <outputDirectory>${build-directory}/classes/java</outputDirectory>
+ <testOutputDirectory>${build-directory}/classes/test</testOutputDirectory>
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+ <testResources>
+ <testResource>
+ <directory>${project.build.testSourceDirectory}</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </testResource>
+ </testResources>
+ </build>
+</project>
Modified: lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template Mon Jul 11 03:37:00 2011
@@ -83,7 +83,7 @@
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-queries-contrib</artifactId>
+ <artifactId>lucene-queryparser</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Modified: lucene/dev/trunk/lucene/MIGRATE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/MIGRATE.txt?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/MIGRATE.txt (original)
+++ lucene/dev/trunk/lucene/MIGRATE.txt Mon Jul 11 03:37:00 2011
@@ -392,3 +392,16 @@ LUCENE-1458, LUCENE-2111: Flexible Index
boost from outer queries such as BooleanQuery, instead it takes 2 parameters,
the outer boost (topLevelBoost) and the norm. Weight.sumOfSquaredWeights has
been renamed to Weight.getValueForNormalization().
+
+* LUCENE-3283: Lucene's core o.a.l.queryParser QueryParsers have been consolidated into module/queryparser,
+ where other QueryParsers from the codebase will also be placed. The following classes were moved:
+ - o.a.l.queryParser.CharStream -> o.a.l.queryparser.classic.CharStream
+ - o.a.l.queryParser.FastCharStream -> o.a.l.queryparser.classic.FastCharStream
+ - o.a.l.queryParser.MultiFieldQueryParser -> o.a.l.queryparser.classic.MultiFieldQueryParser
+ - o.a.l.queryParser.ParseException -> o.a.l.queryparser.classic.ParseException
+ - o.a.l.queryParser.QueryParser -> o.a.l.queryparser.classic.QueryParser
+ - o.a.l.queryParser.QueryParserBase -> o.a.l.queryparser.classic.QueryParserBase
+ - o.a.l.queryParser.QueryParserConstants -> o.a.l.queryparser.classic.QueryParserConstants
+ - o.a.l.queryParser.QueryParserTokenManager -> o.a.l.queryparser.classic.QueryParserTokenManager
+ - o.a.l.queryParser.QueryParserToken -> o.a.l.queryparser.classic.Token
+ - o.a.l.queryParser.QueryParserTokenMgrError -> o.a.l.queryparser.classic.TokenMgrError
Modified: lucene/dev/trunk/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/build.xml?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/build.xml (original)
+++ lucene/dev/trunk/lucene/build.xml Mon Jul 11 03:37:00 2011
@@ -206,6 +206,7 @@
<include name="**/lib/*.jar"/>
</fileset>
<pathelement location="${common.dir}/../modules/analysis/build/common/lucene-analyzers-common-${version}.jar"/>
+ <pathelement location="${common.dir}/../modules/queryparser/build/lucene-queryparser-${version}.jar"/>
</path>
<invoke-javadoc
@@ -417,9 +418,6 @@
<!-- ================================================================== -->
<target name="clean-javacc">
<delete>
- <fileset dir="src/java/org/apache/lucene/queryParser" includes="*.java">
- <containsregexp expression="Generated.*By.*JavaCC"/>
- </fileset>
<fileset dir="contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser" includes="*.java">
<containsregexp expression="Generated.*By.*JavaCC"/>
</fileset>
@@ -429,25 +427,7 @@
</delete>
</target>
- <target name="javacc" depends="init,javacc-check,clean-javacc,javacc-QueryParser,javacc-contrib-queryparser,javacc-contrib-demo"/>
-
- <target name="javacc-QueryParser" depends="init,javacc-check" if="javacc.present">
- <sequential>
- <invoke-javacc target="src/java/org/apache/lucene/queryParser/QueryParser.jj"
- outputDir="src/java/org/apache/lucene/queryParser"/>
-
- <!-- Change the inccorrect public ctors for QueryParser to be protected instead -->
- <replaceregexp file="src/java/org/apache/lucene/queryParser/QueryParser.java"
- byline="true"
- match="public QueryParser\(CharStream "
- replace="protected QueryParser(CharStream "/>
- <replaceregexp file="src/java/org/apache/lucene/queryParser/QueryParser.java"
- byline="true"
- match="public QueryParser\(QueryParserTokenManager "
- replace="protected QueryParser(QueryParserTokenManager "/>
-
- </sequential>
- </target>
+ <target name="javacc" depends="init,javacc-check,clean-javacc,javacc-contrib-queryparser,javacc-contrib-demo"/>
<target name="javacc-contrib-queryparser" depends="init,javacc-check" if="javacc.present">
<ant target="javacc"
Modified: lucene/dev/trunk/lucene/contrib/demo/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/demo/build.xml?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/demo/build.xml (original)
+++ lucene/dev/trunk/lucene/contrib/demo/build.xml Mon Jul 11 03:37:00 2011
@@ -29,6 +29,7 @@
<module-uptodate name="analysis/common" jarfile="${common.dir}/../modules/analysis/build/common/lucene-analyzers-common-${version}.jar"
property="analyzers-common.uptodate" classpath.property="analyzers-common.jar"/>
+ <module-uptodate name="queryparser" property="queryparser.uptodate" classpath.property="queryparser.jar"/>
<property name="lucene.jar" value="${common.dir}/build/lucene-core-${version}.jar"/>
<target name="lucene-jar-uptodate" unless="lucene.jar.uptodate">
@@ -45,14 +46,22 @@
<path id="classpath">
<pathelement path="${analyzers-common.jar}"/>
+ <pathelement path="${queryparser.jar}"/>
<pathelement path="${lucene.jar}"/>
</path>
- <target name="compile-core" depends="jar-analyzers-common,common.compile-core" />
+ <target name="compile-core" depends="jar-analyzers-common,build-queryparser,common.compile-core" />
<target name="jar-analyzers-common" unless="analyzers-common.uptodate">
<subant target="jar-core">
<fileset dir="${common.dir}/../modules/analysis/common" includes="build.xml"/>
</subant>
</target>
+
+ <target name="build-queryparser" unless="queryparser.uptodate">
+ <echo>Demo building dependency modules/queryparser</echo>
+ <subant target="default">
+ <fileset dir="${common.dir}/../modules/queryparser" includes="build.xml"/>
+ </subant>
+ </target>
</project>
Modified: lucene/dev/trunk/lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java (original)
+++ lucene/dev/trunk/lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java Mon Jul 11 03:37:00 2011
@@ -27,7 +27,7 @@ import java.util.Date;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.queryParser.QueryParser;
+import org.apache.lucene.queryparser.classic.QueryParser;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.ScoreDoc;
Modified: lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java (original)
+++ lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java Mon Jul 11 03:37:00 2011
@@ -52,7 +52,6 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
-import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.search.*;
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.search.highlight.SynonymTokenizer.TestHighlightRunner;
@@ -1630,7 +1629,7 @@ public class HighlighterTest extends Bas
private Directory dir;
private Analyzer a = new MockAnalyzer(random, MockTokenizer.WHITESPACE, false);
- public void testWeightedTermsWithDeletes() throws IOException, ParseException, InvalidTokenOffsetsException {
+ public void testWeightedTermsWithDeletes() throws IOException, InvalidTokenOffsetsException {
makeIndex();
deleteDocument();
searchIndex();
@@ -1660,7 +1659,7 @@ public class HighlighterTest extends Bas
writer.close();
}
- private void searchIndex() throws IOException, ParseException, InvalidTokenOffsetsException {
+ private void searchIndex() throws IOException, InvalidTokenOffsetsException {
Query query = new TermQuery(new Term("t_text1", "random"));
IndexSearcher searcher = new IndexSearcher( dir, true );
// This scorer can return negative idf -> null fragment
Modified: lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java (original)
+++ lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java Mon Jul 11 03:37:00 2011
@@ -42,7 +42,6 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
-import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.DisjunctionMaxQuery;
import org.apache.lucene.search.PhraseQuery;
import org.apache.lucene.search.Query;
Modified: lucene/dev/trunk/lucene/contrib/memory/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/memory/build.xml?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/memory/build.xml (original)
+++ lucene/dev/trunk/lucene/contrib/memory/build.xml Mon Jul 11 03:37:00 2011
@@ -24,4 +24,20 @@
</description>
<import file="../contrib-build.xml"/>
+
+ <module-uptodate name="queryparser" property="queryparser.uptodate" classpath.property="queryparser.jar"/>
+
+ <path id="test.classpath">
+ <pathelement path="${queryparser.jar}"/>
+ <path refid="test.base.classpath"/>
+ </path>
+
+ <target name="compile-core" depends="build-queryparser,common.compile-core" />
+
+ <target name="build-queryparser" unless="queryparser.uptodate">
+ <echo>Memory building dependency modules/queryparser</echo>
+ <subant target="default">
+ <fileset dir="${common.dir}/../modules/queryparser" includes="build.xml"/>
+ </subant>
+ </target>
</project>
Modified: lucene/dev/trunk/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java (original)
+++ lucene/dev/trunk/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java Mon Jul 11 03:37:00 2011
@@ -33,7 +33,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.queryParser.QueryParser;
+import org.apache.lucene.queryparser.classic.QueryParser;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.store.Directory;
Modified: lucene/dev/trunk/lucene/contrib/queryparser/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queryparser/build.xml?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/build.xml (original)
+++ lucene/dev/trunk/lucene/contrib/queryparser/build.xml Mon Jul 11 03:37:00 2011
@@ -24,8 +24,15 @@
</description>
<import file="../contrib-build.xml"/>
-
- <target name="compile-core" depends="javacc-notice, common.compile-core"/>
+
+ <module-uptodate name="queryparser" property="queryparser.uptodate" classpath.property="queryparser.jar"/>
+
+ <path id="classpath">
+ <pathelement path="${queryparser.jar}"/>
+ <path refid="base.classpath"/>
+ </path>
+
+ <target name="compile-core" depends="javacc-notice,build-queryparser,common.compile-core"/>
<!--
NOTE: see the README.javacc for details on how to fully regenerate the parser
@@ -100,4 +107,11 @@ import org.apache.lucene.queryParser.cor
outputDir="src/java/org/apache/lucene/queryParser/surround/parser"
/>
</target>
+
+ <target name="build-queryparser" unless="queryparser.uptodate">
+ <echo>QueryParser Contrib building dependency modules/queryparser</echo>
+ <subant target="default">
+ <fileset dir="${common.dir}/../modules/queryparser" includes="build.xml"/>
+ </subant>
+ </target>
</project>
Modified: lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java (original)
+++ lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java Mon Jul 11 03:37:00 2011
@@ -25,7 +25,7 @@ import java.util.List;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
-import org.apache.lucene.queryParser.ParseException;
+import org.apache.lucene.queryparser.classic.ParseException;
import org.apache.lucene.search.Query;
import org.apache.lucene.util.Version;
@@ -41,7 +41,7 @@ import org.apache.lucene.util.Version;
* using this parser will be no improvement over QueryParser in such cases).
*
*/
-public class AnalyzingQueryParser extends org.apache.lucene.queryParser.QueryParser {
+public class AnalyzingQueryParser extends org.apache.lucene.queryparser.classic.QueryParser {
/**
* Constructs a query parser.
Modified: lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/complexPhrase/ComplexPhraseQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/complexPhrase/ComplexPhraseQueryParser.java?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/complexPhrase/ComplexPhraseQueryParser.java (original)
+++ lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/complexPhrase/ComplexPhraseQueryParser.java Mon Jul 11 03:37:00 2011
@@ -25,8 +25,8 @@ import java.util.List;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
-import org.apache.lucene.queryParser.ParseException;
-import org.apache.lucene.queryParser.QueryParser;
+import org.apache.lucene.queryparser.classic.ParseException;
+import org.apache.lucene.queryparser.classic.QueryParser;
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.MultiTermQuery;
Modified: lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ExtendableQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ExtendableQueryParser.java?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ExtendableQueryParser.java (original)
+++ lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ExtendableQueryParser.java Mon Jul 11 03:37:00 2011
@@ -18,9 +18,9 @@ package org.apache.lucene.queryParser.ex
*/
import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.queryParser.ParseException;
-import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.queryParser.ext.Extensions.Pair;
+import org.apache.lucene.queryparser.classic.ParseException;
+import org.apache.lucene.queryparser.classic.QueryParser;
import org.apache.lucene.search.Query;
import org.apache.lucene.util.Version;
Modified: lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ExtensionQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ExtensionQuery.java?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ExtensionQuery.java (original)
+++ lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ExtensionQuery.java Mon Jul 11 03:37:00 2011
@@ -1,6 +1,6 @@
package org.apache.lucene.queryParser.ext;
-import org.apache.lucene.queryParser.QueryParser;
+import org.apache.lucene.queryparser.classic.QueryParser;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
Modified: lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/Extensions.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/Extensions.java?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/Extensions.java (original)
+++ lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/Extensions.java Mon Jul 11 03:37:00 2011
@@ -16,10 +16,11 @@ package org.apache.lucene.queryParser.ex
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+import org.apache.lucene.queryparser.classic.QueryParser;
+
import java.util.HashMap;
import java.util.Map;
-import org.apache.lucene.queryParser.QueryParser;
/**
* The {@link Extensions} class represents an extension mapping to associate
Modified: lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ParserExtension.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ParserExtension.java?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ParserExtension.java (original)
+++ lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ParserExtension.java Mon Jul 11 03:37:00 2011
@@ -17,19 +17,19 @@ package org.apache.lucene.queryParser.ex
* limitations under the License.
*/
-import org.apache.lucene.queryParser.ParseException;
-import org.apache.lucene.queryParser.QueryParser;
+import org.apache.lucene.queryparser.classic.ParseException;
import org.apache.lucene.search.Query;
/**
* This class represents an extension base class to the Lucene standard
- * {@link QueryParser}. The {@link QueryParser} is generated by the JavaCC
+ * {@link org.apache.lucene.queryparser.classic.QueryParser}. The
+ * {@link org.apache.lucene.queryparser.classic.QueryParser} is generated by the JavaCC
* parser generator. Changing or adding functionality or syntax in the standard
* query parser requires changes to the JavaCC source file. To enable extending
* the standard query parser without changing the JavaCC sources and re-generate
* the parser the {@link ParserExtension} can be customized and plugged into an
* instance of {@link ExtendableQueryParser}, a direct subclass of
- * {@link QueryParser}.
+ * {@link org.apache.lucene.queryparser.classic.QueryParser}.
*
* @see Extensions
* @see ExtendableQueryParser
Modified: lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/analyzing/TestAnalyzingQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/analyzing/TestAnalyzingQueryParser.java?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/analyzing/TestAnalyzingQueryParser.java (original)
+++ lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/analyzing/TestAnalyzingQueryParser.java Mon Jul 11 03:37:00 2011
@@ -25,7 +25,7 @@ import org.apache.lucene.analysis.MockTo
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
-import org.apache.lucene.queryParser.ParseException;
+import org.apache.lucene.queryparser.classic.ParseException;
import org.apache.lucene.util.LuceneTestCase;
/**
Modified: lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java (original)
+++ lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java Mon Jul 11 03:37:00 2011
@@ -24,7 +24,7 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.queryParser.QueryParser;
+import org.apache.lucene.queryparser.classic.QueryParser;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.ScoreDoc;
Modified: lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/ExtensionStub.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/ExtensionStub.java?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/ExtensionStub.java (original)
+++ lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/ExtensionStub.java Mon Jul 11 03:37:00 2011
@@ -1,7 +1,7 @@
package org.apache.lucene.queryParser.ext;
import org.apache.lucene.index.Term;
-import org.apache.lucene.queryParser.ParseException;
+import org.apache.lucene.queryparser.classic.ParseException;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
@@ -30,4 +30,4 @@ class ExtensionStub extends ParserExtens
.getRawQueryString()));
}
-}
\ No newline at end of file
+}
Modified: lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/TestExtendableQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/TestExtendableQueryParser.java?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/TestExtendableQueryParser.java (original)
+++ lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/TestExtendableQueryParser.java Mon Jul 11 03:37:00 2011
@@ -20,26 +20,21 @@ package org.apache.lucene.queryParser.ex
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenizer;
-import org.apache.lucene.queryParser.ParseException;
-import org.apache.lucene.queryParser.QueryParser;
-import org.apache.lucene.queryParser.TestQueryParser;
+import org.apache.lucene.queryparser.classic.ParseException;
+import org.apache.lucene.queryparser.classic.QueryParser;
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.util.LuceneTestCase;
/**
* Testcase for the class {@link ExtendableQueryParser}
*/
-public class TestExtendableQueryParser extends TestQueryParser {
+public class TestExtendableQueryParser extends LuceneTestCase {
private static char[] DELIMITERS = new char[] {
Extensions.DEFAULT_EXTENSION_FIELD_DELIMITER, '-', '|' };
- @Override
- public QueryParser getParser(Analyzer a) throws Exception {
- return getParser(a, null);
- }
-
public QueryParser getParser(Analyzer a, Extensions extensions)
throws Exception {
if (a == null)
Modified: lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/precedence/TestPrecedenceQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/precedence/TestPrecedenceQueryParser.java?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/precedence/TestPrecedenceQueryParser.java (original)
+++ lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/precedence/TestPrecedenceQueryParser.java Mon Jul 11 03:37:00 2011
@@ -35,7 +35,6 @@ import org.apache.lucene.analysis.TokenS
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.document.DateTools;
-import org.apache.lucene.queryParser.TestQueryParser;
import org.apache.lucene.queryParser.core.QueryNodeException;
import org.apache.lucene.queryParser.core.QueryNodeParseException;
import org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler;
@@ -57,11 +56,11 @@ import org.apache.lucene.util.automaton.
* This test case tests {@link PrecedenceQueryParser}.
* </p>
* <p>
- * It contains all tests from {@link TestQueryParser} with some adjusted to
- * fit the precedence requirement, plus some precedence test cases.
+ * It contains all tests from {@link org.apache.lucene.queryparser.classic.TestQueryParser}
+ * with some adjusted to fit the precedence requirement, plus some precedence test cases.
* </p>
*
- * @see TestQueryParser
+ * @see org.apache.lucene.queryparser.classic.TestQueryParser
*/
public class TestPrecedenceQueryParser extends LuceneTestCase {
Modified: lucene/dev/trunk/lucene/contrib/xml-query-parser/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/xml-query-parser/build.xml?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/xml-query-parser/build.xml (original)
+++ lucene/dev/trunk/lucene/contrib/xml-query-parser/build.xml Mon Jul 11 03:37:00 2011
@@ -29,21 +29,24 @@
<property name="lucene.jar" location="${common.dir}/build/lucene-core-${version}.jar"/>
<property name="servlet.jar" location="${common.dir}/lib/servlet-api-2.4.jar"/>
<available property="servlet.jar.present" type="file" file="${servlet.jar}"/>
+ <module-uptodate name="queryparser" property="queryparser.uptodate" classpath.property="queryparser.jar"/>
<path id="classpath">
<pathelement path="${queries.jar}"/>
+ <pathelement path="${queryparser.jar}"/>
<path refid="base.classpath"/>
</path>
<path id="web-classpath">
<pathelement path="${queries.jar}"/>
+ <pathelement path="${queryparser.jar}"/>
<pathelement path="${servlet.jar}"/>
<pathelement path="${build.dir}/${final.name}.jar"/>
<path refid="base.classpath"/>
</path>
- <target name="compile-core" depends="build-queries, common.compile-core" />
+ <target name="compile-core" depends="build-queries,build-queryparser,common.compile-core" />
<target name="build-queries" unless="queries.uptodate">
<echo>XML Parser building dependency ${queries.jar}</echo>
@@ -82,4 +85,11 @@
</target>
+ <target name="build-queryparser" unless="queryparser.uptodate">
+ <echo>Demo building dependency modules/queryparser</echo>
+ <subant target="default">
+ <fileset dir="${common.dir}/../modules/queryparser" includes="build.xml"/>
+ </subant>
+ </target>
+
</project>
Modified: lucene/dev/trunk/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/CoreParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/CoreParser.java?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/CoreParser.java (original)
+++ lucene/dev/trunk/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/CoreParser.java Mon Jul 11 03:37:00 2011
@@ -6,7 +6,7 @@ import javax.xml.parsers.DocumentBuilder
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.queryParser.QueryParser;
+import org.apache.lucene.queryparser.classic.QueryParser;
import org.apache.lucene.search.Query;
import org.apache.lucene.xmlparser.builders.*;
import org.w3c.dom.Document;
Modified: lucene/dev/trunk/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/CorePlusExtensionsParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/CorePlusExtensionsParser.java?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/CorePlusExtensionsParser.java (original)
+++ lucene/dev/trunk/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/CorePlusExtensionsParser.java Mon Jul 11 03:37:00 2011
@@ -1,7 +1,7 @@
package org.apache.lucene.xmlparser;
import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.queryParser.QueryParser;
+import org.apache.lucene.queryparser.classic.QueryParser;
import org.apache.lucene.xmlparser.builders.BooleanFilterBuilder;
import org.apache.lucene.xmlparser.builders.BoostingQueryBuilder;
import org.apache.lucene.xmlparser.builders.DuplicateFilterBuilder;
Modified: lucene/dev/trunk/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/UserInputQueryBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/UserInputQueryBuilder.java?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/UserInputQueryBuilder.java (original)
+++ lucene/dev/trunk/lucene/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/UserInputQueryBuilder.java Mon Jul 11 03:37:00 2011
@@ -1,8 +1,8 @@
package org.apache.lucene.xmlparser.builders;
import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.queryParser.ParseException;
-import org.apache.lucene.queryParser.QueryParser;
+import org.apache.lucene.queryparser.classic.ParseException;
+import org.apache.lucene.queryparser.classic.QueryParser;
import org.apache.lucene.search.Query;
import org.apache.lucene.xmlparser.DOMUtils;
import org.apache.lucene.xmlparser.ParserException;
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/package.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/package.html?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/package.html (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/package.html Mon Jul 11 03:37:00 2011
@@ -123,10 +123,8 @@ There are many post tokenization steps t
{@link org.apache.lucene.index.IndexWriter#addDocument(org.apache.lucene.document.Document) addDocument(doc)},
the Analyzer in effect for indexing is invoked for each indexed field of the added document.
</li>
- <li>At search, as a consequence of
- {@link org.apache.lucene.queryParser.QueryParser#parse(java.lang.String) QueryParser.parse(queryText)},
- the QueryParser may invoke the Analyzer in effect.
- Note that for some queries analysis does not take place, e.g. wildcard queries.
+ <li>At search, a QueryParser may invoke the Analyzer during parsing. Note that for some queries, analysis does not
+ take place, e.g. wildcard queries.
</li>
</ul>
However an application might invoke Analysis of any text for testing or for any other purpose, something like:
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/MultiTermQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/MultiTermQuery.java?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/MultiTermQuery.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/MultiTermQuery.java Mon Jul 11 03:37:00 2011
@@ -23,7 +23,6 @@ import org.apache.lucene.index.IndexRead
import org.apache.lucene.index.Term;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
-import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.util.AttributeSource;
import org.apache.lucene.util.TermContext;
@@ -56,7 +55,7 @@ import org.apache.lucene.util.TermContex
* a priority queue to only collect competitive terms
* and not hit this limitation.
*
- * Note that {@link QueryParser} produces
+ * Note that org.apache.lucene.queryparser.classic.QueryParser produces
* MultiTermQueries using {@link
* #CONSTANT_SCORE_AUTO_REWRITE_DEFAULT} by default.
*/
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/Query.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/Query.java?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/Query.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/Query.java Mon Jul 11 03:37:00 2011
@@ -39,10 +39,6 @@ import org.apache.lucene.index.Term;
<li> {@link NumericRangeQuery}
<li> {@link org.apache.lucene.search.spans.SpanQuery}
</ul>
- <p>A parser for queries is contained in:
- <ul>
- <li>{@link org.apache.lucene.queryParser.QueryParser QueryParser}
- </ul>
*/
public abstract class Query implements Cloneable {
private float boost = 1.0f; // query boost factor
@@ -61,17 +57,6 @@ public abstract class Query implements C
/** Prints a query to a string, with <code>field</code> assumed to be the
* default field and omitted.
- * <p>The representation used is one that is supposed to be readable
- * by {@link org.apache.lucene.queryParser.QueryParser QueryParser}. However,
- * there are the following limitations:
- * <ul>
- * <li>If the query was created by the parser, the printed
- * representation may not be exactly what was parsed. For example,
- * characters that need to be escaped will be represented without
- * the required backslash.</li>
- * <li>Some of the more complicated queries (e.g. span queries)
- * don't have a representation that can be parsed by QueryParser.</li>
- * </ul>
*/
public abstract String toString(String field);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java Mon Jul 11 03:37:00 2011
@@ -23,7 +23,6 @@ import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiFields;
-import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.TermContext;
@@ -465,7 +464,7 @@ public class TestMultiPhraseQuery extend
* using query parser, MPQ will be created, and will not be strict about having all query terms
* in each position - one of each position is sufficient (OR logic)
*/
- public void testZeroPosIncrSloppyParsedAnd() throws IOException, ParseException {
+ public void testZeroPosIncrSloppyParsedAnd() throws IOException {
MultiPhraseQuery q = new MultiPhraseQuery();
q.add(new Term[]{ new Term("field", "a"), new Term("field", "1") }, -1);
q.add(new Term[]{ new Term("field", "b"), new Term("field", "1") }, 0);
@@ -509,7 +508,7 @@ public class TestMultiPhraseQuery extend
/**
* PQ AND Mode - Manually creating a phrase query
*/
- public void testZeroPosIncrSloppyPqAnd() throws IOException, ParseException {
+ public void testZeroPosIncrSloppyPqAnd() throws IOException {
final PhraseQuery pq = new PhraseQuery();
for (TokenAndPos tap : INCR_0_QUERY_TOKENS_AND) {
pq.add(new Term("field",tap.token), tap.pos);
@@ -524,7 +523,7 @@ public class TestMultiPhraseQuery extend
/**
* MPQ AND Mode - Manually creating a multiple phrase query
*/
- public void testZeroPosIncrSloppyMpqAnd() throws IOException, ParseException {
+ public void testZeroPosIncrSloppyMpqAnd() throws IOException {
final MultiPhraseQuery mpq = new MultiPhraseQuery();
for (TokenAndPos tap : INCR_0_QUERY_TOKENS_AND) {
mpq.add(new Term[]{new Term("field",tap.token)}, tap.pos); //AND logic
@@ -539,7 +538,7 @@ public class TestMultiPhraseQuery extend
/**
* MPQ Combined AND OR Mode - Manually creating a multiple phrase query
*/
- public void testZeroPosIncrSloppyMpqAndOrMatch() throws IOException, ParseException {
+ public void testZeroPosIncrSloppyMpqAndOrMatch() throws IOException {
final MultiPhraseQuery mpq = new MultiPhraseQuery();
for (TokenAndPos tap[] : INCR_0_QUERY_TOKENS_AND_OR_MATCH) {
Term[] terms = tapTerms(tap);
@@ -556,7 +555,7 @@ public class TestMultiPhraseQuery extend
/**
* MPQ Combined AND OR Mode - Manually creating a multiple phrase query - with no match
*/
- public void testZeroPosIncrSloppyMpqAndOrNoMatch() throws IOException, ParseException {
+ public void testZeroPosIncrSloppyMpqAndOrNoMatch() throws IOException {
final MultiPhraseQuery mpq = new MultiPhraseQuery();
for (TokenAndPos tap[] : INCR_0_QUERY_TOKENS_AND_OR_NO_MATCHN) {
Term[] terms = tapTerms(tap);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSort.java?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSort.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSort.java Mon Jul 11 03:37:00 2011
@@ -38,7 +38,6 @@ import org.apache.lucene.index.RandomInd
import org.apache.lucene.index.Term;
import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.index.values.ValueType;
-import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.search.FieldValueHitQueue.Entry;
import org.apache.lucene.search.cache.ByteValuesCreator;
@@ -365,7 +364,7 @@ public class TestSort extends LuceneTest
/**
* Test String sorting: small queue to many matches, multi field sort, reverse sort
*/
- public void testStringSort() throws IOException, ParseException {
+ public void testStringSort() throws IOException {
ScoreDoc[] result = null;
IndexSearcher searcher = getFullStrings();
sort.setSort(
Modified: lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/core/StopFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/core/StopFilter.java?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/core/StopFilter.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/core/StopFilter.java Mon Jul 11 03:37:00 2011
@@ -26,7 +26,6 @@ import org.apache.lucene.analysis.util.F
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.util.CharArraySet;
-import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.util.Version;
/**
Modified: lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/util/FilteringTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/util/FilteringTokenFilter.java?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/util/FilteringTokenFilter.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/util/FilteringTokenFilter.java Mon Jul 11 03:37:00 2011
@@ -22,7 +22,6 @@ import java.io.IOException;
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
-import org.apache.lucene.queryParser.QueryParser; // for javadoc
/**
* Abstract base class for TokenFilters that may remove tokens.
@@ -87,7 +86,7 @@ public abstract class FilteringTokenFilt
* token is incremented.
*
* <p> <b>NOTE</b>: be sure to also
- * set {@link QueryParser#setEnablePositionIncrements} if
+ * set org.apache.lucene.queryparser.classic.QueryParser#setEnablePositionIncrements if
* you use QueryParser to create queries.
*/
public void setEnablePositionIncrements(boolean enable) {
Modified: lucene/dev/trunk/modules/benchmark/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/build.xml?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/build.xml (original)
+++ lucene/dev/trunk/modules/benchmark/build.xml Mon Jul 11 03:37:00 2011
@@ -41,6 +41,8 @@
property="analyzers-common.uptodate" classpath.property="analyzers-common.jar"/>
<contrib-uptodate name="memory" property="memory.uptodate" classpath.property="memory.jar"/>
+ <module-uptodate name="queryparser" property="queryparser.uptodate" classpath.property="queryparser.jar"/>
+
<target name="check-files">
<available file="temp/news20.tar.gz" property="news20.exists"/>
@@ -160,6 +162,7 @@
<pathelement path="${memory.jar}"/>
<pathelement path="${highlighter.jar}"/>
<pathelement path="${analyzers-common.jar}"/>
+ <pathelement path="${queryparser.jar}"/>
<path refid="base.classpath"/>
<fileset dir="lib">
<include name="**/*.jar"/>
@@ -268,8 +271,13 @@
<fileset dir="${common.dir}/contrib/memory" includes="build.xml"/>
</subant>
</target>
+ <target name="compile-queryparser" unless="queryparser.uptodate">
+ <subant target="default">
+ <fileset dir="${common.dir}/../modules/queryparser" includes="build.xml"/>
+ </subant>
+ </target>
- <target name="init" depends="contrib-build.init,compile-memory,compile-highlighter,compile-analyzers-common"/>
+ <target name="init" depends="contrib-build.init,compile-memory,compile-highlighter,compile-analyzers-common,compile-queryparser"/>
<target name="clean-javacc">
<fileset dir="src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml" includes="*.java">
Modified: lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java (original)
+++ lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java Mon Jul 11 03:37:00 2011
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.index.Term;
-import org.apache.lucene.queryParser.QueryParser;
+import org.apache.lucene.queryparser.classic.QueryParser;
import org.apache.lucene.search.MultiTermQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.WildcardQuery;
Modified: lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java (original)
+++ lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java Mon Jul 11 03:37:00 2011
@@ -1,8 +1,8 @@
package org.apache.lucene.benchmark.byTask.feeds;
import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.queryParser.QueryParser;
-import org.apache.lucene.queryParser.ParseException;
+import org.apache.lucene.queryparser.classic.ParseException;
+import org.apache.lucene.queryparser.classic.QueryParser;
import org.apache.lucene.search.Query;
import org.apache.lucene.benchmark.byTask.tasks.NewAnalyzerTask;
import org.apache.lucene.util.Version;
Modified: lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishQueryMaker.java?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishQueryMaker.java (original)
+++ lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishQueryMaker.java Mon Jul 11 03:37:00 2011
@@ -21,7 +21,7 @@ import org.apache.lucene.analysis.Analyz
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.benchmark.byTask.tasks.NewAnalyzerTask;
import org.apache.lucene.benchmark.byTask.utils.Config;
-import org.apache.lucene.queryParser.QueryParser;
+import org.apache.lucene.queryparser.classic.QueryParser;
import org.apache.lucene.search.Query;
import org.apache.lucene.util.English;
import org.apache.lucene.util.Version;
Modified: lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java (original)
+++ lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java Mon Jul 11 03:37:00 2011
@@ -19,7 +19,7 @@ package org.apache.lucene.benchmark.byTa
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.index.Term;
-import org.apache.lucene.queryParser.QueryParser;
+import org.apache.lucene.queryparser.classic.QueryParser;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.WildcardQuery;
import org.apache.lucene.search.spans.SpanFirstQuery;
Modified: lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java (original)
+++ lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java Mon Jul 11 03:37:00 2011
@@ -19,7 +19,7 @@ package org.apache.lucene.benchmark.byTa
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.index.Term;
-import org.apache.lucene.queryParser.QueryParser;
+import org.apache.lucene.queryparser.classic.QueryParser;
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.Query;
Modified: lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/QualityQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/QualityQueryParser.java?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/QualityQueryParser.java (original)
+++ lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/QualityQueryParser.java Mon Jul 11 03:37:00 2011
@@ -16,7 +16,7 @@
*/
package org.apache.lucene.benchmark.quality;
-import org.apache.lucene.queryParser.ParseException;
+import org.apache.lucene.queryparser.classic.ParseException;
import org.apache.lucene.search.Query;
/**
Modified: lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/SimpleQQParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/SimpleQQParser.java?rev=1145016&r1=1145015&r2=1145016&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/SimpleQQParser.java (original)
+++ lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/SimpleQQParser.java Mon Jul 11 03:37:00 2011
@@ -19,8 +19,8 @@ package org.apache.lucene.benchmark.qual
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.benchmark.quality.QualityQuery;
import org.apache.lucene.benchmark.quality.QualityQueryParser;
-import org.apache.lucene.queryParser.ParseException;
-import org.apache.lucene.queryParser.QueryParser;
+import org.apache.lucene.queryparser.classic.ParseException;
+import org.apache.lucene.queryparser.classic.QueryParser;
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.Query;