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/12 04:22:26 UTC
svn commit: r1145430 - in /lucene/dev/trunk: lucene/
lucene/contrib/queryparser/
lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/
lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/complexPhrase/
lucene/contri...
Author: chrism
Date: Tue Jul 12 02:22:24 2011
New Revision: 1145430
URL: http://svn.apache.org/viewvc?rev=1145430&view=rev
Log:
LUCENE-3285: Moved analyzing, complexphrase, etx and surround queryparsers to qp module
Added:
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/analyzing/
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/analyzing/AnalyzingQueryParser.java
- copied, changed from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/analyzing/package.html
- copied unchanged from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/package.html
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/complexPhrase/
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/complexPhrase/ComplexPhraseQueryParser.java
- copied, changed from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/complexPhrase/ComplexPhraseQueryParser.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/complexPhrase/package.html
- copied unchanged from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/complexPhrase/package.html
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/ext/
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/ext/ExtendableQueryParser.java
- copied, changed from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ExtendableQueryParser.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/ext/ExtensionQuery.java
- copied, changed from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ExtensionQuery.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/ext/Extensions.java
- copied, changed from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/Extensions.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/ext/ParserExtension.java
- copied, changed from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ParserExtension.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/ext/package.html
- copied unchanged from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/package.html
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/package.html
- copied unchanged from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/package.html
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/
- copied from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/
- copied from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/
lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/analyzing/
lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/analyzing/TestAnalyzingQueryParser.java
- copied, changed from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/analyzing/TestAnalyzingQueryParser.java
lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/
lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java
- copied, changed from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java
lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/ext/
lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/ext/ExtensionStub.java
- copied, changed from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/ExtensionStub.java
lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/ext/TestExtendableQueryParser.java
- copied, changed from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/TestExtendableQueryParser.java
lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/ext/TestExtensions.java
- copied, changed from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/TestExtensions.java
lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/
lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/
lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/BooleanQueryTst.java
- copied, changed from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/BooleanQueryTst.java
lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/ExceptionQueryTst.java
- copied, changed from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/ExceptionQueryTst.java
lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SingleFieldTestDb.java
- copied, changed from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/SingleFieldTestDb.java
lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test01Exceptions.java
- copied, changed from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/Test01Exceptions.java
lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test02Boolean.java
- copied, changed from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/Test02Boolean.java
lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test03Distance.java
- copied, changed from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/Test03Distance.java
Removed:
lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/
lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/complexPhrase/
lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/
lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/
lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/analyzing/
lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/complexPhrase/
lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/
lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/
Modified:
lucene/dev/trunk/lucene/build.xml
lucene/dev/trunk/lucene/contrib/queryparser/build.xml
lucene/dev/trunk/modules/queryparser/build.xml
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/CharStream.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/FastCharStream.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/ParseException.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParser.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParser.jj
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParserConstants.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParserTokenManager.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/Token.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/TokenMgrError.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/package.html
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/AndQuery.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/BasicQueryFactory.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/ComposedQuery.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/DistanceQuery.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/DistanceSubQuery.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/FieldsQuery.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/NotQuery.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/OrQuery.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SimpleTerm.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SpanNearClauseFactory.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndBooleanQuery.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndPrefixQuery.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndQuery.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndTermQuery.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndTruncQuery.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/TooManyBasicQueries.java
lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/package.html
Modified: lucene/dev/trunk/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/build.xml?rev=1145430&r1=1145429&r2=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/build.xml (original)
+++ lucene/dev/trunk/lucene/build.xml Tue Jul 12 02:22:24 2011
@@ -416,9 +416,6 @@
<!-- ================================================================== -->
<target name="clean-javacc">
<delete>
- <fileset dir="contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser" includes="*.java">
- <containsregexp expression="Generated.*By.*JavaCC"/>
- </fileset>
<fileset dir="contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser" includes="*.java">
<containsregexp expression="Generated.*By.*JavaCC"/>
</fileset>
Modified: lucene/dev/trunk/lucene/contrib/queryparser/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queryparser/build.xml?rev=1145430&r1=1145429&r2=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/build.xml (original)
+++ lucene/dev/trunk/lucene/contrib/queryparser/build.xml Tue Jul 12 02:22:24 2011
@@ -37,7 +37,7 @@
<!--
NOTE: see the README.javacc for details on how to fully regenerate the parser
-->
- <target name="javacc" depends="javacc-flexible,javacc-surround"/>
+ <target name="javacc" depends="javacc-flexible"/>
<target name="javacc-flexible" depends="javacc-check">
<delete>
@@ -102,12 +102,6 @@ import org.apache.lucene.queryParser.cor
byline="true"/>
</target>
- <target name="javacc-surround" depends="javacc-check" description="generate surround query parser from jj (requires javacc 4.1">
- <invoke-javacc target="src/java/org/apache/lucene/queryParser/surround/parser/QueryParser.jj"
- 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">
Modified: lucene/dev/trunk/modules/queryparser/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/build.xml?rev=1145430&r1=1145429&r2=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/modules/queryparser/build.xml (original)
+++ lucene/dev/trunk/modules/queryparser/build.xml Tue Jul 12 02:22:24 2011
@@ -33,10 +33,13 @@
<fileset dir="src/java/org/apache/lucene/queryparser/classic" includes="*.java">
<containsregexp expression="Generated.*By.*JavaCC"/>
</fileset>
+ <fileset dir="src/java/org/apache/lucene/queryparser/surround/parser" includes="*.java">
+ <containsregexp expression="Generated.*By.*JavaCC"/>
+ </fileset>
</delete>
</target>
- <target name="javacc" depends="init,javacc-check,clean-javacc,javacc-QueryParser"/>
+ <target name="javacc" depends="init,javacc-check,clean-javacc,javacc-QueryParser,javacc-surround"/>
<target name="javacc-QueryParser" depends="init,javacc-check" if="javacc.present">
<sequential>
@@ -56,4 +59,10 @@
</sequential>
</target>
+ <target name="javacc-surround" depends="javacc-check" description="generate surround query parser from jj (requires javacc 4.1">
+ <invoke-javacc target="src/java/org/apache/lucene/queryparser/surround/parser/QueryParser.jj"
+ outputDir="src/java/org/apache/lucene/queryparser/surround/parser"
+ />
+ </target>
+
</project>
Copied: lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/analyzing/AnalyzingQueryParser.java (from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/analyzing/AnalyzingQueryParser.java?p2=lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/analyzing/AnalyzingQueryParser.java&p1=lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java&r1=1145425&r2=1145430&rev=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/analyzing/AnalyzingQueryParser.java Tue Jul 12 02:22:24 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.analyzing;
+package org.apache.lucene.queryparser.analyzing;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
Copied: lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/complexPhrase/ComplexPhraseQueryParser.java (from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/complexPhrase/ComplexPhraseQueryParser.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/complexPhrase/ComplexPhraseQueryParser.java?p2=lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/complexPhrase/ComplexPhraseQueryParser.java&p1=lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/complexPhrase/ComplexPhraseQueryParser.java&r1=1145425&r2=1145430&rev=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/complexPhrase/ComplexPhraseQueryParser.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/complexPhrase/ComplexPhraseQueryParser.java Tue Jul 12 02:22:24 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.complexPhrase;
+package org.apache.lucene.queryparser.complexPhrase;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
Copied: lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/ext/ExtendableQueryParser.java (from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ExtendableQueryParser.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/ext/ExtendableQueryParser.java?p2=lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/ext/ExtendableQueryParser.java&p1=lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ExtendableQueryParser.java&r1=1145425&r2=1145430&rev=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ExtendableQueryParser.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/ext/ExtendableQueryParser.java Tue Jul 12 02:22:24 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.ext;
+package org.apache.lucene.queryparser.ext;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,7 +18,7 @@ package org.apache.lucene.queryParser.ex
*/
import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.queryParser.ext.Extensions.Pair;
+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;
Copied: lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/ext/ExtensionQuery.java (from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ExtensionQuery.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/ext/ExtensionQuery.java?p2=lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/ext/ExtensionQuery.java&p1=lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ExtensionQuery.java&r1=1145425&r2=1145430&rev=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ExtensionQuery.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/ext/ExtensionQuery.java Tue Jul 12 02:22:24 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.ext;
+package org.apache.lucene.queryparser.ext;
import org.apache.lucene.queryparser.classic.QueryParser;
Copied: lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/ext/Extensions.java (from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/Extensions.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/ext/Extensions.java?p2=lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/ext/Extensions.java&p1=lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/Extensions.java&r1=1145425&r2=1145430&rev=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/Extensions.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/ext/Extensions.java Tue Jul 12 02:22:24 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.ext;
+package org.apache.lucene.queryparser.ext;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
Copied: lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/ext/ParserExtension.java (from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ParserExtension.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/ext/ParserExtension.java?p2=lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/ext/ParserExtension.java&p1=lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ParserExtension.java&r1=1145425&r2=1145430&rev=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/ext/ParserExtension.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/ext/ParserExtension.java Tue Jul 12 02:22:24 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.ext;
+package org.apache.lucene.queryparser.ext;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
Modified: lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/CharStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/CharStream.java?rev=1145430&r1=1145425&r2=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/CharStream.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/CharStream.java Tue Jul 12 02:22:24 2011
@@ -1,6 +1,6 @@
/* Generated By:JavaCC: Do not edit this line. CharStream.java Version 4.1 */
/* JavaCCOptions:STATIC=false */
-package org.apache.lucene.queryParser.surround.parser;
+package org.apache.lucene.queryparser.surround.parser;
/**
* This interface describes a character stream that maintains line and
Modified: lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/FastCharStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/FastCharStream.java?rev=1145430&r1=1145425&r2=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/FastCharStream.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/FastCharStream.java Tue Jul 12 02:22:24 2011
@@ -1,5 +1,5 @@
// FastCharStream.java
-package org.apache.lucene.queryParser.surround.parser;
+package org.apache.lucene.queryparser.surround.parser;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
Modified: lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/ParseException.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/ParseException.java?rev=1145430&r1=1145425&r2=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/ParseException.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/ParseException.java Tue Jul 12 02:22:24 2011
@@ -1,6 +1,6 @@
/* Generated By:JavaCC: Do not edit this line. ParseException.java Version 4.1 */
/* JavaCCOptions:KEEP_LINE_COL=null */
-package org.apache.lucene.queryParser.surround.parser;
+package org.apache.lucene.queryparser.surround.parser;
/**
* This exception is thrown when parse errors are encountered.
Modified: lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParser.java?rev=1145430&r1=1145425&r2=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParser.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParser.java Tue Jul 12 02:22:24 2011
@@ -1,5 +1,5 @@
/* Generated By:JavaCC: Do not edit this line. QueryParser.java */
-package org.apache.lucene.queryParser.surround.parser;
+package org.apache.lucene.queryparser.surround.parser;
import java.util.ArrayList;
import java.util.List;
@@ -8,15 +8,15 @@ import java.io.StringReader;
import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.queryParser.surround.query.SrndQuery;
-import org.apache.lucene.queryParser.surround.query.FieldsQuery;
-import org.apache.lucene.queryParser.surround.query.OrQuery;
-import org.apache.lucene.queryParser.surround.query.AndQuery;
-import org.apache.lucene.queryParser.surround.query.NotQuery;
-import org.apache.lucene.queryParser.surround.query.DistanceQuery;
-import org.apache.lucene.queryParser.surround.query.SrndTermQuery;
-import org.apache.lucene.queryParser.surround.query.SrndPrefixQuery;
-import org.apache.lucene.queryParser.surround.query.SrndTruncQuery;
+import org.apache.lucene.queryparser.surround.query.SrndQuery;
+import org.apache.lucene.queryparser.surround.query.FieldsQuery;
+import org.apache.lucene.queryparser.surround.query.OrQuery;
+import org.apache.lucene.queryparser.surround.query.AndQuery;
+import org.apache.lucene.queryparser.surround.query.NotQuery;
+import org.apache.lucene.queryparser.surround.query.DistanceQuery;
+import org.apache.lucene.queryparser.surround.query.SrndTermQuery;
+import org.apache.lucene.queryparser.surround.query.SrndPrefixQuery;
+import org.apache.lucene.queryparser.surround.query.SrndTruncQuery;
/**
* This class is generated by JavaCC. The only method that clients should need
Modified: lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParser.jj
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParser.jj?rev=1145430&r1=1145425&r2=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParser.jj (original)
+++ lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParser.jj Tue Jul 12 02:22:24 2011
@@ -28,7 +28,7 @@ options {
PARSER_BEGIN(QueryParser)
-package org.apache.lucene.queryParser.surround.parser;
+package org.apache.lucene.queryparser.surround.parser;
import java.util.ArrayList;
import java.util.List;
@@ -37,15 +37,15 @@ import java.io.StringReader;
import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.queryParser.surround.query.SrndQuery;
-import org.apache.lucene.queryParser.surround.query.FieldsQuery;
-import org.apache.lucene.queryParser.surround.query.OrQuery;
-import org.apache.lucene.queryParser.surround.query.AndQuery;
-import org.apache.lucene.queryParser.surround.query.NotQuery;
-import org.apache.lucene.queryParser.surround.query.DistanceQuery;
-import org.apache.lucene.queryParser.surround.query.SrndTermQuery;
-import org.apache.lucene.queryParser.surround.query.SrndPrefixQuery;
-import org.apache.lucene.queryParser.surround.query.SrndTruncQuery;
+import org.apache.lucene.queryparser.surround.query.SrndQuery;
+import org.apache.lucene.queryparser.surround.query.FieldsQuery;
+import org.apache.lucene.queryparser.surround.query.OrQuery;
+import org.apache.lucene.queryparser.surround.query.AndQuery;
+import org.apache.lucene.queryparser.surround.query.NotQuery;
+import org.apache.lucene.queryparser.surround.query.DistanceQuery;
+import org.apache.lucene.queryparser.surround.query.SrndTermQuery;
+import org.apache.lucene.queryparser.surround.query.SrndPrefixQuery;
+import org.apache.lucene.queryparser.surround.query.SrndTruncQuery;
/**
* This class is generated by JavaCC. The only method that clients should need
Modified: lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParserConstants.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParserConstants.java?rev=1145430&r1=1145425&r2=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParserConstants.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParserConstants.java Tue Jul 12 02:22:24 2011
@@ -1,5 +1,5 @@
/* Generated By:JavaCC: Do not edit this line. QueryParserConstants.java */
-package org.apache.lucene.queryParser.surround.parser;
+package org.apache.lucene.queryparser.surround.parser;
/**
Modified: lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParserTokenManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParserTokenManager.java?rev=1145430&r1=1145425&r2=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParserTokenManager.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParserTokenManager.java Tue Jul 12 02:22:24 2011
@@ -1,18 +1,18 @@
/* Generated By:JavaCC: Do not edit this line. QueryParserTokenManager.java */
-package org.apache.lucene.queryParser.surround.parser;
+package org.apache.lucene.queryparser.surround.parser;
import java.util.ArrayList;
import java.util.List;
import java.io.StringReader;
import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.queryParser.surround.query.SrndQuery;
-import org.apache.lucene.queryParser.surround.query.FieldsQuery;
-import org.apache.lucene.queryParser.surround.query.OrQuery;
-import org.apache.lucene.queryParser.surround.query.AndQuery;
-import org.apache.lucene.queryParser.surround.query.NotQuery;
-import org.apache.lucene.queryParser.surround.query.DistanceQuery;
-import org.apache.lucene.queryParser.surround.query.SrndTermQuery;
-import org.apache.lucene.queryParser.surround.query.SrndPrefixQuery;
-import org.apache.lucene.queryParser.surround.query.SrndTruncQuery;
+import org.apache.lucene.queryparser.surround.query.SrndQuery;
+import org.apache.lucene.queryparser.surround.query.FieldsQuery;
+import org.apache.lucene.queryparser.surround.query.OrQuery;
+import org.apache.lucene.queryparser.surround.query.AndQuery;
+import org.apache.lucene.queryparser.surround.query.NotQuery;
+import org.apache.lucene.queryparser.surround.query.DistanceQuery;
+import org.apache.lucene.queryparser.surround.query.SrndTermQuery;
+import org.apache.lucene.queryparser.surround.query.SrndPrefixQuery;
+import org.apache.lucene.queryparser.surround.query.SrndTruncQuery;
/** Token Manager. */
public class QueryParserTokenManager implements QueryParserConstants
Modified: lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/Token.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/Token.java?rev=1145430&r1=1145425&r2=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/Token.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/Token.java Tue Jul 12 02:22:24 2011
@@ -1,6 +1,6 @@
/* Generated By:JavaCC: Do not edit this line. Token.java Version 4.1 */
/* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COL=null */
-package org.apache.lucene.queryParser.surround.parser;
+package org.apache.lucene.queryparser.surround.parser;
/**
* Describes the input token stream.
Modified: lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/TokenMgrError.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/TokenMgrError.java?rev=1145430&r1=1145425&r2=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/TokenMgrError.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/TokenMgrError.java Tue Jul 12 02:22:24 2011
@@ -1,6 +1,6 @@
/* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 4.1 */
/* JavaCCOptions: */
-package org.apache.lucene.queryParser.surround.parser;
+package org.apache.lucene.queryparser.surround.parser;
/** Token Manager Error. */
@SuppressWarnings("serial")
Modified: lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/package.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/package.html?rev=1145430&r1=1145425&r2=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/package.html (original)
+++ lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/package.html Tue Jul 12 02:22:24 2011
@@ -23,6 +23,6 @@
This package contains the QueryParser.jj source file for the Surround parser.
<p/>
Parsing the text of a query results in a SrndQuery in the
- org.apache.lucene.queryParser.surround.query package.
+ org.apache.lucene.queryparser.surround.query package.
</body>
</html>
Modified: lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/AndQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/AndQuery.java?rev=1145430&r1=1145425&r2=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/AndQuery.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/AndQuery.java Tue Jul 12 02:22:24 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.surround.query;
+package org.apache.lucene.queryparser.surround.query;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
Modified: lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/BasicQueryFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/BasicQueryFactory.java?rev=1145430&r1=1145425&r2=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/BasicQueryFactory.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/BasicQueryFactory.java Tue Jul 12 02:22:24 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.surround.query;
+package org.apache.lucene.queryparser.surround.query;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
Modified: lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/ComposedQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/ComposedQuery.java?rev=1145430&r1=1145425&r2=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/ComposedQuery.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/ComposedQuery.java Tue Jul 12 02:22:24 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.surround.query;
+package org.apache.lucene.queryparser.surround.query;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
Modified: lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/DistanceQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/DistanceQuery.java?rev=1145430&r1=1145425&r2=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/DistanceQuery.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/DistanceQuery.java Tue Jul 12 02:22:24 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.surround.query;
+package org.apache.lucene.queryparser.surround.query;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
Modified: lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/DistanceSubQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/DistanceSubQuery.java?rev=1145430&r1=1145425&r2=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/DistanceSubQuery.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/DistanceSubQuery.java Tue Jul 12 02:22:24 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.surround.query;
+package org.apache.lucene.queryparser.surround.query;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
Modified: lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/FieldsQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/FieldsQuery.java?rev=1145430&r1=1145425&r2=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/FieldsQuery.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/FieldsQuery.java Tue Jul 12 02:22:24 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.surround.query;
+package org.apache.lucene.queryparser.surround.query;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
Modified: lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/NotQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/NotQuery.java?rev=1145430&r1=1145425&r2=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/NotQuery.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/NotQuery.java Tue Jul 12 02:22:24 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.surround.query;
+package org.apache.lucene.queryparser.surround.query;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
Modified: lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/OrQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/OrQuery.java?rev=1145430&r1=1145425&r2=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/OrQuery.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/OrQuery.java Tue Jul 12 02:22:24 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.surround.query;
+package org.apache.lucene.queryparser.surround.query;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
Modified: lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SimpleTerm.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SimpleTerm.java?rev=1145430&r1=1145425&r2=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SimpleTerm.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SimpleTerm.java Tue Jul 12 02:22:24 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.surround.query;
+package org.apache.lucene.queryparser.surround.query;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
Modified: lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SpanNearClauseFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SpanNearClauseFactory.java?rev=1145430&r1=1145425&r2=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SpanNearClauseFactory.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SpanNearClauseFactory.java Tue Jul 12 02:22:24 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.surround.query;
+package org.apache.lucene.queryparser.surround.query;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
Modified: lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndBooleanQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndBooleanQuery.java?rev=1145430&r1=1145425&r2=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndBooleanQuery.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndBooleanQuery.java Tue Jul 12 02:22:24 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.surround.query;
+package org.apache.lucene.queryparser.surround.query;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
Modified: lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndPrefixQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndPrefixQuery.java?rev=1145430&r1=1145425&r2=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndPrefixQuery.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndPrefixQuery.java Tue Jul 12 02:22:24 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.surround.query;
+package org.apache.lucene.queryparser.surround.query;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
Modified: lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndQuery.java?rev=1145430&r1=1145425&r2=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndQuery.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndQuery.java Tue Jul 12 02:22:24 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.surround.query;
+package org.apache.lucene.queryparser.surround.query;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
Modified: lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndTermQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndTermQuery.java?rev=1145430&r1=1145425&r2=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndTermQuery.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndTermQuery.java Tue Jul 12 02:22:24 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.surround.query;
+package org.apache.lucene.queryparser.surround.query;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
Modified: lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndTruncQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndTruncQuery.java?rev=1145430&r1=1145425&r2=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndTruncQuery.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndTruncQuery.java Tue Jul 12 02:22:24 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.surround.query;
+package org.apache.lucene.queryparser.surround.query;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
Modified: lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/TooManyBasicQueries.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/TooManyBasicQueries.java?rev=1145430&r1=1145425&r2=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/TooManyBasicQueries.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/TooManyBasicQueries.java Tue Jul 12 02:22:24 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.surround.query;
+package org.apache.lucene.queryparser.surround.query;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
Modified: lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/package.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/package.html?rev=1145430&r1=1145425&r2=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/package.html (original)
+++ lucene/dev/trunk/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/package.html Tue Jul 12 02:22:24 2011
@@ -22,7 +22,7 @@
<body>
This package contains SrndQuery and its subclasses.
<p/>
- The parser in the org.apache.lucene.queryParser.surround.parser package
+ The parser in the org.apache.lucene.queryparser.surround.parser package
normally generates a SrndQuery.
<p/>
For searching an org.apache.lucene.search.Query is provided by
Copied: lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/analyzing/TestAnalyzingQueryParser.java (from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/analyzing/TestAnalyzingQueryParser.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/analyzing/TestAnalyzingQueryParser.java?p2=lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/analyzing/TestAnalyzingQueryParser.java&p1=lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/analyzing/TestAnalyzingQueryParser.java&r1=1145425&r2=1145430&rev=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/analyzing/TestAnalyzingQueryParser.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/analyzing/TestAnalyzingQueryParser.java Tue Jul 12 02:22:24 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.analyzing;
+package org.apache.lucene.queryparser.analyzing;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
Copied: lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java (from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java?p2=lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java&p1=lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java&r1=1145425&r2=1145430&rev=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java Tue Jul 12 02:22:24 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.complexPhrase;
+package org.apache.lucene.queryparser.complexPhrase;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
Copied: lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/ext/ExtensionStub.java (from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/ExtensionStub.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/ext/ExtensionStub.java?p2=lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/ext/ExtensionStub.java&p1=lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/ExtensionStub.java&r1=1145425&r2=1145430&rev=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/ExtensionStub.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/ext/ExtensionStub.java Tue Jul 12 02:22:24 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.ext;
+package org.apache.lucene.queryparser.ext;
import org.apache.lucene.index.Term;
import org.apache.lucene.queryparser.classic.ParseException;
Copied: lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/ext/TestExtendableQueryParser.java (from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/TestExtendableQueryParser.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/ext/TestExtendableQueryParser.java?p2=lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/ext/TestExtendableQueryParser.java&p1=lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/TestExtendableQueryParser.java&r1=1145425&r2=1145430&rev=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/TestExtendableQueryParser.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/ext/TestExtendableQueryParser.java Tue Jul 12 02:22:24 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.ext;
+package org.apache.lucene.queryparser.ext;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
Copied: lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/ext/TestExtensions.java (from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/TestExtensions.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/ext/TestExtensions.java?p2=lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/ext/TestExtensions.java&p1=lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/TestExtensions.java&r1=1145425&r2=1145430&rev=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/ext/TestExtensions.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/ext/TestExtensions.java Tue Jul 12 02:22:24 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.ext;
+package org.apache.lucene.queryparser.ext;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
Copied: lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/BooleanQueryTst.java (from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/BooleanQueryTst.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/BooleanQueryTst.java?p2=lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/BooleanQueryTst.java&p1=lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/BooleanQueryTst.java&r1=1145425&r2=1145430&rev=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/BooleanQueryTst.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/BooleanQueryTst.java Tue Jul 12 02:22:24 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.surround.query;
+package org.apache.lucene.queryparser.surround.query;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -25,7 +25,7 @@ import org.apache.lucene.search.Collecto
import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.Query;
-import org.apache.lucene.queryParser.surround.parser.QueryParser;
+import org.apache.lucene.queryparser.surround.parser.QueryParser;
import org.junit.Assert;
Copied: lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/ExceptionQueryTst.java (from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/ExceptionQueryTst.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/ExceptionQueryTst.java?p2=lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/ExceptionQueryTst.java&p1=lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/ExceptionQueryTst.java&r1=1145425&r2=1145430&rev=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/ExceptionQueryTst.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/ExceptionQueryTst.java Tue Jul 12 02:22:24 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.surround.query;
+package org.apache.lucene.queryparser.surround.query;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,8 +17,8 @@ package org.apache.lucene.queryParser.su
* limitations under the License.
*/
-import org.apache.lucene.queryParser.surround.parser.ParseException;
-import org.apache.lucene.queryParser.surround.parser.QueryParser;
+import org.apache.lucene.queryparser.surround.parser.ParseException;
+import org.apache.lucene.queryparser.surround.parser.QueryParser;
public class ExceptionQueryTst {
Copied: lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SingleFieldTestDb.java (from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/SingleFieldTestDb.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SingleFieldTestDb.java?p2=lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SingleFieldTestDb.java&p1=lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/SingleFieldTestDb.java&r1=1145425&r2=1145430&rev=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/SingleFieldTestDb.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SingleFieldTestDb.java Tue Jul 12 02:22:24 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.surround.query;
+package org.apache.lucene.queryparser.surround.query;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
Copied: lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test01Exceptions.java (from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/Test01Exceptions.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test01Exceptions.java?p2=lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test01Exceptions.java&p1=lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/Test01Exceptions.java&r1=1145425&r2=1145430&rev=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/Test01Exceptions.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test01Exceptions.java Tue Jul 12 02:22:24 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.surround.query;
+package org.apache.lucene.queryparser.surround.query;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
Copied: lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test02Boolean.java (from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/Test02Boolean.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test02Boolean.java?p2=lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test02Boolean.java&p1=lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/Test02Boolean.java&r1=1145425&r2=1145430&rev=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/Test02Boolean.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test02Boolean.java Tue Jul 12 02:22:24 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.surround.query;
+package org.apache.lucene.queryparser.surround.query;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
Copied: lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test03Distance.java (from r1145425, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/Test03Distance.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test03Distance.java?p2=lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test03Distance.java&p1=lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/Test03Distance.java&r1=1145425&r2=1145430&rev=1145430&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/Test03Distance.java (original)
+++ lucene/dev/trunk/modules/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test03Distance.java Tue Jul 12 02:22:24 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.surround.query;
+package org.apache.lucene.queryparser.surround.query;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more