lucene-java-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mikemcc...@apache.org
Subject svn commit: r801934 [1/3] - in /lucene/java/trunk/contrib/queryparser: ./ src/java/ src/java/org/apache/lucene/queryParser/ src/java/org/apache/lucene/queryParser/core/builders/ src/java/org/apache/lucene/queryParser/core/config/ src/java/org/apache/lu...
Date Fri, 07 Aug 2009 10:24:31 GMT
Author: mikemccand
Date: Fri Aug  7 10:24:28 2009
New Revision: 801934

URL: http://svn.apache.org/viewvc?rev=801934&view=rev
Log:
LUCENE-1782: rename original -> standard in the new QueryParser

Added:
    lucene/java/trunk/contrib/queryparser/README.javacc   (with props)
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/
      - copied from r801557, lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/StandardQueryParser.java
      - copied, changed from r801557, lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/OriginalQueryParserHelper.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/StandardBooleanQueryNodeBuilder.java
      - copied, changed from r801557, lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/builders/OriginalBooleanQueryNodeBuilder.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/StandardQueryBuilder.java
      - copied, changed from r801557, lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/builders/OriginalQueryBuilder.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/StandardQueryTreeBuilder.java
      - copied, changed from r801557, lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/builders/OriginalQueryTreeBuilder.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/StandardQueryConfigHandler.java
      - copied, changed from r801557, lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/config/OriginalQueryConfigHandler.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/StandardBooleanQueryNode.java
      - copied, changed from r801557, lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/nodes/OriginalBooleanQueryNode.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParser.java
      - copied, changed from r801557, lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/parser/OriginalSyntaxParser.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParser.jj
      - copied, changed from r801557, lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/parser/OriginalSyntaxParser.jj
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParserConstants.java
      - copied, changed from r801557, lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/parser/OriginalSyntaxParserConstants.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParserTokenManager.java
      - copied, changed from r801557, lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/parser/OriginalSyntaxParserTokenManager.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/StandardQueryNodeProcessorPipeline.java
      - copied, changed from r801557, lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/processors/OriginalQueryNodeProcessorPipeline.java
    lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/
      - copied from r801557, lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/original/
Removed:
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/OriginalQueryParserHelper.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/OriginalBooleanQueryNodeBuilder.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/OriginalQueryBuilder.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/OriginalQueryTreeBuilder.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/OriginalQueryConfigHandler.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/OriginalBooleanQueryNode.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/OriginalSyntaxParser.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/OriginalSyntaxParser.jj
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/OriginalSyntaxParserConstants.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/OriginalSyntaxParserTokenManager.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/OriginalQueryNodeProcessorPipeline.java
    lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/original/
Modified:
    lucene/java/trunk/contrib/queryparser/build.xml
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/builders/QueryTreeBuilder.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/config/package.html
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ProximityQueryNode.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/package.html
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/package.html
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/MultiFieldQueryParserWrapper.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/QueryParserUtil.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/QueryParserWrapper.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/AnyQueryNodeBuilder.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/BooleanQueryNodeBuilder.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/BoostQueryNodeBuilder.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/FieldQueryNodeBuilder.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/FuzzyQueryNodeBuilder.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/GroupQueryNodeBuilder.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/MatchAllDocsQueryNodeBuilder.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/MatchNoDocsQueryNodeBuilder.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/ModifierQueryNodeBuilder.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/MultiPhraseQueryNodeBuilder.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/PhraseQueryNodeBuilder.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/PrefixWildcardQueryNodeBuilder.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/RangeQueryNodeBuilder.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/SlopQueryNodeBuilder.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/WildcardQueryNodeBuilder.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/package.html
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/AllowLeadingWildcardAttribute.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/AllowLeadingWildcardAttributeImpl.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/AnalyzerAttribute.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/AnalyzerAttributeImpl.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/BoostAttribute.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/BoostAttributeImpl.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DateResolutionAttribute.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DateResolutionAttributeImpl.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DefaultOperatorAttribute.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DefaultOperatorAttributeImpl.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DefaultPhraseSlopAttribute.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DefaultPhraseSlopAttributeImpl.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldBoostMapAttribute.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldBoostMapAttributeImpl.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldBoostMapFCListener.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldDateResolutionFCListener.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldDateResolutionMapAttribute.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldDateResolutionMapAttributeImpl.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FuzzyAttribute.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FuzzyAttributeImpl.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/LocaleAttribute.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/LocaleAttributeImpl.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/LowercaseExpandedTermsAttribute.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/LowercaseExpandedTermsAttributeImpl.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/MultiFieldAttribute.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/MultiFieldAttributeImpl.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/MultiTermRewriteMethodAttribute.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/MultiTermRewriteMethodAttributeImpl.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/PositionIncrementsAttribute.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/PositionIncrementsAttributeImpl.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/RangeCollatorAttribute.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/RangeCollatorAttributeImpl.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/package.html
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/BooleanModifierNode.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/MultiPhraseQueryNode.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/RangeQueryNode.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/package.html
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/package.html
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/EscapeQuerySyntaxImpl.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/JavaCharStream.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/ParseException.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/Token.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/TokenMgrError.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/package.html
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/AllowLeadingWildcardProcessor.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/AnalyzerQueryNodeProcessor.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/BooleanSingleChildOptimizationQueryNodeProcessor.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/BoostQueryNodeProcessor.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/DefaultPhraseSlopQueryNodeProcessor.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/FuzzyQueryNodeProcessor.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/GroupQueryNodeProcessor.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/LowercaseExpandedTermsQueryNodeProcessor.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/MatchAllDocsQueryNodeProcessor.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/MultiFieldQueryNodeProcessor.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/ParametricRangeQueryNodeProcessor.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/PhraseSlopQueryNodeProcessor.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/PrefixWildcardQueryNodeProcessor.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/RemoveEmptyNonLeafQueryNodeProcessor.java
    lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/package.html
    lucene/java/trunk/contrib/queryparser/src/java/overview.html
    lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/SpanOrQueryNodeBuilder.java
    lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/SpanTermQueryNodeBuilder.java
    lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/SpansQueryTreeBuilder.java
    lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/TestSpanQueryParser.java
    lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/TestSpanQueryParserSimpleSample.java
    lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiAnalyzerQPHelper.java
    lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiAnalyzerWrapper.java
    lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQPHelper.java
    lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQueryParserWrapper.java
    lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQPHelper.java
    lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQueryParserWrapper.java

