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 [3/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
Copied: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/StandardQueryNodeProcessorPipeline.java
(from r801557, lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/processors/OriginalQueryNodeProcessorPipeline.java)
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/StandardQueryNodeProcessorPipeline.java?p2=lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/StandardQueryNodeProcessorPipeline.java&p1=lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/processors/OriginalQueryNodeProcessorPipeline.java&r1=801557&r2=801934&rev=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/processors/OriginalQueryNodeProcessorPipeline.java
(original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/StandardQueryNodeProcessorPipeline.java
Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.processors;
+package org.apache.lucene.queryParser.standard.processors;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -21,31 +21,31 @@
 import org.apache.lucene.queryParser.core.processors.NoChildOptimizationQueryNodeProcessor;
 import org.apache.lucene.queryParser.core.processors.QueryNodeProcessorPipeline;
 import org.apache.lucene.queryParser.core.processors.RemoveDeletedQueryNodesProcessor;
-import org.apache.lucene.queryParser.original.builders.OriginalQueryTreeBuilder;
-import org.apache.lucene.queryParser.original.config.OriginalQueryConfigHandler;
-import org.apache.lucene.queryParser.original.parser.OriginalSyntaxParser;
+import org.apache.lucene.queryParser.standard.builders.StandardQueryTreeBuilder;
+import org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler;
+import org.apache.lucene.queryParser.standard.parser.StandardSyntaxParser;
 import org.apache.lucene.search.Query;
 
 /**
  * This pipeline has all the processors needed to process a query node tree,
- * generated by {@link OriginalSyntaxParser}, already assembled. <br/>
+ * generated by {@link StandardSyntaxParser}, already assembled. <br/>
  * <br/>
  * The order they are assembled affects the results. <br/>
  * <br/>
  * This processor pipeline was designed to work with
- * {@link OriginalQueryConfigHandler}. <br/>
+ * {@link StandardQueryConfigHandler}. <br/>
  * <br/>
  * The result query node tree can be used to build a {@link Query} object using
- * {@link OriginalQueryTreeBuilder}. <br/>
+ * {@link StandardQueryTreeBuilder}. <br/>
  * 
- * @see OriginalQueryTreeBuilder
- * @see OriginalQueryConfigHandler
- * @see OriginalSyntaxParser
+ * @see StandardQueryTreeBuilder
+ * @see StandardQueryConfigHandler
+ * @see StandardSyntaxParser
  */
-public class OriginalQueryNodeProcessorPipeline extends
+public class StandardQueryNodeProcessorPipeline extends
     QueryNodeProcessorPipeline {
 
-  public OriginalQueryNodeProcessorPipeline(QueryConfigHandler queryConfig) {
+  public StandardQueryNodeProcessorPipeline(QueryConfigHandler queryConfig) {
     super(queryConfig);
 
     addProcessor(new MultiFieldQueryNodeProcessor());

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/package.html
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/package.html?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/package.html
(original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/package.html
Fri Aug  7 10:24:28 2009
@@ -23,11 +23,11 @@
 
 <h2>Lucene Query Node Processors</h2>
 <p>
-The package org.apache.lucene.queryParser.original.processors contains every processor needed
to assembly a pipeline
+The package org.apache.lucene.queryParser.standard.processors contains every processor needed
to assembly a pipeline
 that modifies the query node tree according to the actual Lucene queries.
 </p>
 <p>
-This processors are already assembled correctly in the OriginalQueryNodeProcessorPipeline.

+This processors are already assembled correctly in the StandardQueryNodeProcessorPipeline.

 </p>
 </body>
 </html>

Modified: lucene/java/trunk/contrib/queryparser/src/java/overview.html
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/overview.html?rev=801934&r1=801933&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/overview.html (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/overview.html Fri Aug  7 10:24:28 2009
@@ -31,7 +31,7 @@
 <ul>
 <li>{@link org.apache.lucene.messages}: it contains the API to defined lazily loaded
messages. This message API is used by the new query parser to support localized messages.</li>
 <li>{@link org.apache.lucene.queryParser.core}: it contains the query parser API classes,
which should be extended by query parser implementations. </li>
-<li>{@link org.apache.lucene.queryParser.original}: it contains the current Lucene
query parser implementation using the new query parser API.</li>
+<li>{@link org.apache.lucene.queryParser.standard}: it contains the current Lucene
query parser implementation using the new query parser API.</li>
 </ul>
 </p>
 

Modified: lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/SpanOrQueryNodeBuilder.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/SpanOrQueryNodeBuilder.java?rev=801934&r1=801933&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/SpanOrQueryNodeBuilder.java
(original)
+++ lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/SpanOrQueryNodeBuilder.java
Fri Aug  7 10:24:28 2009
@@ -23,7 +23,7 @@
 import org.apache.lucene.queryParser.core.builders.QueryTreeBuilder;
 import org.apache.lucene.queryParser.core.nodes.BooleanQueryNode;
 import org.apache.lucene.queryParser.core.nodes.QueryNode;
-import org.apache.lucene.queryParser.original.builders.OriginalQueryBuilder;
+import org.apache.lucene.queryParser.standard.builders.StandardQueryBuilder;
 import org.apache.lucene.search.spans.SpanOrQuery;
 import org.apache.lucene.search.spans.SpanQuery;
 
@@ -33,7 +33,7 @@
  * 
  * It assumes that the {@link BooleanQueryNode} instance has at least one child.
  */
-public class SpanOrQueryNodeBuilder implements OriginalQueryBuilder {
+public class SpanOrQueryNodeBuilder implements StandardQueryBuilder {
 
   public SpanOrQuery build(QueryNode node) throws QueryNodeException {
 

Modified: lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/SpanTermQueryNodeBuilder.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/SpanTermQueryNodeBuilder.java?rev=801934&r1=801933&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/SpanTermQueryNodeBuilder.java
(original)
+++ lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/SpanTermQueryNodeBuilder.java
Fri Aug  7 10:24:28 2009
@@ -21,14 +21,14 @@
 import org.apache.lucene.queryParser.core.QueryNodeException;
 import org.apache.lucene.queryParser.core.nodes.FieldQueryNode;
 import org.apache.lucene.queryParser.core.nodes.QueryNode;
-import org.apache.lucene.queryParser.original.builders.OriginalQueryBuilder;
+import org.apache.lucene.queryParser.standard.builders.StandardQueryBuilder;
 import org.apache.lucene.search.spans.SpanTermQuery;
 
 /**
  * This builder creates {@link SpanTermQuery}s from a {@link FieldQueryNode}
  * object.
  */
-public class SpanTermQueryNodeBuilder implements OriginalQueryBuilder {
+public class SpanTermQueryNodeBuilder implements StandardQueryBuilder {
 
   public SpanTermQuery build(QueryNode node) throws QueryNodeException {
     FieldQueryNode fieldQueryNode = (FieldQueryNode) node;

Modified: lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/SpansQueryTreeBuilder.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/SpansQueryTreeBuilder.java?rev=801934&r1=801933&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/SpansQueryTreeBuilder.java
(original)
+++ lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/SpansQueryTreeBuilder.java
Fri Aug  7 10:24:28 2009
@@ -22,7 +22,7 @@
 import org.apache.lucene.queryParser.core.nodes.BooleanQueryNode;
 import org.apache.lucene.queryParser.core.nodes.FieldQueryNode;
 import org.apache.lucene.queryParser.core.nodes.QueryNode;
-import org.apache.lucene.queryParser.original.builders.OriginalQueryBuilder;
+import org.apache.lucene.queryParser.standard.builders.StandardQueryBuilder;
 import org.apache.lucene.search.spans.SpanQuery;
 
 /**
@@ -36,7 +36,7 @@
  * 
  */
 public class SpansQueryTreeBuilder extends QueryTreeBuilder implements
-    OriginalQueryBuilder {
+    StandardQueryBuilder {
 
   public SpansQueryTreeBuilder() {
     setBuilder(BooleanQueryNode.class, new SpanOrQueryNodeBuilder());

Modified: lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/TestSpanQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/TestSpanQueryParser.java?rev=801934&r1=801933&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/TestSpanQueryParser.java
(original)
+++ lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/TestSpanQueryParser.java
Fri Aug  7 10:24:28 2009
@@ -26,7 +26,7 @@
 import org.apache.lucene.queryParser.core.nodes.QueryNode;
 import org.apache.lucene.queryParser.core.parser.SyntaxParser;
 import org.apache.lucene.queryParser.core.processors.QueryNodeProcessorPipeline;
-import org.apache.lucene.queryParser.original.parser.OriginalSyntaxParser;
+import org.apache.lucene.queryParser.standard.parser.StandardSyntaxParser;
 import org.apache.lucene.search.spans.SpanOrQuery;
 import org.apache.lucene.search.spans.SpanQuery;
 import org.apache.lucene.search.spans.SpanTermQuery;
@@ -37,7 +37,7 @@
  * 
  * It tests queries likes "term", "field:term" "term1 term2" "term1 OR term2",
  * which are all already supported by the current syntax parser (
- * {@link OriginalSyntaxParser}).<br/>
+ * {@link StandardSyntaxParser}).<br/>
  * <br/>
  * 
  * The goals is to create a new query parser that supports only the pair
@@ -57,7 +57,7 @@
  * <br/>
  * 
  * The parsing phase, as already mentioned will be performed by the current
- * query parser: {@link OriginalSyntaxParser}.<br/>
+ * query parser: {@link StandardSyntaxParser}.<br/>
  * <br/>
  * 
  * The processing phase will be performed by a processor pipeline which is
@@ -88,7 +88,7 @@
  * @see SpansValidatorQueryNodeProcessor
  * @see SpanOrQueryNodeBuilder
  * @see SpanTermQueryNodeBuilder
- * @see OriginalSyntaxParser
+ * @see StandardSyntaxParser
  * @see UniqueFieldQueryNodeProcessor
  * @see UniqueFieldAttribute
  */
@@ -100,7 +100,7 @@
 
   private SpansQueryTreeBuilder spansQueryTreeBuilder;
 
-  private SyntaxParser queryParser = new OriginalSyntaxParser();
+  private SyntaxParser queryParser = new StandardSyntaxParser();
 
   public TestSpanQueryParser() {
     // empty constructor

Modified: lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/TestSpanQueryParserSimpleSample.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/TestSpanQueryParserSimpleSample.java?rev=801934&r1=801933&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/TestSpanQueryParserSimpleSample.java
(original)
+++ lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/TestSpanQueryParserSimpleSample.java
Fri Aug  7 10:24:28 2009
@@ -26,7 +26,7 @@
 import org.apache.lucene.queryParser.core.nodes.QueryNode;
 import org.apache.lucene.queryParser.core.parser.SyntaxParser;
 import org.apache.lucene.queryParser.core.processors.QueryNodeProcessorPipeline;
-import org.apache.lucene.queryParser.original.parser.OriginalSyntaxParser;
+import org.apache.lucene.queryParser.standard.parser.StandardSyntaxParser;
 import org.apache.lucene.search.spans.SpanQuery;
 import org.apache.lucene.search.spans.SpanTermQuery;
 
@@ -36,7 +36,7 @@
  * 
  * It tests queries likes "term", "field:term" "term1 term2" "term1 OR term2",
  * which are all already supported by the current syntax parser (
- * {@link OriginalSyntaxParser}).<br/>
+ * {@link StandardSyntaxParser}).<br/>
  * <br/>
  * 
  * The goals is to create a new query parser that supports only the pair
@@ -56,7 +56,7 @@
  * <br/>
  * 
  * The parsing phase, as already mentioned will be performed by the current
- * query parser: {@link OriginalSyntaxParser}.<br/>
+ * query parser: {@link StandardSyntaxParser}.<br/>
  * <br/>
  * 
  * The processing phase will be performed by a processor pipeline which is
@@ -89,7 +89,7 @@
  * @see SpansValidatorQueryNodeProcessor
  * @see SpanOrQueryNodeBuilder
  * @see SpanTermQueryNodeBuilder
- * @see OriginalSyntaxParser
+ * @see StandardSyntaxParser
  * @see UniqueFieldQueryNodeProcessor
  * @see UniqueFieldAttribute
  * 
@@ -111,7 +111,7 @@
   }
 
   public void testBasicDemo() throws Exception {
-    SyntaxParser queryParser = new OriginalSyntaxParser();
+    SyntaxParser queryParser = new StandardSyntaxParser();
 
     // convert the CharSequence into a QueryNode tree
     QueryNode queryTree = queryParser.parse("body:text", null);

Modified: lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiAnalyzerQPHelper.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiAnalyzerQPHelper.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiAnalyzerQPHelper.java
(original)
+++ lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiAnalyzerQPHelper.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
@@ -31,8 +31,8 @@
 import org.apache.lucene.analysis.tokenattributes.TermAttribute;
 import org.apache.lucene.analysis.tokenattributes.TypeAttribute;
 import org.apache.lucene.queryParser.core.QueryNodeException;
-import org.apache.lucene.queryParser.original.OriginalQueryParserHelper;
-import org.apache.lucene.queryParser.original.config.DefaultOperatorAttribute.Operator;
+import org.apache.lucene.queryParser.standard.StandardQueryParser;
+import org.apache.lucene.queryParser.standard.config.DefaultOperatorAttribute.Operator;
 import org.apache.lucene.util.LuceneTestCase;
 
 /**
@@ -48,7 +48,7 @@
 
   public void testMultiAnalyzer() throws QueryNodeException {
 
-    OriginalQueryParserHelper qp = new OriginalQueryParserHelper();
+    StandardQueryParser qp = new StandardQueryParser();
     qp.setAnalyzer(new MultiAnalyzer());
 
     // trivial, no multiple tokens:
@@ -132,7 +132,7 @@
   // }
 
   public void testPosIncrementAnalyzer() throws QueryNodeException {
-    OriginalQueryParserHelper qp = new OriginalQueryParserHelper();
+    StandardQueryParser qp = new StandardQueryParser();
     qp.setAnalyzer(new PosIncrementAnalyzer());
 
     assertEquals("quick brown", qp.parse("the quick brown", "").toString());

Modified: lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiAnalyzerWrapper.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiAnalyzerWrapper.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiAnalyzerWrapper.java
(original)
+++ lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiAnalyzerWrapper.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
@@ -31,7 +31,7 @@
 import org.apache.lucene.analysis.tokenattributes.TermAttribute;
 import org.apache.lucene.analysis.tokenattributes.TypeAttribute;
 import org.apache.lucene.queryParser.ParseException;
-import org.apache.lucene.queryParser.original.QueryParserWrapper;
+import org.apache.lucene.queryParser.standard.QueryParserWrapper;
 import org.apache.lucene.util.LuceneTestCase;
 
 /**

Modified: lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQPHelper.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQPHelper.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQPHelper.java
(original)
+++ lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQPHelper.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
@@ -29,8 +29,8 @@
 import org.apache.lucene.document.Field;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.queryParser.core.QueryNodeException;
-import org.apache.lucene.queryParser.original.config.OriginalQueryConfigHandler;
-import org.apache.lucene.queryParser.original.config.DefaultOperatorAttribute.Operator;
+import org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler;
+import org.apache.lucene.queryParser.standard.config.DefaultOperatorAttribute.Operator;
 import org.apache.lucene.search.BooleanClause;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.Query;
@@ -68,7 +68,7 @@
     String[] fields = { "b", "t" };
     Occur occur[] = { Occur.SHOULD, Occur.SHOULD };
     TestQPHelper.QPTestAnalyzer a = new TestQPHelper.QPTestAnalyzer();
-    OriginalQueryParserHelper mfqp = new OriginalQueryParserHelper();
+    StandardQueryParser mfqp = new StandardQueryParser();
     mfqp.setMultiFields(fields);
     mfqp.setAnalyzer(a);
 
@@ -81,7 +81,7 @@
 
   public void testSimple() throws Exception {
     String[] fields = { "b", "t" };
-    OriginalQueryParserHelper mfqp = new OriginalQueryParserHelper();
+    StandardQueryParser mfqp = new StandardQueryParser();
     mfqp.setMultiFields(fields);
     mfqp.setAnalyzer(new StandardAnalyzer());
 
@@ -150,7 +150,7 @@
     boosts.put("b", new Float(5));
     boosts.put("t", new Float(10));
     String[] fields = { "b", "t" };
-    OriginalQueryParserHelper mfqp = new OriginalQueryParserHelper();
+    StandardQueryParser mfqp = new StandardQueryParser();
     mfqp.setMultiFields(fields);
     mfqp.setFieldsBoost(boosts);
     mfqp.setAnalyzer(new StandardAnalyzer());
@@ -241,7 +241,7 @@
     String[] fields = { "b", "t" };
     BooleanClause.Occur[] flags = { BooleanClause.Occur.MUST,
         BooleanClause.Occur.MUST_NOT };
-    OriginalQueryParserHelper parser = new OriginalQueryParserHelper();
+    StandardQueryParser parser = new StandardQueryParser();
     parser.setMultiFields(fields);
     parser.setAnalyzer(new StandardAnalyzer());
 
@@ -302,7 +302,7 @@
 
   public void testAnalyzerReturningNull() throws QueryNodeException {
     String[] fields = new String[] { "f1", "f2", "f3" };
-    OriginalQueryParserHelper parser = new OriginalQueryParserHelper();
+    StandardQueryParser parser = new StandardQueryParser();
     parser.setMultiFields(fields);
     parser.setAnalyzer(new AnalyzerReturningNull());
 
@@ -329,7 +329,7 @@
     iw.addDocument(doc);
     iw.close();
 
-    OriginalQueryParserHelper mfqp = new OriginalQueryParserHelper();
+    StandardQueryParser mfqp = new StandardQueryParser();
 
     mfqp.setMultiFields(new String[] { "body" });
     mfqp.setAnalyzer(analyzer);

Modified: lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQueryParserWrapper.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQueryParserWrapper.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQueryParserWrapper.java
(original)
+++ lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQueryParserWrapper.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
@@ -29,8 +29,8 @@
 import org.apache.lucene.document.Field;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.queryParser.ParseException;
-import org.apache.lucene.queryParser.original.MultiFieldQueryParserWrapper;
-import org.apache.lucene.queryParser.original.QueryParserWrapper;
+import org.apache.lucene.queryParser.standard.MultiFieldQueryParserWrapper;
+import org.apache.lucene.queryParser.standard.QueryParserWrapper;
 import org.apache.lucene.search.BooleanClause;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.Query;

Modified: lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQPHelper.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQPHelper.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQPHelper.java
(original)
+++ lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQPHelper.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
@@ -55,8 +55,8 @@
 import org.apache.lucene.queryParser.core.nodes.WildcardQueryNode;
 import org.apache.lucene.queryParser.core.processors.QueryNodeProcessorImpl;
 import org.apache.lucene.queryParser.core.processors.QueryNodeProcessorPipeline;
-import org.apache.lucene.queryParser.original.config.OriginalQueryConfigHandler;
-import org.apache.lucene.queryParser.original.config.DefaultOperatorAttribute.Operator;
+import org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler;
+import org.apache.lucene.queryParser.standard.config.DefaultOperatorAttribute.Operator;
 import org.apache.lucene.search.BooleanQuery;
 import org.apache.lucene.search.FuzzyQuery;
 import org.apache.lucene.search.IndexSearcher;
@@ -156,7 +156,7 @@
     }
   }
 
-  public static class QPTestParser extends OriginalQueryParserHelper {
+  public static class QPTestParser extends StandardQueryParser {
     public QPTestParser(Analyzer a) {
       ((QueryNodeProcessorPipeline)getQueryNodeProcessor())
           .addProcessor(new QPTestParserQueryNodeProcessor());
@@ -206,10 +206,10 @@
     originalMaxClauses = BooleanQuery.getMaxClauseCount();
   }
 
-  public OriginalQueryParserHelper getParser(Analyzer a) throws Exception {
+  public StandardQueryParser getParser(Analyzer a) throws Exception {
     if (a == null)
       a = new SimpleAnalyzer();
-    OriginalQueryParserHelper qp = new OriginalQueryParserHelper();
+    StandardQueryParser qp = new StandardQueryParser();
     qp.setAnalyzer(a);
 
     qp.setDefaultOperator(Operator.OR);
@@ -232,7 +232,7 @@
     }
   }
 
-  public void assertQueryEquals(OriginalQueryParserHelper qp, String field,
+  public void assertQueryEquals(StandardQueryParser qp, String field,
       String query, String result) throws Exception {
     Query q = qp.parse(query, field);
     String s = q.toString(field);
@@ -253,7 +253,7 @@
 
   public void assertWildcardQueryEquals(String query, boolean lowercase,
       String result, boolean allowLeadingWildcard) throws Exception {
-    OriginalQueryParserHelper qp = getParser(null);
+    StandardQueryParser qp = getParser(null);
     qp.setLowercaseExpandedTerms(lowercase);
     qp.setAllowLeadingWildcard(allowLeadingWildcard);
     Query q = qp.parse(query, "field");
@@ -271,7 +271,7 @@
 
   public void assertWildcardQueryEquals(String query, String result)
       throws Exception {
-    OriginalQueryParserHelper qp = getParser(null);
+    StandardQueryParser qp = getParser(null);
     Query q = qp.parse(query, "field");
     String s = q.toString("field");
     if (!s.equals(result)) {
@@ -283,7 +283,7 @@
   public Query getQueryDOA(String query, Analyzer a) throws Exception {
     if (a == null)
       a = new SimpleAnalyzer();
-    OriginalQueryParserHelper qp = new OriginalQueryParserHelper();
+    StandardQueryParser qp = new StandardQueryParser();
     qp.setAnalyzer(a);
     qp.setDefaultOperator(Operator.AND);
 
@@ -485,7 +485,7 @@
   }
 
   public void testLeadingWildcardType() throws Exception {
-    OriginalQueryParserHelper qp = getParser(null);
+    StandardQueryParser qp = getParser(null);
     qp.setAllowLeadingWildcard(true);
     assertEquals(WildcardQuery.class, qp.parse("t*erm*", "field").getClass());
     assertEquals(WildcardQuery.class, qp.parse("?term*", "field").getClass());
@@ -527,7 +527,7 @@
     assertQueryEquals("[ a TO z]", null, "[a TO z]");
     assertEquals(MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT, ((TermRangeQuery)getQuery("[
a TO z]", null)).getRewriteMethod());
 
-    OriginalQueryParserHelper qp = new OriginalQueryParserHelper();
+    StandardQueryParser qp = new StandardQueryParser();
     
     qp.setMultiTermRewriteMethod(MultiTermQuery.SCORING_BOOLEAN_QUERY_REWRITE);
     assertEquals(MultiTermQuery.SCORING_BOOLEAN_QUERY_REWRITE,((TermRangeQuery)qp.parse("[
a TO z]", "field")).getRewriteMethod());
@@ -555,7 +555,7 @@
     iw.close();
     IndexSearcher is = new IndexSearcher(ramDir);
 
-    OriginalQueryParserHelper qp = new OriginalQueryParserHelper();
+    StandardQueryParser qp = new StandardQueryParser();
     qp.setAnalyzer(new WhitespaceAnalyzer());
 
     // Neither Java 1.4.2 nor 1.5.0 has Farsi Locale collation available in
@@ -653,7 +653,7 @@
     final String defaultField = "default";
     final String monthField = "month";
     final String hourField = "hour";
-    OriginalQueryParserHelper qp = new OriginalQueryParserHelper();
+    StandardQueryParser qp = new StandardQueryParser();
 
     // Don't set any date resolution and verify if DateField is used
     assertDateRangeQueryEquals(qp, defaultField, startDate, endDate,
@@ -690,7 +690,7 @@
         endDateExpected.getTime(), DateTools.Resolution.HOUR);
   }
 
-  public void assertDateRangeQueryEquals(OriginalQueryParserHelper qp,
+  public void assertDateRangeQueryEquals(StandardQueryParser qp,
       String field, String startDate, String endDate, Date endDateInclusive,
       DateTools.Resolution resolution) throws Exception {
     assertQueryEquals(qp, field, field + ":[" + startDate + " TO " + endDate
@@ -870,7 +870,7 @@
   public void testBoost() throws Exception {
     StandardAnalyzer oneStopAnalyzer = new StandardAnalyzer(
         new String[] { "on" });
-    OriginalQueryParserHelper qp = new OriginalQueryParserHelper();
+    StandardQueryParser qp = new StandardQueryParser();
     qp.setAnalyzer(oneStopAnalyzer);
 
     Query q = qp.parse("on^1.0", "field");
@@ -884,7 +884,7 @@
     q = qp.parse("\"on\"^1.0", "field");
     assertNotNull(q);
 
-    OriginalQueryParserHelper qp2 = new OriginalQueryParserHelper();
+    StandardQueryParser qp2 = new StandardQueryParser();
     qp2.setAnalyzer(new StandardAnalyzer());
 
     q = qp2.parse("the^3", "field");
@@ -933,7 +933,7 @@
   public void testBooleanQuery() throws Exception {
     BooleanQuery.setMaxClauseCount(2);
     try {
-      OriginalQueryParserHelper qp = new OriginalQueryParserHelper();
+      StandardQueryParser qp = new StandardQueryParser();
       qp.setAnalyzer(new WhitespaceAnalyzer());
 
       qp.parse("one two three", "field");
@@ -947,7 +947,7 @@
    * This test differs from TestPrecedenceQueryParser
    */
   public void testPrecedence() throws Exception {
-    OriginalQueryParserHelper qp = new OriginalQueryParserHelper();
+    StandardQueryParser qp = new StandardQueryParser();
     qp.setAnalyzer(new WhitespaceAnalyzer());
 
     Query query1 = qp.parse("A AND B OR C AND D", "field");
@@ -976,7 +976,7 @@
 
   public void testStarParsing() throws Exception {
     // final int[] type = new int[1];
-    // OriginalQueryParserHelper qp = new OriginalQueryParserHelper("field", new
+    // StandardQueryParser qp = new StandardQueryParser("field", new
     // WhitespaceAnalyzer()) {
     // protected Query getWildcardQuery(String field, String termStr) throws
     // ParseException {
@@ -1038,7 +1038,7 @@
   }
 
   public void testStopwords() throws Exception {
-    OriginalQueryParserHelper qp = new OriginalQueryParserHelper();
+    StandardQueryParser qp = new StandardQueryParser();
     qp.setAnalyzer(
         new StopAnalyzer(new String[] { "the", "foo" }));
 
@@ -1064,7 +1064,7 @@
     boolean dflt = StopFilter.getEnablePositionIncrementsDefault();
     StopFilter.setEnablePositionIncrementsDefault(true);
     try {
-      OriginalQueryParserHelper qp = new OriginalQueryParserHelper();
+      StandardQueryParser qp = new StandardQueryParser();
       qp.setAnalyzer(
           new StopAnalyzer(new String[] { "the", "in", "are", "this" }));
 
@@ -1090,7 +1090,7 @@
   }
 
   public void testMatchAllDocs() throws Exception {
-    OriginalQueryParserHelper qp = new OriginalQueryParserHelper();
+    StandardQueryParser qp = new StandardQueryParser();
     qp.setAnalyzer(new WhitespaceAnalyzer());
 
     assertEquals(new MatchAllDocsQuery(), qp.parse("*:*", "field"));
@@ -1102,7 +1102,7 @@
 
   private void assertHits(int expected, String query, IndexSearcher is)
       throws IOException, QueryNodeException {
-    OriginalQueryParserHelper qp = new OriginalQueryParserHelper();
+    StandardQueryParser qp = new StandardQueryParser();
     qp.setAnalyzer(new WhitespaceAnalyzer());
     qp.setLocale(Locale.ENGLISH);
 

Modified: lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQueryParserWrapper.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQueryParserWrapper.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQueryParserWrapper.java
(original)
+++ lucene/java/trunk/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQueryParserWrapper.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



Mime
View raw message