Added: lucene/java/trunk/contrib/queryparser/README.javacc
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/README.javacc?rev=801934&view=auto
==============================================================================
--- lucene/java/trunk/contrib/queryparser/README.javacc (added)
+++ lucene/java/trunk/contrib/queryparser/README.javacc Fri Aug  7 10:24:28 2009
@@ -0,0 +1,62 @@
+NOTE: often, if you are making a small change to the .jj file, you can
+simply run "ant javacc" and skip the steps below.  JavaCC will print
+warnings like this:
+
+   Warning: ParseException.java: File is obsolete.  Please rename or delete this file so that a new one can be generated for you.
+
+which you should ignore (ie, simply keep the ParseException.java class
+that's already present).
+
+If, instead, you'd like to fully rebuild the StandardQueryParser,
+here's how:
+
+  * Delete these files:
+
+    StandardQueryParser.java
+    StandardQueryParserConstants.java
+    StandardQueryParserTokenManager.java
+    TokenMgrError.java
+    JavaCharStream.java
+    Token.java
+
+  * Run "ant javacc". That will generate the all the classes
+
+  * To avoid lots of warnings in the generated code:
+
+    add @SupressWarnings("all"), immediately preceding the class declaration to:
+
+       QueryParserTokenManager.java
+       TokenMgrError.java
+       JavaCharStream.java
+       Token.java
+       JavaCharStream.java
+
+  * Remove all imports from TokenMgrError.java
+
+  * Fix the ParseException class:
+
+    - Change it to extend from QueryNodeParseException:
+
+       "public class ParseException extends QueryNodeParseException".
+
+    - Recreate the all the constructors like this:
+
+      public ParseException(Token currentTokenVal,
+        int[][] expectedTokenSequencesVal, String[] tokenImageVal) {
+        super(new MessageImpl(QueryParserMessages.INVALID_SYNTAX, initialise(
+          currentTokenVal, expectedTokenSequencesVal, tokenImageVal)));
+        this.currentToken = currentTokenVal;
+        this.expectedTokenSequences = expectedTokenSequencesVal;
+        this.tokenImage = tokenImageVal;
+      }
+
+      public ParseException(Message message) {
+        super(message);
+      }
+
+      public ParseException() {
+        super(new MessageImpl(QueryParserMessages.INVALID_SYNTAX, "Error"));
+      }
+
+
+    - Fix all imports

Propchange: lucene/java/trunk/contrib/queryparser/README.javacc
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: lucene/java/trunk/contrib/queryparser/build.xml
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/build.xml?rev=801934&r1=801933&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/build.xml (original)
+++ lucene/java/trunk/contrib/queryparser/build.xml Fri Aug  7 10:24:28 2009
@@ -19,13 +19,22 @@
 
 <project name="queryparser" default="default">
 
-	<description>
-	Flexible Query Parser
-	</description>
+  <description>
+    Flexible Query Parser
+  </description>
 
-	<property name="javac.source" value="1.5" />
-	<property name="javac.target" value="1.5" />
-		
-	<import file="../contrib-build.xml"/>
+  <property name="javac.source" value="1.5" />
+  <property name="javac.target" value="1.5" />
+  
+  <import file="../contrib-build.xml"/>
  
+  <!--
+    NOTE: see the README.javacc for details on how to fully regenerate the parser
+  -->
+  <target name="javacc" depends="init,javacc-check" if="javacc.present">
+    <invoke-javacc target="src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParser.jj"
+                   outputDir="src/java/org/apache/lucene/queryParser/standard/parser"
+    />
+  </target>
+
 </project>

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/builders/QueryTreeBuilder.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/builders/QueryTreeBuilder.java?rev=801934&r1=801933&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/builders/QueryTreeBuilder.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/builders/QueryTreeBuilder.java Fri Aug  7 10:24:28 2009
@@ -25,7 +25,7 @@
 import org.apache.lucene.queryParser.core.messages.QueryParserMessages;
 import org.apache.lucene.queryParser.core.nodes.FieldableNode;
 import org.apache.lucene.queryParser.core.nodes.QueryNode;
-import org.apache.lucene.queryParser.original.parser.EscapeQuerySyntaxImpl;
+import org.apache.lucene.queryParser.standard.parser.EscapeQuerySyntaxImpl;
 
 /**
  * This class should be used when there is a builder for each type of node.

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/config/package.html
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/config/package.html?rev=801934&r1=801933&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/config/package.html (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/config/package.html Fri Aug  7 10:24:28 2009
@@ -29,20 +29,20 @@
 abstract class that all config handlers should extend.
 </p>
 <p>
-See {@link org.apache.lucene.queryParser.original.config.OriginalQueryConfigHandler} for a reference
+See {@link org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler} for a reference
 implementation.
 </p>
 <p>
 {@link org.apache.lucene.queryParser.core.config.FieldConfig} and {@link org.apache.lucene.queryParser.core.config.QueryConfigHandler}
  should use {@link org.apache.lucene.util.Attribute} to store all attributes
-required by the config implementation. See <tt>org.apache.lucene.queryParser.original.config.*Attribute</tt>
+required by the config implementation. See <tt>org.apache.lucene.queryParser.standard.config.*Attribute</tt>
 for reference implementation.
 </p>
 <p>
 The {@link org.apache.lucene.queryParser.core.config.QueryConfigHandler}, {@link org.apache.lucene.queryParser.core.config.FieldConfig},
  and {@link org.apache.lucene.util.Attribute}s are used in the processors to access config
 information in a flexible and independent way.
-See {@link org.apache.lucene.queryParser.original.processors.ParametricRangeQueryNodeProcessor} for a 
+See {@link org.apache.lucene.queryParser.standard.processors.ParametricRangeQueryNodeProcessor} for a 
 reference implementation.
 </p>
 </body>

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ProximityQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ProximityQueryNode.java?rev=801934&r1=801933&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ProximityQueryNode.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ProximityQueryNode.java Fri Aug  7 10:24:28 2009
@@ -29,7 +29,7 @@
  * specific distance conditions. (a b c) WITHIN [SENTENCE|PARAGRAPH|NUMBER]
  * [INORDER] ("a" "b" "c") WITHIN [SENTENCE|PARAGRAPH|NUMBER] [INORDER]
  * 
- * TODO: Add this to the future original Lucene parser/processor/builder
+ * TODO: Add this to the future standard Lucene parser/processor/builder
  */
 public class ProximityQueryNode extends BooleanQueryNode {
 

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/package.html
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/package.html?rev=801934&r1=801933&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/package.html (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/package.html Fri Aug  7 10:24:28 2009
@@ -31,8 +31,8 @@
 <p>
 {@link org.apache.lucene.queryParser.core.nodes.QueryNode}s are used by the text parser to create a syntax tree.
 These nodes are designed to be used by UI or other text parsers.
-The default Lucene text parser is {@link org.apache.lucene.queryParser.original.parser.OriginalSyntaxParser},
-it implements original syntax.
+The default Lucene text parser is {@link org.apache.lucene.queryParser.standard.parser.StandardSyntaxParser},
+it implements Lucene's standard syntax.
 </p>
 <p>
 {@link org.apache.lucene.queryParser.core.nodes.QueryNode} interface should be implemented by all query nodes, 
@@ -45,7 +45,7 @@
 </p>
 <p>
 A query node tree can also generate a query string that can be parsed back by the original text parser,
-at this point only the original lucene syntax is supported.
+at this point only the standard lucene syntax is supported.
 </p>
 <p>
 Grouping nodes:

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/package.html
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/package.html?rev=801934&r1=801933&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/package.html (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/package.html Fri Aug  7 10:24:28 2009
@@ -35,7 +35,7 @@
 		    and build a processor pipeline, to implement the features you need</li>
         <li>Config Interfaces - Allow the consumer of the Query Parser to implement
             a diff Config Handler Objects to suite their needs.</li>
-        <li>Original Builders - convert QueryNode's into several lucene 
+        <li>Standard Builders - convert QueryNode's into several lucene 
             representations. Supported conversion is using a 2.4 compatible logic</li>
         <li>QueryNode tree's can be converted to a lucene 2.4 syntax string, using toQueryString</li>                          
     </ol>
@@ -99,21 +99,21 @@
 This design allows to develop different query syntaxes very quickly.
 </p>
 <p>
-A original lucene-compatible syntax is implemented using this new query parser
-API and is located under org.apache.lucene.queryParser.original.
+The standard (default) Lucene query parser is located under
+org.apache.lucene.queryParser.standard.
 <p>
 To make it simpler to use the new query parser 
-the class {@link org.apache.lucene.queryParser.original.OriginalQueryParserHelper} may be helpful,
+the class {@link org.apache.lucene.queryParser.standard.StandardQueryParser} may be helpful,
 specially for people that do not want to extend the Query Parser.
 It uses the default Lucene query processors, text parser and builders, so
 you don't need to worry about dealing with those.
 
-{@link org.apache.lucene.queryParser.original.OriginalQueryParserHelper} usage:
+{@link org.apache.lucene.queryParser.standard.StandardQueryParser} usage:
 <ul>
-OriginalQueryParserHelper qpHelper = new OriginalQueryParserHelper();
+StandardQueryParser qpHelper = new StandardQueryParser();
 
 <br/><br/>
-OriginalQueryConfigHandler config =  qpHelper.getQueryConfigHandler();
+StandardQueryConfigHandler config =  qpHelper.getQueryConfigHandler();
 <br/><br/>
 config.setAllowLeadingWildcard(true);
 <br/><br/>
@@ -122,7 +122,7 @@
 Query query = qpHelper.parse("apache AND lucene", "defaultField");
 </ul>
 To make it easy for people who are using current Lucene's query parser to switch to
-the new one, there is a {@link org.apache.lucene.queryParser.original.QueryParserWrapper} under org.apache.lucene.queryParser.original
+the new one, there is a {@link org.apache.lucene.queryParser.standard.QueryParserWrapper} under org.apache.lucene.queryParser.standard
 that keeps the old query parser interface, but uses the new query parser infrastructure.
 </p>
 </p>

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/MultiFieldQueryParserWrapper.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/MultiFieldQueryParserWrapper.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/MultiFieldQueryParserWrapper.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/MultiFieldQueryParserWrapper.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original;
+package org.apache.lucene.queryParser.standard;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -76,7 +76,7 @@
   @SuppressWarnings("unchecked")
 public MultiFieldQueryParserWrapper(String[] fields, Analyzer analyzer, Map boosts) {
     this(fields, analyzer);
-    OriginalQueryParserHelper qpHelper = (OriginalQueryParserHelper) getQueryParserHelper();
+    StandardQueryParser qpHelper = (StandardQueryParser) getQueryParserHelper();
 
     qpHelper.setMultiFields(fields);
     qpHelper.setFieldsBoost(boosts);
@@ -112,7 +112,7 @@
   public MultiFieldQueryParserWrapper(String[] fields, Analyzer analyzer) {
     super(null, analyzer);
 
-    OriginalQueryParserHelper qpHelper = (OriginalQueryParserHelper) getQueryParserHelper();
+    StandardQueryParser qpHelper = (StandardQueryParser) getQueryParserHelper();
     qpHelper.setAnalyzer(analyzer);
 
     qpHelper.setMultiFields(fields);

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/QueryParserUtil.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/QueryParserUtil.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/QueryParserUtil.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/QueryParserUtil.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original;
+package org.apache.lucene.queryParser.standard;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.queryParser.core.QueryNodeException;
@@ -39,7 +39,7 @@
       throw new IllegalArgumentException("queries.length != fields.length");
     BooleanQuery bQuery = new BooleanQuery();
 
-    OriginalQueryParserHelper qp = new OriginalQueryParserHelper();
+    StandardQueryParser qp = new StandardQueryParser();
     qp.setAnalyzer(analyzer);
 
     for (int i = 0; i < fields.length; i++) {
@@ -95,7 +95,7 @@
       throw new IllegalArgumentException("fields.length != flags.length");
     BooleanQuery bQuery = new BooleanQuery();
 
-    OriginalQueryParserHelper qp = new OriginalQueryParserHelper();
+    StandardQueryParser qp = new StandardQueryParser();
     qp.setAnalyzer(analyzer);
 
     for (int i = 0; i < fields.length; i++) {
@@ -152,7 +152,7 @@
           "queries, fields, and flags array have have different length");
     BooleanQuery bQuery = new BooleanQuery();
 
-    OriginalQueryParserHelper qp = new OriginalQueryParserHelper();
+    StandardQueryParser qp = new StandardQueryParser();
     qp.setAnalyzer(analyzer);
 
     for (int i = 0; i < fields.length; i++) {

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/QueryParserWrapper.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/QueryParserWrapper.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/QueryParserWrapper.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/QueryParserWrapper.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original;
+package org.apache.lucene.queryParser.standard;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,21 +34,21 @@
 import org.apache.lucene.queryParser.core.nodes.QueryNode;
 import org.apache.lucene.queryParser.core.parser.SyntaxParser;
 import org.apache.lucene.queryParser.core.processors.QueryNodeProcessor;
-import org.apache.lucene.queryParser.original.builders.OriginalQueryBuilder;
-import org.apache.lucene.queryParser.original.builders.OriginalQueryTreeBuilder;
-import org.apache.lucene.queryParser.original.config.AllowLeadingWildcardAttribute;
-import org.apache.lucene.queryParser.original.config.AnalyzerAttribute;
-import org.apache.lucene.queryParser.original.config.MultiTermRewriteMethodAttribute;
-import org.apache.lucene.queryParser.original.config.DateResolutionAttribute;
-import org.apache.lucene.queryParser.original.config.DefaultOperatorAttribute;
-import org.apache.lucene.queryParser.original.config.DefaultPhraseSlopAttribute;
-import org.apache.lucene.queryParser.original.config.LocaleAttribute;
-import org.apache.lucene.queryParser.original.config.LowercaseExpandedTermsAttribute;
-import org.apache.lucene.queryParser.original.config.OriginalQueryConfigHandler;
-import org.apache.lucene.queryParser.original.config.PositionIncrementsAttribute;
-import org.apache.lucene.queryParser.original.config.RangeCollatorAttribute;
-import org.apache.lucene.queryParser.original.parser.OriginalSyntaxParser;
-import org.apache.lucene.queryParser.original.processors.OriginalQueryNodeProcessorPipeline;
+import org.apache.lucene.queryParser.standard.builders.StandardQueryBuilder;
+import org.apache.lucene.queryParser.standard.builders.StandardQueryTreeBuilder;
+import org.apache.lucene.queryParser.standard.config.AllowLeadingWildcardAttribute;
+import org.apache.lucene.queryParser.standard.config.AnalyzerAttribute;
+import org.apache.lucene.queryParser.standard.config.MultiTermRewriteMethodAttribute;
+import org.apache.lucene.queryParser.standard.config.DateResolutionAttribute;
+import org.apache.lucene.queryParser.standard.config.DefaultOperatorAttribute;
+import org.apache.lucene.queryParser.standard.config.DefaultPhraseSlopAttribute;
+import org.apache.lucene.queryParser.standard.config.LocaleAttribute;
+import org.apache.lucene.queryParser.standard.config.LowercaseExpandedTermsAttribute;
+import org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler;
+import org.apache.lucene.queryParser.standard.config.PositionIncrementsAttribute;
+import org.apache.lucene.queryParser.standard.config.RangeCollatorAttribute;
+import org.apache.lucene.queryParser.standard.parser.StandardSyntaxParser;
+import org.apache.lucene.queryParser.standard.processors.StandardQueryNodeProcessorPipeline;
 import org.apache.lucene.search.FuzzyQuery;
 import org.apache.lucene.search.MultiTermQuery;
 import org.apache.lucene.search.Query;
@@ -108,31 +108,31 @@
     return sb.toString();
   }
 
-  private SyntaxParser syntaxParser = new OriginalSyntaxParser();
+  private SyntaxParser syntaxParser = new StandardSyntaxParser();
 
-  private OriginalQueryConfigHandler config;
-  private OriginalQueryParserHelper qpHelper;
+  private StandardQueryConfigHandler config;
+  private StandardQueryParser qpHelper;
 
   private QueryNodeProcessor processorPipeline;
 
-  private OriginalQueryBuilder builder = new OriginalQueryTreeBuilder();
+  private StandardQueryBuilder builder = new StandardQueryTreeBuilder();
 
   private String defaultField;
 
   public QueryParserWrapper(String defaultField, Analyzer analyzer) {
     this.defaultField = defaultField;
     
-    this.qpHelper = new OriginalQueryParserHelper();
+    this.qpHelper = new StandardQueryParser();
     
-    this.config = (OriginalQueryConfigHandler) qpHelper.getQueryConfigHandler();
+    this.config = (StandardQueryConfigHandler) qpHelper.getQueryConfigHandler();
 
     this.qpHelper.setAnalyzer(analyzer);
 
-    this.processorPipeline = new OriginalQueryNodeProcessorPipeline(this.config);
+    this.processorPipeline = new StandardQueryNodeProcessorPipeline(this.config);
 
   }
 
-  OriginalQueryParserHelper getQueryParserHelper() {
+  StandardQueryParser getQueryParserHelper() {
     return qpHelper;
   }
   
@@ -153,20 +153,20 @@
   }
 
   /**
-   * Sets the {@link OriginalQueryBuilder} used to generate a {@link Query} object
+   * Sets the {@link StandardQueryBuilder} used to generate a {@link Query} object
    * from the parsed and processed query node tree.
    * 
    * @param builder
    *          the builder
    */
-  public void setQueryBuilder(OriginalQueryBuilder builder) {
+  public void setQueryBuilder(StandardQueryBuilder builder) {
     this.builder = builder;
   }
 
   /**
    * Sets the {@link QueryNodeProcessor} used to process the query node tree
    * generated by the
-   * {@link org.apache.lucene.queryParser.original.parser.OriginalSyntaxParser}.
+   * {@link org.apache.lucene.queryParser.standard.parser.StandardSyntaxParser}.
    * 
    * @param processor
    *          the processor
@@ -184,7 +184,7 @@
    * @param queryConfig
    *          the query config handler
    */
-  public void setQueryConfig(OriginalQueryConfigHandler queryConfig) {
+  public void setQueryConfig(StandardQueryConfigHandler queryConfig) {
     this.config = queryConfig;
 
     if (this.processorPipeline != null) {
@@ -205,7 +205,7 @@
   /**
    * Returns {@link QueryNodeProcessor} used to process the query node tree
    * generated by the
-   * {@link org.apache.lucene.queryParser.original.parser.OriginalSyntaxParser}.
+   * {@link org.apache.lucene.queryParser.standard.parser.StandardSyntaxParser}.
    * 
    * @return the query processor
    */
@@ -375,8 +375,8 @@
   public void setDefaultOperator(Operator op) {
 
     this.qpHelper
-        .setDefaultOperator(OR_OPERATOR.equals(op) ? org.apache.lucene.queryParser.original.config.DefaultOperatorAttribute.Operator.OR
-            : org.apache.lucene.queryParser.original.config.DefaultOperatorAttribute.Operator.AND);
+        .setDefaultOperator(OR_OPERATOR.equals(op) ? org.apache.lucene.queryParser.standard.config.DefaultOperatorAttribute.Operator.OR
+            : org.apache.lucene.queryParser.standard.config.DefaultOperatorAttribute.Operator.AND);
 
   }
 
@@ -386,7 +386,7 @@
         && this.config.hasAttribute(DefaultOperatorAttribute.class)) {
 
       return (((DefaultOperatorAttribute) this.config
-          .getAttribute(DefaultOperatorAttribute.class)).getOperator() == org.apache.lucene.queryParser.original.config.DefaultOperatorAttribute.Operator.AND) ? AND_OPERATOR
+          .getAttribute(DefaultOperatorAttribute.class)).getOperator() == org.apache.lucene.queryParser.standard.config.DefaultOperatorAttribute.Operator.AND) ? AND_OPERATOR
           : OR_OPERATOR;
 
     }

Copied: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/StandardQueryParser.java (from r801557, lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/OriginalQueryParserHelper.java)
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/StandardQueryParser.java?p2=lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/StandardQueryParser.java&p1=lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/OriginalQueryParserHelper.java&r1=801557&r2=801934&rev=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/OriginalQueryParserHelper.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/StandardQueryParser.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original;
+package org.apache.lucene.queryParser.standard;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -27,26 +27,26 @@
 import org.apache.lucene.queryParser.core.QueryNodeException;
 import org.apache.lucene.queryParser.core.QueryParserHelper;
 import org.apache.lucene.queryParser.core.config.QueryConfigHandler;
-import org.apache.lucene.queryParser.original.builders.OriginalQueryTreeBuilder;
-import org.apache.lucene.queryParser.original.config.AllowLeadingWildcardAttribute;
-import org.apache.lucene.queryParser.original.config.AnalyzerAttribute;
-import org.apache.lucene.queryParser.original.config.DateResolutionAttribute;
-import org.apache.lucene.queryParser.original.config.FieldDateResolutionMapAttribute;
-import org.apache.lucene.queryParser.original.config.DefaultOperatorAttribute;
-import org.apache.lucene.queryParser.original.config.DefaultPhraseSlopAttribute;
-import org.apache.lucene.queryParser.original.config.FieldBoostMapAttribute;
-import org.apache.lucene.queryParser.original.config.FuzzyAttribute;
-import org.apache.lucene.queryParser.original.config.LocaleAttribute;
-import org.apache.lucene.queryParser.original.config.LowercaseExpandedTermsAttribute;
-import org.apache.lucene.queryParser.original.config.MultiFieldAttribute;
-import org.apache.lucene.queryParser.original.config.MultiTermRewriteMethodAttribute;
-import org.apache.lucene.queryParser.original.config.OriginalQueryConfigHandler;
-import org.apache.lucene.queryParser.original.config.PositionIncrementsAttribute;
-import org.apache.lucene.queryParser.original.config.RangeCollatorAttribute;
-import org.apache.lucene.queryParser.original.config.DefaultOperatorAttribute.Operator;
-import org.apache.lucene.queryParser.original.nodes.RangeQueryNode;
-import org.apache.lucene.queryParser.original.parser.OriginalSyntaxParser;
-import org.apache.lucene.queryParser.original.processors.OriginalQueryNodeProcessorPipeline;
+import org.apache.lucene.queryParser.standard.builders.StandardQueryTreeBuilder;
+import org.apache.lucene.queryParser.standard.config.AllowLeadingWildcardAttribute;
+import org.apache.lucene.queryParser.standard.config.AnalyzerAttribute;
+import org.apache.lucene.queryParser.standard.config.DateResolutionAttribute;
+import org.apache.lucene.queryParser.standard.config.FieldDateResolutionMapAttribute;
+import org.apache.lucene.queryParser.standard.config.DefaultOperatorAttribute;
+import org.apache.lucene.queryParser.standard.config.DefaultPhraseSlopAttribute;
+import org.apache.lucene.queryParser.standard.config.FieldBoostMapAttribute;
+import org.apache.lucene.queryParser.standard.config.FuzzyAttribute;
+import org.apache.lucene.queryParser.standard.config.LocaleAttribute;
+import org.apache.lucene.queryParser.standard.config.LowercaseExpandedTermsAttribute;
+import org.apache.lucene.queryParser.standard.config.MultiFieldAttribute;
+import org.apache.lucene.queryParser.standard.config.MultiTermRewriteMethodAttribute;
+import org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler;
+import org.apache.lucene.queryParser.standard.config.PositionIncrementsAttribute;
+import org.apache.lucene.queryParser.standard.config.RangeCollatorAttribute;
+import org.apache.lucene.queryParser.standard.config.DefaultOperatorAttribute.Operator;
+import org.apache.lucene.queryParser.standard.nodes.RangeQueryNode;
+import org.apache.lucene.queryParser.standard.parser.StandardSyntaxParser;
+import org.apache.lucene.queryParser.standard.processors.StandardQueryNodeProcessorPipeline;
 import org.apache.lucene.search.FuzzyQuery;
 import org.apache.lucene.search.MultiTermQuery;
 import org.apache.lucene.search.Query;
@@ -60,15 +60,15 @@
  * To construct a Query object from a query string, use the
  * {@link #parse(String, String)} method:
  * <ul>
- * OriginalQueryParserHelper queryParserHelper = new OriginalQueryParserHelper(); <br/>
+ * StandardQueryParser queryParserHelper = new StandardQueryParser(); <br/>
  * Query query = queryParserHelper.parse("a AND b", "defaultField");
  * </ul>
  * <p>
  * To change any configuration before parsing the query string do, for example:
  * <p/>
  * <ul>
- * // the query config handler returned by {@link OriginalQueryParserHelper} is a
- * {@link OriginalQueryConfigHandler} <br/>
+ * // the query config handler returned by {@link StandardQueryParser} is a
+ * {@link StandardQueryConfigHandler} <br/>
  * queryParserHelper.getQueryConfigHandler().setAnalyzer(new
  * WhitespaceAnalyzer());
  * </ul>
@@ -105,53 +105,53 @@
  * </p>
  * </ul>
  * <p>
- * The text parser used by this helper is a {@link OriginalSyntaxParser}.
+ * The text parser used by this helper is a {@link StandardSyntaxParser}.
  * <p/>
  * <p>
  * The query node processor used by this helper is a
- * {@link OriginalQueryNodeProcessorPipeline}.
+ * {@link StandardQueryNodeProcessorPipeline}.
  * <p/>
  * <p>
- * The builder used by this helper is a {@link OriginalQueryTreeBuilder}.
+ * The builder used by this helper is a {@link StandardQueryTreeBuilder}.
  * <p/>
  * 
- * @see OriginalQueryParserHelper
- * @see OriginalQueryConfigHandler
- * @see OriginalSyntaxParser
- * @see OriginalQueryNodeProcessorPipeline
- * @see OriginalQueryTreeBuilder
+ * @see StandardQueryParser
+ * @see StandardQueryConfigHandler
+ * @see StandardSyntaxParser
+ * @see StandardQueryNodeProcessorPipeline
+ * @see StandardQueryTreeBuilder
  */
-public class OriginalQueryParserHelper extends QueryParserHelper {
+public class StandardQueryParser extends QueryParserHelper {
 
   /**
-   * Constructs a {@link OriginalQueryParserHelper} object.
+   * Constructs a {@link StandardQueryParser} object.
    */
-  public OriginalQueryParserHelper() {
-    super(new OriginalQueryConfigHandler(), new OriginalSyntaxParser(),
-        new OriginalQueryNodeProcessorPipeline(null),
-        new OriginalQueryTreeBuilder());
+  public StandardQueryParser() {
+    super(new StandardQueryConfigHandler(), new StandardSyntaxParser(),
+        new StandardQueryNodeProcessorPipeline(null),
+        new StandardQueryTreeBuilder());
   }
 
   /**
-   * Constructs a {@link OriginalQueryParserHelper} object and sets an
+   * Constructs a {@link StandardQueryParser} object and sets an
    * {@link Analyzer} to it. The same as:
    * 
    * <ul>
-   * OriginalQueryParserHelper qp = new OriginalQueryParserHelper();
+   * StandardQueryParser qp = new StandardQueryParser();
    * qp.getQueryConfigHandler().setAnalyzer(analyzer);
    * </ul>
    * 
    * @param analyzer
    *          the analyzer to be used by this query parser helper
    */
-  public OriginalQueryParserHelper(Analyzer analyzer) {
+  public StandardQueryParser(Analyzer analyzer) {
     this();
 
     this.setAnalyzer(analyzer);
   }
   
   public String toString(){
-    return "<OriginalQueryParserHelper config=\"" + this.getQueryConfigHandler() + "\"/>";
+    return "<StandardQueryParser config=\"" + this.getQueryConfigHandler() + "\"/>";
   }
 
   /**

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/AnyQueryNodeBuilder.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/AnyQueryNodeBuilder.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/AnyQueryNodeBuilder.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/AnyQueryNodeBuilder.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.builders;
+package org.apache.lucene.queryParser.standard.builders;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,7 +30,7 @@
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.BooleanQuery.TooManyClauses;
 
-public class AnyQueryNodeBuilder implements OriginalQueryBuilder {
+public class AnyQueryNodeBuilder implements StandardQueryBuilder {
 
   public AnyQueryNodeBuilder() {
     // empty constructor

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/BooleanQueryNodeBuilder.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/BooleanQueryNodeBuilder.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/BooleanQueryNodeBuilder.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/BooleanQueryNodeBuilder.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.builders;
+package org.apache.lucene.queryParser.standard.builders;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -26,7 +26,7 @@
 import org.apache.lucene.queryParser.core.nodes.BooleanQueryNode;
 import org.apache.lucene.queryParser.core.nodes.ModifierQueryNode;
 import org.apache.lucene.queryParser.core.nodes.QueryNode;
-import org.apache.lucene.queryParser.original.parser.EscapeQuerySyntaxImpl;
+import org.apache.lucene.queryParser.standard.parser.EscapeQuerySyntaxImpl;
 import org.apache.lucene.search.BooleanClause;
 import org.apache.lucene.search.BooleanQuery;
 import org.apache.lucene.search.Query;
@@ -41,7 +41,7 @@
  * It takes in consideration if the children is a {@link ModifierQueryNode} to
  * define the {@link BooleanClause}.
  */
-public class BooleanQueryNodeBuilder implements OriginalQueryBuilder {
+public class BooleanQueryNodeBuilder implements StandardQueryBuilder {
 
   public BooleanQueryNodeBuilder() {
     // empty constructor

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/BoostQueryNodeBuilder.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/BoostQueryNodeBuilder.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/BoostQueryNodeBuilder.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/BoostQueryNodeBuilder.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.builders;
+package org.apache.lucene.queryParser.standard.builders;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -29,7 +29,7 @@
  * {@link QueryTreeBuilder#QUERY_TREE_BUILDER_TAGID} and applies the boost value
  * defined in the {@link BoostQueryNode}.
  */
-public class BoostQueryNodeBuilder implements OriginalQueryBuilder {
+public class BoostQueryNodeBuilder implements StandardQueryBuilder {
 
   public BoostQueryNodeBuilder() {
     // empty constructor

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/FieldQueryNodeBuilder.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/FieldQueryNodeBuilder.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/FieldQueryNodeBuilder.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/FieldQueryNodeBuilder.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.builders;
+package org.apache.lucene.queryParser.standard.builders;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -26,7 +26,7 @@
 /**
  * Builds a {@link TermQuery} object from a {@link FieldQueryNode} object.
  */
-public class FieldQueryNodeBuilder implements OriginalQueryBuilder {
+public class FieldQueryNodeBuilder implements StandardQueryBuilder {
 
   public FieldQueryNodeBuilder() {
     // empty constructor

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/FuzzyQueryNodeBuilder.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/FuzzyQueryNodeBuilder.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/FuzzyQueryNodeBuilder.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/FuzzyQueryNodeBuilder.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.builders;
+package org.apache.lucene.queryParser.standard.builders;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -26,7 +26,7 @@
 /**
  * Builds a {@link FuzzyQuery} object from a {@link FuzzyQueryNode} object.
  */
-public class FuzzyQueryNodeBuilder implements OriginalQueryBuilder {
+public class FuzzyQueryNodeBuilder implements StandardQueryBuilder {
 
   public FuzzyQueryNodeBuilder() {
     // empty constructor

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/GroupQueryNodeBuilder.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/GroupQueryNodeBuilder.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/GroupQueryNodeBuilder.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/GroupQueryNodeBuilder.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.builders;
+package org.apache.lucene.queryParser.standard.builders;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,7 +28,7 @@
  * {@link GroupQueryNode} object using a
  * {@link QueryTreeBuilder#QUERY_TREE_BUILDER_TAGID} tag.
  */
-public class GroupQueryNodeBuilder implements OriginalQueryBuilder {
+public class GroupQueryNodeBuilder implements StandardQueryBuilder {
 
   public GroupQueryNodeBuilder() {
     // empty constructor

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/MatchAllDocsQueryNodeBuilder.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/MatchAllDocsQueryNodeBuilder.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/MatchAllDocsQueryNodeBuilder.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/MatchAllDocsQueryNodeBuilder.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.builders;
+package org.apache.lucene.queryParser.standard.builders;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -22,14 +22,14 @@
 import org.apache.lucene.queryParser.core.messages.QueryParserMessages;
 import org.apache.lucene.queryParser.core.nodes.MatchAllDocsQueryNode;
 import org.apache.lucene.queryParser.core.nodes.QueryNode;
-import org.apache.lucene.queryParser.original.parser.EscapeQuerySyntaxImpl;
+import org.apache.lucene.queryParser.standard.parser.EscapeQuerySyntaxImpl;
 import org.apache.lucene.search.MatchAllDocsQuery;
 
 /**
  * Builds a {@link MatchAllDocsQuery} object from a
  * {@link MatchAllDocsQueryNode} object.
  */
-public class MatchAllDocsQueryNodeBuilder implements OriginalQueryBuilder {
+public class MatchAllDocsQueryNodeBuilder implements StandardQueryBuilder {
 
   public MatchAllDocsQueryNodeBuilder() {
     // empty constructor

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/MatchNoDocsQueryNodeBuilder.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/MatchNoDocsQueryNodeBuilder.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/MatchNoDocsQueryNodeBuilder.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/MatchNoDocsQueryNodeBuilder.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.builders;
+package org.apache.lucene.queryParser.standard.builders;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -22,14 +22,14 @@
 import org.apache.lucene.queryParser.core.messages.QueryParserMessages;
 import org.apache.lucene.queryParser.core.nodes.MatchNoDocsQueryNode;
 import org.apache.lucene.queryParser.core.nodes.QueryNode;
-import org.apache.lucene.queryParser.original.parser.EscapeQuerySyntaxImpl;
+import org.apache.lucene.queryParser.standard.parser.EscapeQuerySyntaxImpl;
 import org.apache.lucene.search.BooleanQuery;
 
 /**
  * Builds an empty {@link BooleanQuery} object from a
  * {@link MatchNoDocsQueryNode} object.
  */
-public class MatchNoDocsQueryNodeBuilder implements OriginalQueryBuilder {
+public class MatchNoDocsQueryNodeBuilder implements StandardQueryBuilder {
 
   public MatchNoDocsQueryNodeBuilder() {
     // empty constructor

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/ModifierQueryNodeBuilder.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/ModifierQueryNodeBuilder.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/ModifierQueryNodeBuilder.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/ModifierQueryNodeBuilder.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.builders;
+package org.apache.lucene.queryParser.standard.builders;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,7 +28,7 @@
  * {@link ModifierQueryNode} object using a
  * {@link QueryTreeBuilder#QUERY_TREE_BUILDER_TAGID} tag.
  */
-public class ModifierQueryNodeBuilder implements OriginalQueryBuilder {
+public class ModifierQueryNodeBuilder implements StandardQueryBuilder {
 
   public ModifierQueryNodeBuilder() {
     // empty constructor

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/MultiPhraseQueryNodeBuilder.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/MultiPhraseQueryNodeBuilder.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/MultiPhraseQueryNodeBuilder.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/MultiPhraseQueryNodeBuilder.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.builders;
+package org.apache.lucene.queryParser.standard.builders;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -26,7 +26,7 @@
 import org.apache.lucene.queryParser.core.builders.QueryTreeBuilder;
 import org.apache.lucene.queryParser.core.nodes.FieldQueryNode;
 import org.apache.lucene.queryParser.core.nodes.QueryNode;
-import org.apache.lucene.queryParser.original.nodes.MultiPhraseQueryNode;
+import org.apache.lucene.queryParser.standard.nodes.MultiPhraseQueryNode;
 import org.apache.lucene.search.MultiPhraseQuery;
 import org.apache.lucene.search.TermQuery;
 
@@ -34,7 +34,7 @@
  * Builds a {@link MultiPhraseQuery} object from a {@link MultiPhraseQueryNode}
  * object.
  */
-public class MultiPhraseQueryNodeBuilder implements OriginalQueryBuilder {
+public class MultiPhraseQueryNodeBuilder implements StandardQueryBuilder {
 
   public MultiPhraseQueryNodeBuilder() {
     // empty constructor

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/PhraseQueryNodeBuilder.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/PhraseQueryNodeBuilder.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/PhraseQueryNodeBuilder.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/PhraseQueryNodeBuilder.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.builders;
+package org.apache.lucene.queryParser.standard.builders;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,7 +31,7 @@
  * Builds a {@link PhraseQuery} object from a {@link TokenizedPhraseQueryNode}
  * object.
  */
-public class PhraseQueryNodeBuilder implements OriginalQueryBuilder {
+public class PhraseQueryNodeBuilder implements StandardQueryBuilder {
 
   public PhraseQueryNodeBuilder() {
     // empty constructor

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/PrefixWildcardQueryNodeBuilder.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/PrefixWildcardQueryNodeBuilder.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/PrefixWildcardQueryNodeBuilder.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/PrefixWildcardQueryNodeBuilder.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.builders;
+package org.apache.lucene.queryParser.standard.builders;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -27,7 +27,7 @@
  * Builds a {@link PrefixQuery} object from a {@link PrefixWildcardQueryNode}
  * object.
  */
-public class PrefixWildcardQueryNodeBuilder implements OriginalQueryBuilder {
+public class PrefixWildcardQueryNodeBuilder implements StandardQueryBuilder {
 
   public PrefixWildcardQueryNodeBuilder() {
     // empty constructor

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/RangeQueryNodeBuilder.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/RangeQueryNodeBuilder.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/RangeQueryNodeBuilder.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/RangeQueryNodeBuilder.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.builders;
+package org.apache.lucene.queryParser.standard.builders;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -21,13 +21,13 @@
 import org.apache.lucene.queryParser.core.nodes.ParametricQueryNode;
 import org.apache.lucene.queryParser.core.nodes.QueryNode;
 import org.apache.lucene.queryParser.core.nodes.ParametricQueryNode.CompareOperator;
-import org.apache.lucene.queryParser.original.nodes.RangeQueryNode;
+import org.apache.lucene.queryParser.standard.nodes.RangeQueryNode;
 import org.apache.lucene.search.TermRangeQuery;
 
 /**
  * Builds a {@link TermRangeQuery} object from a {@link RangeQueryNode} object.
  */
-public class RangeQueryNodeBuilder implements OriginalQueryBuilder {
+public class RangeQueryNodeBuilder implements StandardQueryBuilder {
 
   public RangeQueryNodeBuilder() {
     // empty constructor

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/SlopQueryNodeBuilder.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/SlopQueryNodeBuilder.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/SlopQueryNodeBuilder.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/SlopQueryNodeBuilder.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.builders;
+package org.apache.lucene.queryParser.standard.builders;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,7 +31,7 @@
  * {@link QueryTreeBuilder#QUERY_TREE_BUILDER_TAGID} and applies the slop value
  * defined in the {@link SlopQueryNode}.
  */
-public class SlopQueryNodeBuilder implements OriginalQueryBuilder {
+public class SlopQueryNodeBuilder implements StandardQueryBuilder {
 
   public SlopQueryNodeBuilder() {
     // empty constructor

Copied: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/StandardBooleanQueryNodeBuilder.java (from r801557, lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/builders/OriginalBooleanQueryNodeBuilder.java)
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/StandardBooleanQueryNodeBuilder.java?p2=lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/StandardBooleanQueryNodeBuilder.java&p1=lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/builders/OriginalBooleanQueryNodeBuilder.java&r1=801557&r2=801934&rev=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/builders/OriginalBooleanQueryNodeBuilder.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/StandardBooleanQueryNodeBuilder.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.builders;
+package org.apache.lucene.queryParser.standard.builders;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -26,8 +26,8 @@
 import org.apache.lucene.queryParser.core.nodes.ModifierQueryNode;
 import org.apache.lucene.queryParser.core.nodes.QueryNode;
 import org.apache.lucene.queryParser.core.nodes.ModifierQueryNode.Modifier;
-import org.apache.lucene.queryParser.original.nodes.OriginalBooleanQueryNode;
-import org.apache.lucene.queryParser.original.parser.EscapeQuerySyntaxImpl;
+import org.apache.lucene.queryParser.standard.nodes.StandardBooleanQueryNode;
+import org.apache.lucene.queryParser.standard.parser.EscapeQuerySyntaxImpl;
 import org.apache.lucene.search.BooleanClause;
 import org.apache.lucene.search.BooleanQuery;
 import org.apache.lucene.search.Query;
@@ -43,14 +43,14 @@
  * @see BooleanQuery
  * @see Similarity#coord(int, int)
  */
-public class OriginalBooleanQueryNodeBuilder implements OriginalQueryBuilder {
+public class StandardBooleanQueryNodeBuilder implements StandardQueryBuilder {
 
-  public OriginalBooleanQueryNodeBuilder() {
+  public StandardBooleanQueryNodeBuilder() {
     // empty constructor
   }
 
   public BooleanQuery build(QueryNode queryNode) throws QueryNodeException {
-    OriginalBooleanQueryNode booleanNode = (OriginalBooleanQueryNode) queryNode;
+    StandardBooleanQueryNode booleanNode = (StandardBooleanQueryNode) queryNode;
 
     BooleanQuery bQuery = new BooleanQuery(booleanNode.isDisableCoord());
     List<QueryNode> children = booleanNode.getChildren();

Copied: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/StandardQueryBuilder.java (from r801557, lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/builders/OriginalQueryBuilder.java)
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/StandardQueryBuilder.java?p2=lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/StandardQueryBuilder.java&p1=lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/builders/OriginalQueryBuilder.java&r1=801557&r2=801934&rev=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/builders/OriginalQueryBuilder.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/StandardQueryBuilder.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.builders;
+package org.apache.lucene.queryParser.standard.builders;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,7 +30,7 @@
  * @see QueryBuilder
  * @see QueryTreeBuilder
  */
-public interface OriginalQueryBuilder extends QueryBuilder {
+public interface StandardQueryBuilder extends QueryBuilder {
 
   public Query build(QueryNode queryNode) throws QueryNodeException;
 

Copied: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/StandardQueryTreeBuilder.java (from r801557, lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/builders/OriginalQueryTreeBuilder.java)
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/StandardQueryTreeBuilder.java?p2=lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/StandardQueryTreeBuilder.java&p1=lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/builders/OriginalQueryTreeBuilder.java&r1=801557&r2=801934&rev=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/builders/OriginalQueryTreeBuilder.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/StandardQueryTreeBuilder.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.builders;
+package org.apache.lucene.queryParser.standard.builders;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,25 +32,25 @@
 import org.apache.lucene.queryParser.core.nodes.SlopQueryNode;
 import org.apache.lucene.queryParser.core.nodes.TokenizedPhraseQueryNode;
 import org.apache.lucene.queryParser.core.nodes.WildcardQueryNode;
-import org.apache.lucene.queryParser.original.nodes.OriginalBooleanQueryNode;
-import org.apache.lucene.queryParser.original.nodes.MultiPhraseQueryNode;
-import org.apache.lucene.queryParser.original.nodes.RangeQueryNode;
-import org.apache.lucene.queryParser.original.processors.OriginalQueryNodeProcessorPipeline;
+import org.apache.lucene.queryParser.standard.nodes.StandardBooleanQueryNode;
+import org.apache.lucene.queryParser.standard.nodes.MultiPhraseQueryNode;
+import org.apache.lucene.queryParser.standard.nodes.RangeQueryNode;
+import org.apache.lucene.queryParser.standard.processors.StandardQueryNodeProcessorPipeline;
 import org.apache.lucene.search.Query;
 
 /**
  * This query tree builder only defines the necessary map to build a
  * {@link Query} tree object. It should be used to generate a {@link Query} tree
  * object from a query node tree processed by a
- * {@link OriginalQueryNodeProcessorPipeline}. <br/>
+ * {@link StandardQueryNodeProcessorPipeline}. <br/>
  * 
  * @see QueryTreeBuilder
- * @see OriginalQueryNodeProcessorPipeline
+ * @see StandardQueryNodeProcessorPipeline
  */
-public class OriginalQueryTreeBuilder extends QueryTreeBuilder implements
-    OriginalQueryBuilder {
+public class StandardQueryTreeBuilder extends QueryTreeBuilder implements
+    StandardQueryBuilder {
 
-  public OriginalQueryTreeBuilder() {
+  public StandardQueryTreeBuilder() {
     setBuilder(GroupQueryNode.class, new GroupQueryNodeBuilder());
     setBuilder(FieldQueryNode.class, new FieldQueryNodeBuilder());
     setBuilder(BooleanQueryNode.class, new BooleanQueryNodeBuilder());
@@ -64,8 +64,8 @@
         new PrefixWildcardQueryNodeBuilder());
     setBuilder(RangeQueryNode.class, new RangeQueryNodeBuilder());
     setBuilder(SlopQueryNode.class, new SlopQueryNodeBuilder());
-    setBuilder(OriginalBooleanQueryNode.class,
-        new OriginalBooleanQueryNodeBuilder());
+    setBuilder(StandardBooleanQueryNode.class,
+        new StandardBooleanQueryNodeBuilder());
     setBuilder(MultiPhraseQueryNode.class, new MultiPhraseQueryNodeBuilder());
     setBuilder(MatchAllDocsQueryNode.class, new MatchAllDocsQueryNodeBuilder());
 

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/WildcardQueryNodeBuilder.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/WildcardQueryNodeBuilder.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/WildcardQueryNodeBuilder.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/WildcardQueryNodeBuilder.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.builders;
+package org.apache.lucene.queryParser.standard.builders;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -27,7 +27,7 @@
  * Builds a {@link WildcardQuery} object from a {@link WildcardQueryNode}
  * object.
  */
-public class WildcardQueryNodeBuilder implements OriginalQueryBuilder {
+public class WildcardQueryNodeBuilder implements StandardQueryBuilder {
 
   public WildcardQueryNodeBuilder() {
     // empty constructor

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/package.html
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/package.html?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/package.html (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/package.html Fri Aug  7 10:24:28 2009
@@ -21,14 +21,14 @@
 </head>
 <body>
 
-<h2>Original Lucene Query Node Builders</h2>
+<h2>Standard Lucene Query Node Builders</h2>
 <p>
-The package org.apache.lucene.queryParser.original.builders contains all the builders needed
+The package org.apache.lucene.queryParser.standard.builders contains all the builders needed
 to build a Lucene Query object from a query node tree. These builders expect the query node tree was
-already processed by the {@link org.apache.lucene.queryParser.original.processors.OriginalQueryNodeProcessorPipeline}.
+already processed by the {@link org.apache.lucene.queryParser.standard.processors.StandardQueryNodeProcessorPipeline}.
 </p>
 <p>
-{@link org.apache.lucene.queryParser.original.builders.OriginalQueryTreeBuilder} is a builder that already contains a defined map that maps each QueryNode object
+{@link org.apache.lucene.queryParser.standard.builders.StandardQueryTreeBuilder} is a builder that already contains a defined map that maps each QueryNode object
 with its respective builder.
 </p>
 </body>

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/AllowLeadingWildcardAttribute.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/AllowLeadingWildcardAttribute.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/AllowLeadingWildcardAttribute.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/AllowLeadingWildcardAttribute.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.config;
+package org.apache.lucene.queryParser.standard.config;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,7 +18,7 @@
  */
 
 import org.apache.lucene.queryParser.core.config.QueryConfigHandler;
-import org.apache.lucene.queryParser.original.processors.AllowLeadingWildcardProcessor;
+import org.apache.lucene.queryParser.standard.processors.AllowLeadingWildcardProcessor;
 import org.apache.lucene.util.Attribute;
 
 /**

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/AllowLeadingWildcardAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/AllowLeadingWildcardAttributeImpl.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/AllowLeadingWildcardAttributeImpl.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/AllowLeadingWildcardAttributeImpl.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.config;
+package org.apache.lucene.queryParser.standard.config;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,7 +18,7 @@
  */
 
 import org.apache.lucene.queryParser.core.config.QueryConfigHandler;
-import org.apache.lucene.queryParser.original.processors.AllowLeadingWildcardProcessor;
+import org.apache.lucene.queryParser.standard.processors.AllowLeadingWildcardProcessor;
 import org.apache.lucene.util.AttributeImpl;
 
 /**
@@ -26,7 +26,7 @@
  * must be defined in the {@link QueryConfigHandler}. It basically tells the
  * processor if it should allow leading wildcard. <br/>
  * 
- * @see org.apache.lucene.queryParser.original.config.AllowLeadingWildcardAttribute
+ * @see org.apache.lucene.queryParser.standard.config.AllowLeadingWildcardAttribute
  */
 public class AllowLeadingWildcardAttributeImpl extends AttributeImpl 
 				implements AllowLeadingWildcardAttribute {

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/AnalyzerAttribute.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/AnalyzerAttribute.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/AnalyzerAttribute.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/AnalyzerAttribute.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.config;
+package org.apache.lucene.queryParser.standard.config;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -19,7 +19,7 @@
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.queryParser.core.config.QueryConfigHandler;
-import org.apache.lucene.queryParser.original.processors.AnalyzerQueryNodeProcessor;
+import org.apache.lucene.queryParser.standard.processors.AnalyzerQueryNodeProcessor;
 import org.apache.lucene.util.Attribute;
 
 /**

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/AnalyzerAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/AnalyzerAttributeImpl.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/AnalyzerAttributeImpl.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/AnalyzerAttributeImpl.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.config;
+package org.apache.lucene.queryParser.standard.config;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -19,7 +19,7 @@
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.queryParser.core.config.QueryConfigHandler;
-import org.apache.lucene.queryParser.original.processors.AnalyzerQueryNodeProcessor;
+import org.apache.lucene.queryParser.standard.processors.AnalyzerQueryNodeProcessor;
 import org.apache.lucene.util.AttributeImpl;
 
 /**
@@ -28,7 +28,7 @@
  * processor the {@link Analyzer}, if there is one, which will be used to
  * analyze the query terms. <br/>
  * 
- * @see org.apache.lucene.queryParser.original.config.AnalyzerAttribute
+ * @see org.apache.lucene.queryParser.standard.config.AnalyzerAttribute
  */
 public class AnalyzerAttributeImpl extends AttributeImpl 
 				implements AnalyzerAttribute {

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/BoostAttribute.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/BoostAttribute.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/BoostAttribute.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/BoostAttribute.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.config;
+package org.apache.lucene.queryParser.standard.config;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,7 +18,7 @@
  */
 
 import org.apache.lucene.queryParser.core.config.FieldConfig;
-import org.apache.lucene.queryParser.original.processors.MultiFieldQueryNodeProcessor;
+import org.apache.lucene.queryParser.standard.processors.MultiFieldQueryNodeProcessor;
 import org.apache.lucene.util.Attribute;
 
 /**

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/BoostAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/BoostAttributeImpl.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/BoostAttributeImpl.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/BoostAttributeImpl.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.config;
+package org.apache.lucene.queryParser.standard.config;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,7 +18,7 @@
  */
 
 import org.apache.lucene.queryParser.core.config.FieldConfig;
-import org.apache.lucene.queryParser.original.processors.MultiFieldQueryNodeProcessor;
+import org.apache.lucene.queryParser.standard.processors.MultiFieldQueryNodeProcessor;
 import org.apache.lucene.util.AttributeImpl;
 
 /**
@@ -28,7 +28,7 @@
  * defined to it. <br/>
  * <br/>
  * 
- * @see org.apache.lucene.queryParser.original.config.BoostAttribute
+ * @see org.apache.lucene.queryParser.standard.config.BoostAttribute
  */
 public class BoostAttributeImpl extends AttributeImpl 
 				implements BoostAttribute {

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DateResolutionAttribute.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DateResolutionAttribute.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DateResolutionAttribute.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DateResolutionAttribute.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.config;
+package org.apache.lucene.queryParser.standard.config;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,8 +20,8 @@
 import org.apache.lucene.document.DateTools;
 import org.apache.lucene.document.DateTools.Resolution;
 import org.apache.lucene.queryParser.core.config.QueryConfigHandler;
-import org.apache.lucene.queryParser.original.nodes.RangeQueryNode;
-import org.apache.lucene.queryParser.original.processors.ParametricRangeQueryNodeProcessor;
+import org.apache.lucene.queryParser.standard.nodes.RangeQueryNode;
+import org.apache.lucene.queryParser.standard.processors.ParametricRangeQueryNodeProcessor;
 import org.apache.lucene.util.Attribute;
 
 /**



Mime
View raw message