Index: modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java =================================================================== --- modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java (revision 1145556) +++ modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard; +package org.apache.lucene.queryparser.flexible.standard; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -27,9 +27,9 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler; -import org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler.Operator; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler; +import org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler.Operator; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; Index: modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java =================================================================== --- modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java (revision 1145556) +++ modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard; +package org.apache.lucene.queryparser.flexible.standard; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -45,14 +45,14 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.Term; import org.apache.lucene.messages.MessageImpl; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.messages.QueryParserMessages; -import org.apache.lucene.queryParser.core.nodes.FuzzyQueryNode; -import org.apache.lucene.queryParser.core.nodes.QueryNode; -import org.apache.lucene.queryParser.core.processors.QueryNodeProcessorImpl; -import org.apache.lucene.queryParser.core.processors.QueryNodeProcessorPipeline; -import org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler; -import org.apache.lucene.queryParser.standard.nodes.WildcardQueryNode; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages; +import org.apache.lucene.queryparser.flexible.core.nodes.FuzzyQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessorImpl; +import org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessorPipeline; +import org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler; +import org.apache.lucene.queryparser.flexible.standard.nodes.WildcardQueryNode; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.FuzzyQuery; Index: modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiAnalyzerQPHelper.java =================================================================== --- modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiAnalyzerQPHelper.java (revision 1145556) +++ modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiAnalyzerQPHelper.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard; +package org.apache.lucene.queryparser.flexible.standard; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -27,9 +27,9 @@ import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.analysis.tokenattributes.TypeAttribute; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler; -import org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler.Operator; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler; +import org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler.Operator; import org.apache.lucene.util.LuceneTestCase; /** Index: modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java =================================================================== --- modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java (revision 1145556) +++ modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard; +package org.apache.lucene.queryparser.flexible.standard; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -37,11 +37,11 @@ import org.apache.lucene.document.NumericField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.parser.EscapeQuerySyntax; -import org.apache.lucene.queryParser.standard.config.NumberDateFormat; -import org.apache.lucene.queryParser.standard.config.NumericConfig; -import org.apache.lucene.queryParser.standard.parser.EscapeQuerySyntaxImpl; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; +import org.apache.lucene.queryparser.flexible.standard.config.NumberDateFormat; +import org.apache.lucene.queryparser.flexible.standard.config.NumericConfig; +import org.apache.lucene.queryparser.flexible.standard.parser.EscapeQuerySyntaxImpl; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.lucene.search.TopDocs; Index: modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/TestSpanQueryParserSimpleSample.java =================================================================== --- modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/TestSpanQueryParserSimpleSample.java (revision 1145556) +++ modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/TestSpanQueryParserSimpleSample.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.spans; +package org.apache.lucene.queryparser.flexible.spans; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -19,12 +19,12 @@ import javax.management.Query; -import org.apache.lucene.queryParser.core.config.QueryConfigHandler; -import org.apache.lucene.queryParser.core.nodes.OrQueryNode; -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.standard.parser.StandardSyntaxParser; +import org.apache.lucene.queryparser.flexible.core.config.QueryConfigHandler; +import org.apache.lucene.queryparser.flexible.core.nodes.OrQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.parser.SyntaxParser; +import org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessorPipeline; +import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser; import org.apache.lucene.search.spans.SpanQuery; import org.apache.lucene.search.spans.SpanTermQuery; import org.apache.lucene.util.LuceneTestCase; Index: modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/UniqueFieldAttributeImpl.java =================================================================== --- modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/UniqueFieldAttributeImpl.java (revision 1145556) +++ modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/UniqueFieldAttributeImpl.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.spans; +package org.apache.lucene.queryparser.flexible.spans; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,7 +17,7 @@ * limitations under the License. */ -import org.apache.lucene.queryParser.core.nodes.FieldableNode; +import org.apache.lucene.queryparser.flexible.core.nodes.FieldableNode; import org.apache.lucene.util.AttributeImpl; /** Index: modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpansQueryTreeBuilder.java =================================================================== --- modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpansQueryTreeBuilder.java (revision 1145556) +++ modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpansQueryTreeBuilder.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.spans; +package org.apache.lucene.queryparser.flexible.spans; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,12 +17,12 @@ * limitations under the License. */ -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.builders.QueryTreeBuilder; -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.standard.builders.StandardQueryBuilder; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.builders.QueryTreeBuilder; +import org.apache.lucene.queryparser.flexible.core.nodes.BooleanQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.FieldQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.standard.builders.StandardQueryBuilder; import org.apache.lucene.search.spans.SpanQuery; /** Index: modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/TestSpanQueryParser.java =================================================================== --- modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/TestSpanQueryParser.java (revision 1145556) +++ modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/TestSpanQueryParser.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.spans; +package org.apache.lucene.queryparser.flexible.spans; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,13 +17,13 @@ * limitations under the License. */ -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.nodes.OrQueryNode; -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.standard.parser.StandardSyntaxParser; -import org.apache.lucene.queryParser.standard.processors.WildcardQueryNodeProcessor; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.nodes.OrQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.parser.SyntaxParser; +import org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessorPipeline; +import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser; +import org.apache.lucene.queryparser.flexible.standard.processors.WildcardQueryNodeProcessor; import org.apache.lucene.search.spans.SpanOrQuery; import org.apache.lucene.search.spans.SpanQuery; import org.apache.lucene.search.spans.SpanTermQuery; Index: modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpanOrQueryNodeBuilder.java =================================================================== --- modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpanOrQueryNodeBuilder.java (revision 1145556) +++ modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpanOrQueryNodeBuilder.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.spans; +package org.apache.lucene.queryparser.flexible.spans; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -19,11 +19,11 @@ import java.util.List; -import org.apache.lucene.queryParser.core.QueryNodeException; -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.standard.builders.StandardQueryBuilder; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.builders.QueryTreeBuilder; +import org.apache.lucene.queryparser.flexible.core.nodes.BooleanQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.standard.builders.StandardQueryBuilder; import org.apache.lucene.search.spans.SpanOrQuery; import org.apache.lucene.search.spans.SpanQuery; Index: modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpansValidatorQueryNodeProcessor.java =================================================================== --- modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpansValidatorQueryNodeProcessor.java (revision 1145556) +++ modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpansValidatorQueryNodeProcessor.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.spans; +package org.apache.lucene.queryparser.flexible.spans; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -20,14 +20,14 @@ import java.util.List; import org.apache.lucene.messages.MessageImpl; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.messages.QueryParserMessages; -import org.apache.lucene.queryParser.core.nodes.AndQueryNode; -import org.apache.lucene.queryParser.core.nodes.BooleanQueryNode; -import org.apache.lucene.queryParser.core.nodes.FieldQueryNode; -import org.apache.lucene.queryParser.core.nodes.OrQueryNode; -import org.apache.lucene.queryParser.core.nodes.QueryNode; -import org.apache.lucene.queryParser.core.processors.QueryNodeProcessorImpl; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages; +import org.apache.lucene.queryparser.flexible.core.nodes.AndQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.BooleanQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.FieldQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.OrQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessorImpl; /** * Validates every query node in a query node tree. This processor will pass Index: modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/UniqueFieldQueryNodeProcessor.java =================================================================== --- modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/UniqueFieldQueryNodeProcessor.java (revision 1145556) +++ modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/UniqueFieldQueryNodeProcessor.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.spans; +package org.apache.lucene.queryparser.flexible.spans; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -19,11 +19,11 @@ import java.util.List; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.config.QueryConfigHandler; -import org.apache.lucene.queryParser.core.nodes.FieldableNode; -import org.apache.lucene.queryParser.core.nodes.QueryNode; -import org.apache.lucene.queryParser.core.processors.QueryNodeProcessorImpl; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.config.QueryConfigHandler; +import org.apache.lucene.queryparser.flexible.core.nodes.FieldableNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessorImpl; /** * This processor changes every field name of each {@link FieldableNode} query Index: modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpanTermQueryNodeBuilder.java =================================================================== --- modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpanTermQueryNodeBuilder.java (revision 1145556) +++ modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpanTermQueryNodeBuilder.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.spans; +package org.apache.lucene.queryparser.flexible.spans; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -18,10 +18,10 @@ */ import org.apache.lucene.index.Term; -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.standard.builders.StandardQueryBuilder; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.nodes.FieldQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.standard.builders.StandardQueryBuilder; import org.apache.lucene.search.spans.SpanTermQuery; /** Index: modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpansQueryConfigHandler.java =================================================================== --- modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpansQueryConfigHandler.java (revision 1145556) +++ modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpansQueryConfigHandler.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.spans; +package org.apache.lucene.queryparser.flexible.spans; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,9 +17,9 @@ * limitations under the License. */ -import org.apache.lucene.queryParser.core.config.ConfigurationKey; -import org.apache.lucene.queryParser.core.config.FieldConfig; -import org.apache.lucene.queryParser.core.config.QueryConfigHandler; +import org.apache.lucene.queryparser.flexible.core.config.ConfigurationKey; +import org.apache.lucene.queryparser.flexible.core.config.FieldConfig; +import org.apache.lucene.queryparser.flexible.core.config.QueryConfigHandler; /** * This query config handler only adds the {@link UniqueFieldAttribute} to it.
Index: modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/UniqueFieldAttribute.java =================================================================== --- modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/UniqueFieldAttribute.java (revision 1145556) +++ modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/UniqueFieldAttribute.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.spans; +package org.apache.lucene.queryparser.flexible.spans; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,7 +17,7 @@ * limitations under the License. */ -import org.apache.lucene.queryParser.core.nodes.FieldableNode; +import org.apache.lucene.queryparser.flexible.core.nodes.FieldableNode; import org.apache.lucene.util.Attribute; /** Index: modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/core/nodes/TestQueryNode.java =================================================================== --- modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/core/nodes/TestQueryNode.java (revision 1145556) +++ modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/core/nodes/TestQueryNode.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.nodes; +package org.apache.lucene.queryparser.flexible.core.nodes; /** * Licensed to the Apache Software Foundation (ASF) under one or more Index: modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/core/builders/TestQueryTreeBuilder.java =================================================================== --- modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/core/builders/TestQueryTreeBuilder.java (revision 1145556) +++ modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/core/builders/TestQueryTreeBuilder.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.builders; +package org.apache.lucene.queryparser.flexible.core.builders; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -19,10 +19,10 @@ import junit.framework.Assert; -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.core.util.UnescapedCharSequence; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.nodes.FieldQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.util.UnescapedCharSequence; import org.apache.lucene.util.LuceneTestCase; import org.junit.Test; Index: modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/precedence/TestPrecedenceQueryParser.java =================================================================== --- modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/precedence/TestPrecedenceQueryParser.java (revision 1145556) +++ modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/precedence/TestPrecedenceQueryParser.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.precedence; +package org.apache.lucene.queryparser.flexible.precedence; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -35,10 +35,10 @@ import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.document.DateTools; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.QueryNodeParseException; -import org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler; -import org.apache.lucene.queryParser.standard.parser.ParseException; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.QueryNodeParseException; +import org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler; +import org.apache.lucene.queryparser.flexible.standard.parser.ParseException; import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.FuzzyQuery; import org.apache.lucene.search.PhraseQuery; Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/QueryParserUtil.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/QueryParserUtil.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/QueryParserUtil.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard; +package org.apache.lucene.queryparser.flexible.standard; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -18,7 +18,7 @@ */ import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.queryParser.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.Query; Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/ParametricRangeQueryNodeProcessor.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/ParametricRangeQueryNodeProcessor.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/ParametricRangeQueryNodeProcessor.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.processors; +package org.apache.lucene.queryparser.flexible.standard.processors; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -25,16 +25,16 @@ import org.apache.lucene.document.DateTools; import org.apache.lucene.document.DateTools.Resolution; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.config.FieldConfig; -import org.apache.lucene.queryParser.core.config.QueryConfigHandler; -import org.apache.lucene.queryParser.core.nodes.ParametricQueryNode; -import org.apache.lucene.queryParser.core.nodes.ParametricRangeQueryNode; -import org.apache.lucene.queryParser.core.nodes.QueryNode; -import org.apache.lucene.queryParser.core.nodes.ParametricQueryNode.CompareOperator; -import org.apache.lucene.queryParser.core.processors.QueryNodeProcessorImpl; -import org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler.ConfigurationKeys; -import org.apache.lucene.queryParser.standard.nodes.TermRangeQueryNode; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.config.FieldConfig; +import org.apache.lucene.queryparser.flexible.core.config.QueryConfigHandler; +import org.apache.lucene.queryparser.flexible.core.nodes.ParametricQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.ParametricRangeQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.ParametricQueryNode.CompareOperator; +import org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessorImpl; +import org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler.ConfigurationKeys; +import org.apache.lucene.queryparser.flexible.standard.nodes.TermRangeQueryNode; /** * This processor converts {@link ParametricRangeQueryNode} objects to Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/LowercaseExpandedTermsQueryNodeProcessor.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/LowercaseExpandedTermsQueryNodeProcessor.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/LowercaseExpandedTermsQueryNodeProcessor.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.processors; +package org.apache.lucene.queryparser.flexible.standard.processors; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -19,17 +19,17 @@ import java.util.List; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.config.QueryConfigHandler; -import org.apache.lucene.queryParser.core.nodes.FuzzyQueryNode; -import org.apache.lucene.queryParser.core.nodes.ParametricQueryNode; -import org.apache.lucene.queryParser.core.nodes.QueryNode; -import org.apache.lucene.queryParser.core.nodes.TextableQueryNode; -import org.apache.lucene.queryParser.core.processors.QueryNodeProcessorImpl; -import org.apache.lucene.queryParser.core.util.UnescapedCharSequence; -import org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler.ConfigurationKeys; -import org.apache.lucene.queryParser.standard.nodes.RegexpQueryNode; -import org.apache.lucene.queryParser.standard.nodes.WildcardQueryNode; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.config.QueryConfigHandler; +import org.apache.lucene.queryparser.flexible.core.nodes.FuzzyQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.ParametricQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.TextableQueryNode; +import org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessorImpl; +import org.apache.lucene.queryparser.flexible.core.util.UnescapedCharSequence; +import org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler.ConfigurationKeys; +import org.apache.lucene.queryparser.flexible.standard.nodes.RegexpQueryNode; +import org.apache.lucene.queryparser.flexible.standard.nodes.WildcardQueryNode; /** * This processor verifies if Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/NumericRangeQueryNodeProcessor.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/NumericRangeQueryNodeProcessor.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/NumericRangeQueryNodeProcessor.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.processors; +package org.apache.lucene.queryparser.flexible.standard.processors; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -22,21 +22,21 @@ import java.util.List; import org.apache.lucene.messages.MessageImpl; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.QueryNodeParseException; -import org.apache.lucene.queryParser.core.config.FieldConfig; -import org.apache.lucene.queryParser.core.config.QueryConfigHandler; -import org.apache.lucene.queryParser.core.messages.QueryParserMessages; -import org.apache.lucene.queryParser.core.nodes.ParametricQueryNode; -import org.apache.lucene.queryParser.core.nodes.ParametricRangeQueryNode; -import org.apache.lucene.queryParser.core.nodes.QueryNode; -import org.apache.lucene.queryParser.core.nodes.ParametricQueryNode.CompareOperator; -import org.apache.lucene.queryParser.core.processors.QueryNodeProcessorImpl; -import org.apache.lucene.queryParser.core.util.StringUtils; -import org.apache.lucene.queryParser.standard.config.NumericConfig; -import org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler.ConfigurationKeys; -import org.apache.lucene.queryParser.standard.nodes.NumericQueryNode; -import org.apache.lucene.queryParser.standard.nodes.NumericRangeQueryNode; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.QueryNodeParseException; +import org.apache.lucene.queryparser.flexible.core.config.FieldConfig; +import org.apache.lucene.queryparser.flexible.core.config.QueryConfigHandler; +import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages; +import org.apache.lucene.queryparser.flexible.core.nodes.ParametricQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.ParametricRangeQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.ParametricQueryNode.CompareOperator; +import org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessorImpl; +import org.apache.lucene.queryparser.flexible.core.util.StringUtils; +import org.apache.lucene.queryparser.flexible.standard.config.NumericConfig; +import org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler.ConfigurationKeys; +import org.apache.lucene.queryparser.flexible.standard.nodes.NumericQueryNode; +import org.apache.lucene.queryparser.flexible.standard.nodes.NumericRangeQueryNode; public class NumericRangeQueryNodeProcessor extends QueryNodeProcessorImpl { Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/RemoveEmptyNonLeafQueryNodeProcessor.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/RemoveEmptyNonLeafQueryNodeProcessor.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/RemoveEmptyNonLeafQueryNodeProcessor.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.processors; +package org.apache.lucene.queryparser.flexible.standard.processors; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -20,12 +20,12 @@ import java.util.LinkedList; import java.util.List; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.nodes.GroupQueryNode; -import org.apache.lucene.queryParser.core.nodes.MatchNoDocsQueryNode; -import org.apache.lucene.queryParser.core.nodes.ModifierQueryNode; -import org.apache.lucene.queryParser.core.nodes.QueryNode; -import org.apache.lucene.queryParser.core.processors.QueryNodeProcessorImpl; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.nodes.GroupQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.MatchNoDocsQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.ModifierQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessorImpl; /** * This processor removes every {@link QueryNode} that is not a leaf and has not Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/PhraseSlopQueryNodeProcessor.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/PhraseSlopQueryNodeProcessor.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/PhraseSlopQueryNodeProcessor.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.processors; +package org.apache.lucene.queryparser.flexible.standard.processors; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -19,12 +19,12 @@ import java.util.List; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.nodes.QueryNode; -import org.apache.lucene.queryParser.core.nodes.SlopQueryNode; -import org.apache.lucene.queryParser.core.nodes.TokenizedPhraseQueryNode; -import org.apache.lucene.queryParser.core.processors.QueryNodeProcessorImpl; -import org.apache.lucene.queryParser.standard.nodes.MultiPhraseQueryNode; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.SlopQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.TokenizedPhraseQueryNode; +import org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessorImpl; +import org.apache.lucene.queryparser.flexible.standard.nodes.MultiPhraseQueryNode; /** * This processor removes invalid {@link SlopQueryNode} objects in the query Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/AllowLeadingWildcardProcessor.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/AllowLeadingWildcardProcessor.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/AllowLeadingWildcardProcessor.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.processors; +package org.apache.lucene.queryparser.flexible.standard.processors; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -20,15 +20,15 @@ import java.util.List; import org.apache.lucene.messages.MessageImpl; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.config.QueryConfigHandler; -import org.apache.lucene.queryParser.core.messages.QueryParserMessages; -import org.apache.lucene.queryParser.core.nodes.QueryNode; -import org.apache.lucene.queryParser.core.processors.QueryNodeProcessorImpl; -import org.apache.lucene.queryParser.core.util.UnescapedCharSequence; -import org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler.ConfigurationKeys; -import org.apache.lucene.queryParser.standard.nodes.WildcardQueryNode; -import org.apache.lucene.queryParser.standard.parser.EscapeQuerySyntaxImpl; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.config.QueryConfigHandler; +import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessorImpl; +import org.apache.lucene.queryparser.flexible.core.util.UnescapedCharSequence; +import org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler.ConfigurationKeys; +import org.apache.lucene.queryparser.flexible.standard.nodes.WildcardQueryNode; +import org.apache.lucene.queryparser.flexible.standard.parser.EscapeQuerySyntaxImpl; /** * This processor verifies if Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/package.html =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/package.html (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/package.html (working copy) @@ -23,7 +23,7 @@

Lucene Query Node Processors

-The package org.apache.lucene.queryParser.standard.processors contains every processor needed to assembly a pipeline +The package org.apache.lucene.queryparser.flexible.standard.processors contains every processor needed to assembly a pipeline that modifies the query node tree according to the actual Lucene queries.

Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/DefaultPhraseSlopQueryNodeProcessor.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/DefaultPhraseSlopQueryNodeProcessor.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/DefaultPhraseSlopQueryNodeProcessor.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.processors; +package org.apache.lucene.queryparser.flexible.standard.processors; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -19,14 +19,14 @@ import java.util.List; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.config.QueryConfigHandler; -import org.apache.lucene.queryParser.core.nodes.QueryNode; -import org.apache.lucene.queryParser.core.nodes.SlopQueryNode; -import org.apache.lucene.queryParser.core.nodes.TokenizedPhraseQueryNode; -import org.apache.lucene.queryParser.core.processors.QueryNodeProcessorImpl; -import org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler.ConfigurationKeys; -import org.apache.lucene.queryParser.standard.nodes.MultiPhraseQueryNode; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.config.QueryConfigHandler; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.SlopQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.TokenizedPhraseQueryNode; +import org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessorImpl; +import org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler.ConfigurationKeys; +import org.apache.lucene.queryparser.flexible.standard.nodes.MultiPhraseQueryNode; /** * This processor verifies if {@link ConfigurationKeys#PHRASE_SLOP} Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/AnalyzerQueryNodeProcessor.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/AnalyzerQueryNodeProcessor.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/AnalyzerQueryNodeProcessor.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.processors; +package org.apache.lucene.queryparser.flexible.standard.processors; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -28,22 +28,22 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.config.QueryConfigHandler; -import org.apache.lucene.queryParser.core.nodes.FieldQueryNode; -import org.apache.lucene.queryParser.core.nodes.FuzzyQueryNode; -import org.apache.lucene.queryParser.core.nodes.GroupQueryNode; -import org.apache.lucene.queryParser.core.nodes.NoTokenFoundQueryNode; -import org.apache.lucene.queryParser.core.nodes.ParametricQueryNode; -import org.apache.lucene.queryParser.core.nodes.QueryNode; -import org.apache.lucene.queryParser.core.nodes.QuotedFieldQueryNode; -import org.apache.lucene.queryParser.core.nodes.TextableQueryNode; -import org.apache.lucene.queryParser.core.nodes.TokenizedPhraseQueryNode; -import org.apache.lucene.queryParser.core.processors.QueryNodeProcessorImpl; -import org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler.ConfigurationKeys; -import org.apache.lucene.queryParser.standard.nodes.MultiPhraseQueryNode; -import org.apache.lucene.queryParser.standard.nodes.StandardBooleanQueryNode; -import org.apache.lucene.queryParser.standard.nodes.WildcardQueryNode; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.config.QueryConfigHandler; +import org.apache.lucene.queryparser.flexible.core.nodes.FieldQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.FuzzyQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.GroupQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.NoTokenFoundQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.ParametricQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QuotedFieldQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.TextableQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.TokenizedPhraseQueryNode; +import org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessorImpl; +import org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler.ConfigurationKeys; +import org.apache.lucene.queryparser.flexible.standard.nodes.MultiPhraseQueryNode; +import org.apache.lucene.queryparser.flexible.standard.nodes.StandardBooleanQueryNode; +import org.apache.lucene.queryparser.flexible.standard.nodes.WildcardQueryNode; /** * This processor verifies if {@link ConfigurationKeys#ANALYZER} Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/BoostQueryNodeProcessor.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/BoostQueryNodeProcessor.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/BoostQueryNodeProcessor.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.processors; +package org.apache.lucene.queryparser.flexible.standard.processors; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -19,15 +19,15 @@ import java.util.List; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.config.FieldConfig; -import org.apache.lucene.queryParser.core.config.QueryConfigHandler; -import org.apache.lucene.queryParser.core.nodes.BoostQueryNode; -import org.apache.lucene.queryParser.core.nodes.FieldableNode; -import org.apache.lucene.queryParser.core.nodes.QueryNode; -import org.apache.lucene.queryParser.core.processors.QueryNodeProcessorImpl; -import org.apache.lucene.queryParser.core.util.StringUtils; -import org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler.ConfigurationKeys; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.config.FieldConfig; +import org.apache.lucene.queryparser.flexible.core.config.QueryConfigHandler; +import org.apache.lucene.queryparser.flexible.core.nodes.BoostQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.FieldableNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessorImpl; +import org.apache.lucene.queryparser.flexible.core.util.StringUtils; +import org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler.ConfigurationKeys; /** * This processor iterates the query node tree looking for every Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/StandardQueryNodeProcessorPipeline.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/StandardQueryNodeProcessorPipeline.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/StandardQueryNodeProcessorPipeline.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.processors; +package org.apache.lucene.queryparser.flexible.standard.processors; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,13 +17,13 @@ * limitations under the License. */ -import org.apache.lucene.queryParser.core.config.QueryConfigHandler; -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.standard.builders.StandardQueryTreeBuilder; -import org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler; -import org.apache.lucene.queryParser.standard.parser.StandardSyntaxParser; +import org.apache.lucene.queryparser.flexible.core.config.QueryConfigHandler; +import org.apache.lucene.queryparser.flexible.core.processors.NoChildOptimizationQueryNodeProcessor; +import org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessorPipeline; +import org.apache.lucene.queryparser.flexible.core.processors.RemoveDeletedQueryNodesProcessor; +import org.apache.lucene.queryparser.flexible.standard.builders.StandardQueryTreeBuilder; +import org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler; +import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser; import org.apache.lucene.search.Query; /** Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/FuzzyQueryNodeProcessor.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/FuzzyQueryNodeProcessor.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/FuzzyQueryNodeProcessor.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.processors; +package org.apache.lucene.queryparser.flexible.standard.processors; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -19,13 +19,13 @@ import java.util.List; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.config.QueryConfigHandler; -import org.apache.lucene.queryParser.core.nodes.FuzzyQueryNode; -import org.apache.lucene.queryParser.core.nodes.QueryNode; -import org.apache.lucene.queryParser.core.processors.QueryNodeProcessorImpl; -import org.apache.lucene.queryParser.standard.config.FuzzyConfig; -import org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler.ConfigurationKeys; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.config.QueryConfigHandler; +import org.apache.lucene.queryparser.flexible.core.nodes.FuzzyQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessorImpl; +import org.apache.lucene.queryparser.flexible.standard.config.FuzzyConfig; +import org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler.ConfigurationKeys; import org.apache.lucene.search.FuzzyQuery; /** Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/MultiTermRewriteMethodProcessor.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/MultiTermRewriteMethodProcessor.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/MultiTermRewriteMethodProcessor.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.processors; +package org.apache.lucene.queryparser.flexible.standard.processors; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -19,12 +19,12 @@ import java.util.List; -import org.apache.lucene.queryParser.core.nodes.QueryNode; -import org.apache.lucene.queryParser.core.processors.QueryNodeProcessorImpl; -import org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler.ConfigurationKeys; -import org.apache.lucene.queryParser.standard.nodes.AbstractRangeQueryNode; -import org.apache.lucene.queryParser.standard.nodes.RegexpQueryNode; -import org.apache.lucene.queryParser.standard.nodes.WildcardQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessorImpl; +import org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler.ConfigurationKeys; +import org.apache.lucene.queryparser.flexible.standard.nodes.AbstractRangeQueryNode; +import org.apache.lucene.queryparser.flexible.standard.nodes.RegexpQueryNode; +import org.apache.lucene.queryparser.flexible.standard.nodes.WildcardQueryNode; import org.apache.lucene.search.MultiTermQuery; /** Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/WildcardQueryNodeProcessor.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/WildcardQueryNodeProcessor.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/WildcardQueryNodeProcessor.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.processors; +package org.apache.lucene.queryparser.flexible.standard.processors; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -19,17 +19,17 @@ import java.util.List; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.nodes.FieldQueryNode; -import org.apache.lucene.queryParser.core.nodes.FuzzyQueryNode; -import org.apache.lucene.queryParser.core.nodes.ParametricQueryNode; -import org.apache.lucene.queryParser.core.nodes.QueryNode; -import org.apache.lucene.queryParser.core.nodes.QuotedFieldQueryNode; -import org.apache.lucene.queryParser.core.processors.QueryNodeProcessorImpl; -import org.apache.lucene.queryParser.core.util.UnescapedCharSequence; -import org.apache.lucene.queryParser.standard.nodes.PrefixWildcardQueryNode; -import org.apache.lucene.queryParser.standard.nodes.WildcardQueryNode; -import org.apache.lucene.queryParser.standard.parser.StandardSyntaxParser; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.nodes.FieldQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.FuzzyQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.ParametricQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QuotedFieldQueryNode; +import org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessorImpl; +import org.apache.lucene.queryparser.flexible.core.util.UnescapedCharSequence; +import org.apache.lucene.queryparser.flexible.standard.nodes.PrefixWildcardQueryNode; +import org.apache.lucene.queryparser.flexible.standard.nodes.WildcardQueryNode; +import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser; import org.apache.lucene.search.PrefixQuery; /** Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/GroupQueryNodeProcessor.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/GroupQueryNodeProcessor.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/GroupQueryNodeProcessor.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.processors; +package org.apache.lucene.queryparser.flexible.standard.processors; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -20,21 +20,21 @@ import java.util.ArrayList; import java.util.List; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.config.QueryConfigHandler; -import org.apache.lucene.queryParser.core.nodes.AndQueryNode; -import org.apache.lucene.queryParser.core.nodes.BooleanQueryNode; -import org.apache.lucene.queryParser.core.nodes.GroupQueryNode; -import org.apache.lucene.queryParser.core.nodes.ModifierQueryNode; -import org.apache.lucene.queryParser.core.nodes.OrQueryNode; -import org.apache.lucene.queryParser.core.nodes.QueryNode; -import org.apache.lucene.queryParser.core.nodes.ModifierQueryNode.Modifier; -import org.apache.lucene.queryParser.core.parser.SyntaxParser; -import org.apache.lucene.queryParser.core.processors.QueryNodeProcessor; -import org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler; -import org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler.ConfigurationKeys; -import org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler.Operator; -import org.apache.lucene.queryParser.standard.nodes.BooleanModifierNode; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.config.QueryConfigHandler; +import org.apache.lucene.queryparser.flexible.core.nodes.AndQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.BooleanQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.GroupQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.ModifierQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.OrQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.ModifierQueryNode.Modifier; +import org.apache.lucene.queryparser.flexible.core.parser.SyntaxParser; +import org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessor; +import org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler; +import org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler.ConfigurationKeys; +import org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler.Operator; +import org.apache.lucene.queryparser.flexible.standard.nodes.BooleanModifierNode; /** * The {@link SyntaxParser} @@ -48,7 +48,7 @@ * * Example: TODO: describe a good example to show how this processor works * - * @see org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler + * @see org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler */ public class GroupQueryNodeProcessor implements QueryNodeProcessor { Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/BooleanSingleChildOptimizationQueryNodeProcessor.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/BooleanSingleChildOptimizationQueryNodeProcessor.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/BooleanSingleChildOptimizationQueryNodeProcessor.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.processors; +package org.apache.lucene.queryparser.flexible.standard.processors; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -19,13 +19,13 @@ import java.util.List; -import org.apache.lucene.queryParser.core.QueryNodeException; -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.core.nodes.ModifierQueryNode.Modifier; -import org.apache.lucene.queryParser.core.processors.QueryNodeProcessorImpl; -import org.apache.lucene.queryParser.standard.nodes.BooleanModifierNode; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.nodes.BooleanQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.ModifierQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.ModifierQueryNode.Modifier; +import org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessorImpl; +import org.apache.lucene.queryparser.flexible.standard.nodes.BooleanModifierNode; /** * This processor removes every {@link BooleanQueryNode} that contains only one Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/MultiFieldQueryNodeProcessor.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/MultiFieldQueryNodeProcessor.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/MultiFieldQueryNodeProcessor.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.processors; +package org.apache.lucene.queryparser.flexible.standard.processors; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -20,14 +20,14 @@ import java.util.LinkedList; import java.util.List; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.config.QueryConfigHandler; -import org.apache.lucene.queryParser.core.nodes.BooleanQueryNode; -import org.apache.lucene.queryParser.core.nodes.FieldableNode; -import org.apache.lucene.queryParser.core.nodes.GroupQueryNode; -import org.apache.lucene.queryParser.core.nodes.QueryNode; -import org.apache.lucene.queryParser.core.processors.QueryNodeProcessorImpl; -import org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler.ConfigurationKeys; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.config.QueryConfigHandler; +import org.apache.lucene.queryparser.flexible.core.nodes.BooleanQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.FieldableNode; +import org.apache.lucene.queryparser.flexible.core.nodes.GroupQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessorImpl; +import org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler.ConfigurationKeys; /** * This processor is used to expand terms so the query looks for the same term Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/MatchAllDocsQueryNodeProcessor.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/MatchAllDocsQueryNodeProcessor.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/MatchAllDocsQueryNodeProcessor.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.processors; +package org.apache.lucene.queryparser.flexible.standard.processors; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -19,12 +19,12 @@ import java.util.List; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.nodes.FieldQueryNode; -import org.apache.lucene.queryParser.core.nodes.MatchAllDocsQueryNode; -import org.apache.lucene.queryParser.core.nodes.QueryNode; -import org.apache.lucene.queryParser.core.processors.QueryNodeProcessorImpl; -import org.apache.lucene.queryParser.standard.nodes.WildcardQueryNode; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.nodes.FieldQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.MatchAllDocsQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessorImpl; +import org.apache.lucene.queryparser.flexible.standard.nodes.WildcardQueryNode; import org.apache.lucene.search.MatchAllDocsQuery; /** Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/NumericQueryNodeProcessor.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/NumericQueryNodeProcessor.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/NumericQueryNodeProcessor.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.processors; +package org.apache.lucene.queryparser.flexible.standard.processors; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -22,19 +22,19 @@ import java.util.List; import org.apache.lucene.messages.MessageImpl; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.QueryNodeParseException; -import org.apache.lucene.queryParser.core.config.FieldConfig; -import org.apache.lucene.queryParser.core.config.QueryConfigHandler; -import org.apache.lucene.queryParser.core.messages.QueryParserMessages; -import org.apache.lucene.queryParser.core.nodes.FieldQueryNode; -import org.apache.lucene.queryParser.core.nodes.ParametricQueryNode; -import org.apache.lucene.queryParser.core.nodes.QueryNode; -import org.apache.lucene.queryParser.core.processors.QueryNodeProcessorImpl; -import org.apache.lucene.queryParser.standard.config.NumericConfig; -import org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler.ConfigurationKeys; -import org.apache.lucene.queryParser.standard.nodes.NumericQueryNode; -import org.apache.lucene.queryParser.standard.nodes.NumericRangeQueryNode; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.QueryNodeParseException; +import org.apache.lucene.queryparser.flexible.core.config.FieldConfig; +import org.apache.lucene.queryparser.flexible.core.config.QueryConfigHandler; +import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages; +import org.apache.lucene.queryparser.flexible.core.nodes.FieldQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.ParametricQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessorImpl; +import org.apache.lucene.queryparser.flexible.standard.config.NumericConfig; +import org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler.ConfigurationKeys; +import org.apache.lucene.queryparser.flexible.standard.nodes.NumericQueryNode; +import org.apache.lucene.queryparser.flexible.standard.nodes.NumericRangeQueryNode; public class NumericQueryNodeProcessor extends QueryNodeProcessorImpl { Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/StandardQueryParser.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/StandardQueryParser.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/StandardQueryParser.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard; +package org.apache.lucene.queryparser.flexible.standard; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -24,17 +24,17 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.document.DateTools; import org.apache.lucene.document.DateTools.Resolution; -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.standard.builders.StandardQueryTreeBuilder; -import org.apache.lucene.queryParser.standard.config.FuzzyConfig; -import org.apache.lucene.queryParser.standard.config.NumericConfig; -import org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler; -import org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler.ConfigurationKeys; -import org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler.Operator; -import org.apache.lucene.queryParser.standard.parser.StandardSyntaxParser; -import org.apache.lucene.queryParser.standard.processors.StandardQueryNodeProcessorPipeline; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.QueryParserHelper; +import org.apache.lucene.queryparser.flexible.core.config.QueryConfigHandler; +import org.apache.lucene.queryparser.flexible.standard.builders.StandardQueryTreeBuilder; +import org.apache.lucene.queryparser.flexible.standard.config.FuzzyConfig; +import org.apache.lucene.queryparser.flexible.standard.config.NumericConfig; +import org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler; +import org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler.ConfigurationKeys; +import org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler.Operator; +import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser; +import org.apache.lucene.queryparser.flexible.standard.processors.StandardQueryNodeProcessorPipeline; import org.apache.lucene.search.FuzzyQuery; import org.apache.lucene.search.MultiTermQuery; import org.apache.lucene.search.Query; Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/NumberDateFormat.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/NumberDateFormat.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/NumberDateFormat.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.config; +package org.apache.lucene.queryparser.flexible.standard.config; /** * Licensed to the Apache Software Foundation (ASF) under one or more Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/NumericFieldConfigListener.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/NumericFieldConfigListener.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/NumericFieldConfigListener.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.config; +package org.apache.lucene.queryparser.flexible.standard.config; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -19,10 +19,10 @@ import java.util.Map; -import org.apache.lucene.queryParser.core.config.FieldConfig; -import org.apache.lucene.queryParser.core.config.FieldConfigListener; -import org.apache.lucene.queryParser.core.config.QueryConfigHandler; -import org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler.ConfigurationKeys; +import org.apache.lucene.queryparser.flexible.core.config.FieldConfig; +import org.apache.lucene.queryparser.flexible.core.config.FieldConfigListener; +import org.apache.lucene.queryparser.flexible.core.config.QueryConfigHandler; +import org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler.ConfigurationKeys; public class NumericFieldConfigListener implements FieldConfigListener { Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/FieldDateResolutionFCListener.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/FieldDateResolutionFCListener.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/FieldDateResolutionFCListener.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.config; +package org.apache.lucene.queryparser.flexible.standard.config; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -21,10 +21,10 @@ import org.apache.lucene.document.DateTools; import org.apache.lucene.document.DateTools.Resolution; -import org.apache.lucene.queryParser.core.config.FieldConfig; -import org.apache.lucene.queryParser.core.config.FieldConfigListener; -import org.apache.lucene.queryParser.core.config.QueryConfigHandler; -import org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler.ConfigurationKeys; +import org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler.ConfigurationKeys; +import org.apache.lucene.queryparser.flexible.core.config.FieldConfig; +import org.apache.lucene.queryparser.flexible.core.config.FieldConfigListener; +import org.apache.lucene.queryparser.flexible.core.config.QueryConfigHandler; /** * This listener listens for every field configuration request and assign a Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/FieldBoostMapFCListener.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/FieldBoostMapFCListener.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/FieldBoostMapFCListener.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.config; +package org.apache.lucene.queryparser.flexible.standard.config; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -19,10 +19,10 @@ import java.util.Map; -import org.apache.lucene.queryParser.core.config.FieldConfig; -import org.apache.lucene.queryParser.core.config.FieldConfigListener; -import org.apache.lucene.queryParser.core.config.QueryConfigHandler; -import org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler.ConfigurationKeys; +import org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler.ConfigurationKeys; +import org.apache.lucene.queryparser.flexible.core.config.FieldConfig; +import org.apache.lucene.queryparser.flexible.core.config.FieldConfigListener; +import org.apache.lucene.queryparser.flexible.core.config.QueryConfigHandler; /** * This listener listens for every field configuration request and assign a Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/NumericConfig.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/NumericConfig.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/NumericConfig.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.config; +package org.apache.lucene.queryparser.flexible.standard.config; /** * Licensed to the Apache Software Foundation (ASF) under one or more Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/StandardQueryConfigHandler.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/StandardQueryConfigHandler.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/StandardQueryConfigHandler.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.config; +package org.apache.lucene.queryparser.flexible.standard.config; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -25,11 +25,11 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.document.DateTools; import org.apache.lucene.document.DateTools.Resolution; -import org.apache.lucene.queryParser.core.config.ConfigurationKey; -import org.apache.lucene.queryParser.core.config.FieldConfig; -import org.apache.lucene.queryParser.core.config.QueryConfigHandler; -import org.apache.lucene.queryParser.standard.StandardQueryParser; -import org.apache.lucene.queryParser.standard.processors.StandardQueryNodeProcessorPipeline; +import org.apache.lucene.queryparser.flexible.core.config.ConfigurationKey; +import org.apache.lucene.queryparser.flexible.core.config.FieldConfig; +import org.apache.lucene.queryparser.flexible.core.config.QueryConfigHandler; +import org.apache.lucene.queryparser.flexible.standard.StandardQueryParser; +import org.apache.lucene.queryparser.flexible.standard.processors.StandardQueryNodeProcessorPipeline; import org.apache.lucene.search.MultiTermQuery; import org.apache.lucene.search.MultiTermQuery.RewriteMethod; @@ -80,7 +80,7 @@ /** * Key used to set the default boolean operator * - * @see StandardQueryParser#setDefaultOperator(org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler.Operator) + * @see StandardQueryParser#setDefaultOperator(org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler.Operator) * @see StandardQueryParser#getDefaultOperator() */ final public static ConfigurationKey DEFAULT_OPERATOR = ConfigurationKey.newInstance(); Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/FuzzyConfig.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/FuzzyConfig.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/FuzzyConfig.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.config; +package org.apache.lucene.queryparser.flexible.standard.config; /** * Licensed to the Apache Software Foundation (ASF) under one or more Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/package.html =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/package.html (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/package.html (working copy) @@ -23,7 +23,7 @@

Standard Lucene Query Configuration

-The package org.apache.lucene.queryParser.standard.config contains the Lucene +The package org.apache.lucene.queryparser.flexible.standard.config contains the Lucene query configuration handler (StandardQueryConfigHandler). This configuration handler reproduces almost everything that could be set on the old query parser.

Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/TermRangeQueryNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/TermRangeQueryNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/TermRangeQueryNode.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.nodes; +package org.apache.lucene.queryparser.flexible.standard.nodes; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,12 +17,12 @@ * limitations under the License. */ -import org.apache.lucene.queryParser.core.nodes.FieldQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.FieldQueryNode; /** * This query node represents a range query. * - * @see org.apache.lucene.queryParser.standard.processors.ParametricRangeQueryNodeProcessor + * @see org.apache.lucene.queryparser.flexible.standard.processors.ParametricRangeQueryNodeProcessor * @see org.apache.lucene.search.TermRangeQuery */ public class TermRangeQueryNode extends AbstractRangeQueryNode { Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/PrefixWildcardQueryNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/PrefixWildcardQueryNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/PrefixWildcardQueryNode.java (working copy) @@ -1,6 +1,6 @@ -package org.apache.lucene.queryParser.standard.nodes; +package org.apache.lucene.queryparser.flexible.standard.nodes; -import org.apache.lucene.queryParser.core.nodes.FieldQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.FieldQueryNode; /** * Licensed to the Apache Software Foundation (ASF) under one or more Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/BooleanModifierNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/BooleanModifierNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/BooleanModifierNode.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.nodes; +package org.apache.lucene.queryparser.flexible.standard.nodes; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,9 +17,9 @@ * limitations under the License. */ -import org.apache.lucene.queryParser.core.nodes.ModifierQueryNode; -import org.apache.lucene.queryParser.core.nodes.QueryNode; -import org.apache.lucene.queryParser.standard.processors.GroupQueryNodeProcessor; +import org.apache.lucene.queryparser.flexible.core.nodes.ModifierQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.standard.processors.GroupQueryNodeProcessor; /** * A {@link BooleanModifierNode} has the same behaviour as Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/WildcardQueryNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/WildcardQueryNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/WildcardQueryNode.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.nodes; +package org.apache.lucene.queryparser.flexible.standard.nodes; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,8 +17,8 @@ * limitations under the License. */ -import org.apache.lucene.queryParser.core.nodes.FieldQueryNode; -import org.apache.lucene.queryParser.core.parser.EscapeQuerySyntax; +import org.apache.lucene.queryparser.flexible.core.nodes.FieldQueryNode; +import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; /** * A {@link WildcardQueryNode} represents wildcard query This does not apply to Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/RegexpQueryNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/RegexpQueryNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/RegexpQueryNode.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.nodes; +package org.apache.lucene.queryparser.flexible.standard.nodes; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,10 +17,10 @@ * limitations under the License. */ -import org.apache.lucene.queryParser.core.nodes.FieldableNode; -import org.apache.lucene.queryParser.core.nodes.QueryNodeImpl; -import org.apache.lucene.queryParser.core.nodes.TextableQueryNode; -import org.apache.lucene.queryParser.core.parser.EscapeQuerySyntax; +import org.apache.lucene.queryparser.flexible.core.nodes.FieldableNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNodeImpl; +import org.apache.lucene.queryparser.flexible.core.nodes.TextableQueryNode; +import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; import org.apache.lucene.search.RegexpQuery; import org.apache.lucene.util.BytesRef; Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/RangeQueryNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/RangeQueryNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/RangeQueryNode.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.nodes; +package org.apache.lucene.queryparser.flexible.standard.nodes; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,9 +17,9 @@ * limitations under the License. */ -import org.apache.lucene.queryParser.core.nodes.ParametricQueryNode; -import org.apache.lucene.queryParser.core.nodes.ParametricRangeQueryNode; -import org.apache.lucene.queryParser.standard.processors.ParametricRangeQueryNodeProcessor; +import org.apache.lucene.queryparser.flexible.core.nodes.ParametricQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.ParametricRangeQueryNode; +import org.apache.lucene.queryparser.flexible.standard.processors.ParametricRangeQueryNodeProcessor; /** * This query node represents a range query. Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/MultiPhraseQueryNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/MultiPhraseQueryNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/MultiPhraseQueryNode.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.nodes; +package org.apache.lucene.queryparser.flexible.standard.nodes; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -19,10 +19,10 @@ import java.util.List; -import org.apache.lucene.queryParser.core.nodes.FieldableNode; -import org.apache.lucene.queryParser.core.nodes.QueryNode; -import org.apache.lucene.queryParser.core.nodes.QueryNodeImpl; -import org.apache.lucene.queryParser.core.parser.EscapeQuerySyntax; +import org.apache.lucene.queryparser.flexible.core.nodes.FieldableNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNodeImpl; +import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; import org.apache.lucene.search.MultiPhraseQuery; import org.apache.lucene.search.PhraseQuery; Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/NumericRangeQueryNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/NumericRangeQueryNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/NumericRangeQueryNode.java (working copy) @@ -1,10 +1,10 @@ -package org.apache.lucene.queryParser.standard.nodes; +package org.apache.lucene.queryparser.flexible.standard.nodes; import org.apache.lucene.document.NumericField; import org.apache.lucene.messages.MessageImpl; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.messages.QueryParserMessages; -import org.apache.lucene.queryParser.standard.config.NumericConfig; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages; +import org.apache.lucene.queryparser.flexible.standard.config.NumericConfig; /** * Licensed to the Apache Software Foundation (ASF) under one or more Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/AbstractRangeQueryNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/AbstractRangeQueryNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/AbstractRangeQueryNode.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.nodes; +package org.apache.lucene.queryparser.flexible.standard.nodes; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -19,12 +19,12 @@ import java.util.ArrayList; -import org.apache.lucene.queryParser.core.nodes.FieldValuePairQueryNode; -import org.apache.lucene.queryParser.core.nodes.FieldableNode; -import org.apache.lucene.queryParser.core.nodes.QueryNode; -import org.apache.lucene.queryParser.core.nodes.QueryNodeImpl; -import org.apache.lucene.queryParser.core.parser.EscapeQuerySyntax; -import org.apache.lucene.queryParser.core.util.StringUtils; +import org.apache.lucene.queryparser.flexible.core.nodes.FieldValuePairQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.FieldableNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNodeImpl; +import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; +import org.apache.lucene.queryparser.flexible.core.util.StringUtils; public abstract class AbstractRangeQueryNode> extends QueryNodeImpl implements FieldableNode { Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/StandardBooleanQueryNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/StandardBooleanQueryNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/StandardBooleanQueryNode.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.nodes; +package org.apache.lucene.queryparser.flexible.standard.nodes; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -19,8 +19,8 @@ import java.util.List; -import org.apache.lucene.queryParser.core.nodes.BooleanQueryNode; -import org.apache.lucene.queryParser.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.BooleanQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.SimilarityProvider; Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/NumericQueryNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/NumericQueryNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/NumericQueryNode.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.nodes; +package org.apache.lucene.queryparser.flexible.standard.nodes; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -20,10 +20,10 @@ import java.text.NumberFormat; import java.util.Locale; -import org.apache.lucene.queryParser.core.nodes.FieldValuePairQueryNode; -import org.apache.lucene.queryParser.core.nodes.QueryNodeImpl; -import org.apache.lucene.queryParser.core.parser.EscapeQuerySyntax; -import org.apache.lucene.queryParser.core.parser.EscapeQuerySyntax.Type; +import org.apache.lucene.queryparser.flexible.core.nodes.FieldValuePairQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNodeImpl; +import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; +import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax.Type; public class NumericQueryNode extends QueryNodeImpl implements FieldValuePairQueryNode { Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/package.html =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/package.html (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/package.html (working copy) @@ -23,7 +23,7 @@

Standard Lucene Query Nodes

-The package org.apache.lucene.queryParser.standard.nodes contains QueryNode classes +The package org.apache.lucene.queryparser.flexible.standard.nodes contains QueryNode classes that are used specifically for Lucene query node tree. Any other generic QueryNode is defined under org.apache.lucene.queryParser.nodes.

Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/RangeQueryNodeBuilder.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/RangeQueryNodeBuilder.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/RangeQueryNodeBuilder.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.builders; +package org.apache.lucene.queryparser.flexible.standard.builders; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,12 +17,12 @@ * limitations under the License. */ -import org.apache.lucene.queryParser.core.QueryNodeException; -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.standard.nodes.RangeQueryNode; -import org.apache.lucene.queryParser.standard.processors.MultiTermRewriteMethodProcessor; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.nodes.ParametricQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.ParametricQueryNode.CompareOperator; +import org.apache.lucene.queryparser.flexible.standard.nodes.RangeQueryNode; +import org.apache.lucene.queryparser.flexible.standard.processors.MultiTermRewriteMethodProcessor; import org.apache.lucene.search.MultiTermQuery; import org.apache.lucene.search.TermRangeQuery; Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/GroupQueryNodeBuilder.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/GroupQueryNodeBuilder.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/GroupQueryNodeBuilder.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.builders; +package org.apache.lucene.queryparser.flexible.standard.builders; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,10 +17,10 @@ * limitations under the License. */ -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.builders.QueryTreeBuilder; -import org.apache.lucene.queryParser.core.nodes.GroupQueryNode; -import org.apache.lucene.queryParser.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.builders.QueryTreeBuilder; +import org.apache.lucene.queryparser.flexible.core.nodes.GroupQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; import org.apache.lucene.search.Query; /** Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/MultiPhraseQueryNodeBuilder.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/MultiPhraseQueryNodeBuilder.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/MultiPhraseQueryNodeBuilder.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.builders; +package org.apache.lucene.queryparser.flexible.standard.builders; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -22,11 +22,11 @@ import java.util.TreeMap; import org.apache.lucene.index.Term; -import org.apache.lucene.queryParser.core.QueryNodeException; -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.standard.nodes.MultiPhraseQueryNode; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.builders.QueryTreeBuilder; +import org.apache.lucene.queryparser.flexible.core.nodes.FieldQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.standard.nodes.MultiPhraseQueryNode; import org.apache.lucene.search.MultiPhraseQuery; import org.apache.lucene.search.TermQuery; Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/ModifierQueryNodeBuilder.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/ModifierQueryNodeBuilder.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/ModifierQueryNodeBuilder.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.builders; +package org.apache.lucene.queryparser.flexible.standard.builders; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,10 +17,10 @@ * limitations under the License. */ -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.builders.QueryTreeBuilder; -import org.apache.lucene.queryParser.core.nodes.ModifierQueryNode; -import org.apache.lucene.queryParser.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.builders.QueryTreeBuilder; +import org.apache.lucene.queryparser.flexible.core.nodes.ModifierQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; import org.apache.lucene.search.Query; /** Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/MatchAllDocsQueryNodeBuilder.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/MatchAllDocsQueryNodeBuilder.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/MatchAllDocsQueryNodeBuilder.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.builders; +package org.apache.lucene.queryparser.flexible.standard.builders; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -18,11 +18,11 @@ */ import org.apache.lucene.messages.MessageImpl; -import org.apache.lucene.queryParser.core.QueryNodeException; -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.standard.parser.EscapeQuerySyntaxImpl; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages; +import org.apache.lucene.queryparser.flexible.core.nodes.MatchAllDocsQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.standard.parser.EscapeQuerySyntaxImpl; import org.apache.lucene.search.MatchAllDocsQuery; /** Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/StandardBooleanQueryNodeBuilder.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/StandardBooleanQueryNodeBuilder.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/StandardBooleanQueryNodeBuilder.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.builders; +package org.apache.lucene.queryparser.flexible.standard.builders; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -20,14 +20,14 @@ import java.util.List; import org.apache.lucene.messages.MessageImpl; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.builders.QueryTreeBuilder; -import org.apache.lucene.queryParser.core.messages.QueryParserMessages; -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.standard.nodes.StandardBooleanQueryNode; -import org.apache.lucene.queryParser.standard.parser.EscapeQuerySyntaxImpl; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.builders.QueryTreeBuilder; +import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages; +import org.apache.lucene.queryparser.flexible.core.nodes.ModifierQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.ModifierQueryNode.Modifier; +import org.apache.lucene.queryparser.flexible.standard.nodes.StandardBooleanQueryNode; +import org.apache.lucene.queryparser.flexible.standard.parser.EscapeQuerySyntaxImpl; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.Query; Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/MatchNoDocsQueryNodeBuilder.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/MatchNoDocsQueryNodeBuilder.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/MatchNoDocsQueryNodeBuilder.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.builders; +package org.apache.lucene.queryparser.flexible.standard.builders; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -18,11 +18,11 @@ */ import org.apache.lucene.messages.MessageImpl; -import org.apache.lucene.queryParser.core.QueryNodeException; -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.standard.parser.EscapeQuerySyntaxImpl; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages; +import org.apache.lucene.queryparser.flexible.core.nodes.MatchNoDocsQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.standard.parser.EscapeQuerySyntaxImpl; import org.apache.lucene.search.BooleanQuery; /** Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/PrefixWildcardQueryNodeBuilder.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/PrefixWildcardQueryNodeBuilder.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/PrefixWildcardQueryNodeBuilder.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.builders; +package org.apache.lucene.queryparser.flexible.standard.builders; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -18,10 +18,10 @@ */ import org.apache.lucene.index.Term; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.nodes.QueryNode; -import org.apache.lucene.queryParser.standard.nodes.PrefixWildcardQueryNode; -import org.apache.lucene.queryParser.standard.processors.MultiTermRewriteMethodProcessor; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.standard.nodes.PrefixWildcardQueryNode; +import org.apache.lucene.queryparser.flexible.standard.processors.MultiTermRewriteMethodProcessor; import org.apache.lucene.search.MultiTermQuery; import org.apache.lucene.search.PrefixQuery; Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/StandardQueryTreeBuilder.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/StandardQueryTreeBuilder.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/StandardQueryTreeBuilder.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.builders; +package org.apache.lucene.queryparser.flexible.standard.builders; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,28 +17,28 @@ * limitations under the License. */ -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.builders.QueryTreeBuilder; -import org.apache.lucene.queryParser.core.nodes.BooleanQueryNode; -import org.apache.lucene.queryParser.core.nodes.BoostQueryNode; -import org.apache.lucene.queryParser.core.nodes.FieldQueryNode; -import org.apache.lucene.queryParser.core.nodes.FuzzyQueryNode; -import org.apache.lucene.queryParser.core.nodes.GroupQueryNode; -import org.apache.lucene.queryParser.core.nodes.MatchAllDocsQueryNode; -import org.apache.lucene.queryParser.core.nodes.MatchNoDocsQueryNode; -import org.apache.lucene.queryParser.core.nodes.ModifierQueryNode; -import org.apache.lucene.queryParser.core.nodes.QueryNode; -import org.apache.lucene.queryParser.core.nodes.SlopQueryNode; -import org.apache.lucene.queryParser.core.nodes.TokenizedPhraseQueryNode; -import org.apache.lucene.queryParser.standard.nodes.MultiPhraseQueryNode; -import org.apache.lucene.queryParser.standard.nodes.NumericQueryNode; -import org.apache.lucene.queryParser.standard.nodes.NumericRangeQueryNode; -import org.apache.lucene.queryParser.standard.nodes.PrefixWildcardQueryNode; -import org.apache.lucene.queryParser.standard.nodes.TermRangeQueryNode; -import org.apache.lucene.queryParser.standard.nodes.RegexpQueryNode; -import org.apache.lucene.queryParser.standard.nodes.StandardBooleanQueryNode; -import org.apache.lucene.queryParser.standard.nodes.WildcardQueryNode; -import org.apache.lucene.queryParser.standard.processors.StandardQueryNodeProcessorPipeline; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.builders.QueryTreeBuilder; +import org.apache.lucene.queryparser.flexible.core.nodes.BooleanQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.BoostQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.FieldQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.FuzzyQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.GroupQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.MatchAllDocsQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.MatchNoDocsQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.ModifierQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.SlopQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.TokenizedPhraseQueryNode; +import org.apache.lucene.queryparser.flexible.standard.nodes.MultiPhraseQueryNode; +import org.apache.lucene.queryparser.flexible.standard.nodes.NumericQueryNode; +import org.apache.lucene.queryparser.flexible.standard.nodes.NumericRangeQueryNode; +import org.apache.lucene.queryparser.flexible.standard.nodes.PrefixWildcardQueryNode; +import org.apache.lucene.queryparser.flexible.standard.nodes.TermRangeQueryNode; +import org.apache.lucene.queryparser.flexible.standard.nodes.RegexpQueryNode; +import org.apache.lucene.queryparser.flexible.standard.nodes.StandardBooleanQueryNode; +import org.apache.lucene.queryparser.flexible.standard.nodes.WildcardQueryNode; +import org.apache.lucene.queryparser.flexible.standard.processors.StandardQueryNodeProcessorPipeline; import org.apache.lucene.search.Query; /** Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/package.html =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/package.html (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/package.html (working copy) @@ -23,12 +23,12 @@

Standard Lucene Query Node Builders

-The package org.apache.lucene.queryParser.standard.builders contains all the builders needed +The package org.apache.lucene.queryparser.flexible.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.standard.processors.StandardQueryNodeProcessorPipeline}. +already processed by the {@link org.apache.lucene.queryparser.flexible.standard.processors.StandardQueryNodeProcessorPipeline}.

-{@link org.apache.lucene.queryParser.standard.builders.StandardQueryTreeBuilder} is a builder that already contains a defined map that maps each QueryNode object +{@link org.apache.lucene.queryparser.flexible.standard.builders.StandardQueryTreeBuilder} is a builder that already contains a defined map that maps each QueryNode object with its respective builder.

Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/SlopQueryNodeBuilder.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/SlopQueryNodeBuilder.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/SlopQueryNodeBuilder.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.builders; +package org.apache.lucene.queryparser.flexible.standard.builders; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,10 +17,10 @@ * limitations under the License. */ -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.builders.QueryTreeBuilder; -import org.apache.lucene.queryParser.core.nodes.QueryNode; -import org.apache.lucene.queryParser.core.nodes.SlopQueryNode; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.builders.QueryTreeBuilder; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.SlopQueryNode; import org.apache.lucene.search.MultiPhraseQuery; import org.apache.lucene.search.PhraseQuery; import org.apache.lucene.search.Query; Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/NumericRangeQueryNodeBuilder.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/NumericRangeQueryNodeBuilder.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/NumericRangeQueryNodeBuilder.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.builders; +package org.apache.lucene.queryparser.flexible.standard.builders; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -19,13 +19,13 @@ import org.apache.lucene.document.NumericField; import org.apache.lucene.messages.MessageImpl; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.messages.QueryParserMessages; -import org.apache.lucene.queryParser.core.nodes.QueryNode; -import org.apache.lucene.queryParser.core.util.StringUtils; -import org.apache.lucene.queryParser.standard.config.NumericConfig; -import org.apache.lucene.queryParser.standard.nodes.NumericQueryNode; -import org.apache.lucene.queryParser.standard.nodes.NumericRangeQueryNode; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.util.StringUtils; +import org.apache.lucene.queryparser.flexible.standard.config.NumericConfig; +import org.apache.lucene.queryparser.flexible.standard.nodes.NumericQueryNode; +import org.apache.lucene.queryparser.flexible.standard.nodes.NumericRangeQueryNode; import org.apache.lucene.search.NumericRangeQuery; public class NumericRangeQueryNodeBuilder implements StandardQueryBuilder { Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/BooleanQueryNodeBuilder.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/BooleanQueryNodeBuilder.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/BooleanQueryNodeBuilder.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.builders; +package org.apache.lucene.queryparser.flexible.standard.builders; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -20,13 +20,13 @@ import java.util.List; import org.apache.lucene.messages.MessageImpl; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.builders.QueryTreeBuilder; -import org.apache.lucene.queryParser.core.messages.QueryParserMessages; -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.standard.parser.EscapeQuerySyntaxImpl; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.builders.QueryTreeBuilder; +import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages; +import org.apache.lucene.queryparser.flexible.core.nodes.BooleanQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.ModifierQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.standard.parser.EscapeQuerySyntaxImpl; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.Query; Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/PhraseQueryNodeBuilder.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/PhraseQueryNodeBuilder.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/PhraseQueryNodeBuilder.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.builders; +package org.apache.lucene.queryparser.flexible.standard.builders; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -19,11 +19,11 @@ import java.util.List; -import org.apache.lucene.queryParser.core.QueryNodeException; -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.core.nodes.TokenizedPhraseQueryNode; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.builders.QueryTreeBuilder; +import org.apache.lucene.queryparser.flexible.core.nodes.FieldQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.TokenizedPhraseQueryNode; import org.apache.lucene.search.PhraseQuery; import org.apache.lucene.search.TermQuery; Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/FieldQueryNodeBuilder.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/FieldQueryNodeBuilder.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/FieldQueryNodeBuilder.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.builders; +package org.apache.lucene.queryparser.flexible.standard.builders; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -18,9 +18,9 @@ */ import org.apache.lucene.index.Term; -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.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.nodes.FieldQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; import org.apache.lucene.search.TermQuery; /** Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/TermRangeQueryNodeBuilder.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/TermRangeQueryNodeBuilder.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/TermRangeQueryNodeBuilder.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.builders; +package org.apache.lucene.queryparser.flexible.standard.builders; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,12 +17,12 @@ * limitations under the License. */ -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.core.util.StringUtils; -import org.apache.lucene.queryParser.standard.nodes.TermRangeQueryNode; -import org.apache.lucene.queryParser.standard.processors.MultiTermRewriteMethodProcessor; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.nodes.FieldQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.util.StringUtils; +import org.apache.lucene.queryparser.flexible.standard.nodes.TermRangeQueryNode; +import org.apache.lucene.queryparser.flexible.standard.processors.MultiTermRewriteMethodProcessor; import org.apache.lucene.search.MultiTermQuery; import org.apache.lucene.search.TermRangeQuery; Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/BoostQueryNodeBuilder.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/BoostQueryNodeBuilder.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/BoostQueryNodeBuilder.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.builders; +package org.apache.lucene.queryparser.flexible.standard.builders; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,10 +17,10 @@ * limitations under the License. */ -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.builders.QueryTreeBuilder; -import org.apache.lucene.queryParser.core.nodes.BoostQueryNode; -import org.apache.lucene.queryParser.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.builders.QueryTreeBuilder; +import org.apache.lucene.queryparser.flexible.core.nodes.BoostQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; import org.apache.lucene.search.Query; /** Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/FuzzyQueryNodeBuilder.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/FuzzyQueryNodeBuilder.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/FuzzyQueryNodeBuilder.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.builders; +package org.apache.lucene.queryparser.flexible.standard.builders; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -18,9 +18,9 @@ */ import org.apache.lucene.index.Term; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.nodes.FuzzyQueryNode; -import org.apache.lucene.queryParser.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.nodes.FuzzyQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; import org.apache.lucene.search.FuzzyQuery; /** Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/AnyQueryNodeBuilder.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/AnyQueryNodeBuilder.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/AnyQueryNodeBuilder.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.builders; +package org.apache.lucene.queryparser.flexible.standard.builders; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -20,11 +20,11 @@ import java.util.List; import org.apache.lucene.messages.MessageImpl; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.builders.QueryTreeBuilder; -import org.apache.lucene.queryParser.core.messages.QueryParserMessages; -import org.apache.lucene.queryParser.core.nodes.AnyQueryNode; -import org.apache.lucene.queryParser.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.builders.QueryTreeBuilder; +import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages; +import org.apache.lucene.queryparser.flexible.core.nodes.AnyQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.Query; Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/WildcardQueryNodeBuilder.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/WildcardQueryNodeBuilder.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/WildcardQueryNodeBuilder.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.builders; +package org.apache.lucene.queryparser.flexible.standard.builders; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -18,10 +18,10 @@ */ import org.apache.lucene.index.Term; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.nodes.QueryNode; -import org.apache.lucene.queryParser.standard.nodes.WildcardQueryNode; -import org.apache.lucene.queryParser.standard.processors.MultiTermRewriteMethodProcessor; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.standard.nodes.WildcardQueryNode; +import org.apache.lucene.queryparser.flexible.standard.processors.MultiTermRewriteMethodProcessor; import org.apache.lucene.search.MultiTermQuery; import org.apache.lucene.search.WildcardQuery; Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/RegexpQueryNodeBuilder.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/RegexpQueryNodeBuilder.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/RegexpQueryNodeBuilder.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.builders; +package org.apache.lucene.queryparser.flexible.standard.builders; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -18,10 +18,10 @@ */ import org.apache.lucene.index.Term; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.nodes.QueryNode; -import org.apache.lucene.queryParser.standard.nodes.RegexpQueryNode; -import org.apache.lucene.queryParser.standard.processors.MultiTermRewriteMethodProcessor; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.standard.nodes.RegexpQueryNode; +import org.apache.lucene.queryparser.flexible.standard.processors.MultiTermRewriteMethodProcessor; import org.apache.lucene.search.MultiTermQuery; import org.apache.lucene.search.RegexpQuery; Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/StandardQueryBuilder.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/StandardQueryBuilder.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/StandardQueryBuilder.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.builders; +package org.apache.lucene.queryparser.flexible.standard.builders; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,10 +17,10 @@ * limitations under the License. */ -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.builders.QueryBuilder; -import org.apache.lucene.queryParser.core.builders.QueryTreeBuilder; -import org.apache.lucene.queryParser.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.builders.QueryBuilder; +import org.apache.lucene.queryparser.flexible.core.builders.QueryTreeBuilder; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; import org.apache.lucene.search.Query; /** Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/DummyQueryNodeBuilder.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/DummyQueryNodeBuilder.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/DummyQueryNodeBuilder.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.builders; +package org.apache.lucene.queryparser.flexible.standard.builders; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,9 +17,9 @@ * limitations under the License. */ -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.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.nodes.FieldQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; import org.apache.lucene.search.TermQuery; /** Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/EscapeQuerySyntaxImpl.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/EscapeQuerySyntaxImpl.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/EscapeQuerySyntaxImpl.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.standard.parser; +package org.apache.lucene.queryparser.flexible.standard.parser; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -20,9 +20,9 @@ import java.util.Locale; import org.apache.lucene.messages.MessageImpl; -import org.apache.lucene.queryParser.core.messages.QueryParserMessages; -import org.apache.lucene.queryParser.core.parser.EscapeQuerySyntax; -import org.apache.lucene.queryParser.core.util.UnescapedCharSequence; +import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages; +import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; +import org.apache.lucene.queryparser.flexible.core.util.UnescapedCharSequence; /** */ Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParserTokenManager.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParserTokenManager.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParserTokenManager.java (working copy) @@ -1,5 +1,5 @@ /* Generated By:JavaCC: Do not edit this line. StandardSyntaxParserTokenManager.java */ -package org.apache.lucene.queryParser.standard.parser; +package org.apache.lucene.queryparser.flexible.standard.parser; /** * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -23,28 +23,28 @@ import java.util.Vector; import org.apache.lucene.messages.Message; import org.apache.lucene.messages.MessageImpl; -import org.apache.lucene.queryParser.core.QueryNodeError; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.QueryNodeParseException; -import org.apache.lucene.queryParser.core.messages.QueryParserMessages; -import org.apache.lucene.queryParser.core.nodes.AndQueryNode; -import org.apache.lucene.queryParser.core.nodes.BooleanQueryNode; -import org.apache.lucene.queryParser.core.nodes.BoostQueryNode; -import org.apache.lucene.queryParser.core.nodes.FieldQueryNode; -import org.apache.lucene.queryParser.core.nodes.FuzzyQueryNode; -import org.apache.lucene.queryParser.core.nodes.ModifierQueryNode; -import org.apache.lucene.queryParser.core.nodes.GroupQueryNode; -import org.apache.lucene.queryParser.core.nodes.OpaqueQueryNode; -import org.apache.lucene.queryParser.core.nodes.OrQueryNode; -import org.apache.lucene.queryParser.core.nodes.ParametricQueryNode; -import org.apache.lucene.queryParser.core.nodes.ParametricRangeQueryNode; -import org.apache.lucene.queryParser.standard.nodes.RegexpQueryNode; -import org.apache.lucene.queryParser.core.nodes.SlopQueryNode; -import org.apache.lucene.queryParser.core.nodes.ProximityQueryNode; -import org.apache.lucene.queryParser.core.nodes.QueryNode; -import org.apache.lucene.queryParser.core.nodes.QueryNodeImpl; -import org.apache.lucene.queryParser.core.nodes.QuotedFieldQueryNode; -import org.apache.lucene.queryParser.core.parser.SyntaxParser; +import org.apache.lucene.queryparser.flexible.core.QueryNodeError; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.QueryNodeParseException; +import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages; +import org.apache.lucene.queryparser.flexible.core.nodes.AndQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.BooleanQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.BoostQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.FieldQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.FuzzyQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.ModifierQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.GroupQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.OpaqueQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.OrQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.ParametricQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.ParametricRangeQueryNode; +import org.apache.lucene.queryparser.flexible.standard.nodes.RegexpQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.SlopQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.ProximityQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNodeImpl; +import org.apache.lucene.queryparser.flexible.core.nodes.QuotedFieldQueryNode; +import org.apache.lucene.queryparser.flexible.core.parser.SyntaxParser; /** Token Manager. */ public class StandardSyntaxParserTokenManager implements StandardSyntaxParserConstants Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/Token.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/Token.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/Token.java (working copy) @@ -1,6 +1,6 @@ /* Generated By:JavaCC: Do not edit this line. Token.java Version 4.1 */ /* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COL=null */ -package org.apache.lucene.queryParser.standard.parser; +package org.apache.lucene.queryparser.flexible.standard.parser; /** * Describes the input token stream. Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/TokenMgrError.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/TokenMgrError.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/TokenMgrError.java (working copy) @@ -1,6 +1,6 @@ /* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 4.1 */ /* JavaCCOptions: */ -package org.apache.lucene.queryParser.standard.parser; +package org.apache.lucene.queryparser.flexible.standard.parser; /** Token Manager Error. */ @SuppressWarnings("serial") Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParserConstants.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParserConstants.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParserConstants.java (working copy) @@ -1,5 +1,5 @@ /* Generated By:JavaCC: Do not edit this line. StandardSyntaxParserConstants.java */ -package org.apache.lucene.queryParser.standard.parser; +package org.apache.lucene.queryparser.flexible.standard.parser; /** Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.java (working copy) @@ -1,5 +1,5 @@ /* Generated By:JavaCC: Do not edit this line. StandardSyntaxParser.java */ -package org.apache.lucene.queryParser.standard.parser; +package org.apache.lucene.queryparser.flexible.standard.parser; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -25,28 +25,28 @@ import org.apache.lucene.messages.Message; import org.apache.lucene.messages.MessageImpl; -import org.apache.lucene.queryParser.core.QueryNodeError; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.QueryNodeParseException; -import org.apache.lucene.queryParser.core.messages.QueryParserMessages; -import org.apache.lucene.queryParser.core.nodes.AndQueryNode; -import org.apache.lucene.queryParser.core.nodes.BooleanQueryNode; -import org.apache.lucene.queryParser.core.nodes.BoostQueryNode; -import org.apache.lucene.queryParser.core.nodes.FieldQueryNode; -import org.apache.lucene.queryParser.core.nodes.FuzzyQueryNode; -import org.apache.lucene.queryParser.core.nodes.ModifierQueryNode; -import org.apache.lucene.queryParser.core.nodes.GroupQueryNode; -import org.apache.lucene.queryParser.core.nodes.OpaqueQueryNode; -import org.apache.lucene.queryParser.core.nodes.OrQueryNode; -import org.apache.lucene.queryParser.core.nodes.ParametricQueryNode; -import org.apache.lucene.queryParser.core.nodes.ParametricRangeQueryNode; -import org.apache.lucene.queryParser.standard.nodes.RegexpQueryNode; -import org.apache.lucene.queryParser.core.nodes.SlopQueryNode; -import org.apache.lucene.queryParser.core.nodes.ProximityQueryNode; -import org.apache.lucene.queryParser.core.nodes.QueryNode; -import org.apache.lucene.queryParser.core.nodes.QueryNodeImpl; -import org.apache.lucene.queryParser.core.nodes.QuotedFieldQueryNode; -import org.apache.lucene.queryParser.core.parser.SyntaxParser; +import org.apache.lucene.queryparser.flexible.core.QueryNodeError; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.QueryNodeParseException; +import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages; +import org.apache.lucene.queryparser.flexible.core.nodes.AndQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.BooleanQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.BoostQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.FieldQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.FuzzyQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.ModifierQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.GroupQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.OpaqueQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.OrQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.ParametricQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.ParametricRangeQueryNode; +import org.apache.lucene.queryparser.flexible.standard.nodes.RegexpQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.SlopQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.ProximityQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNodeImpl; +import org.apache.lucene.queryparser.flexible.core.nodes.QuotedFieldQueryNode; +import org.apache.lucene.queryparser.flexible.core.parser.SyntaxParser; public class StandardSyntaxParser implements SyntaxParser, StandardSyntaxParserConstants { @@ -59,7 +59,7 @@ public StandardSyntaxParser() { this(new StringReader("")); } - /** Parses a query string, returning a {@link org.apache.lucene.queryParser.core.nodes.QueryNode}. + /** Parses a query string, returning a {@link org.apache.lucene.queryparser.flexible.core.nodes.QueryNode}. * @param query the query string to be parsed. * @throws ParseException if the parsing fails */ Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.jj =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.jj (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.jj (working copy) @@ -11,7 +11,7 @@ } PARSER_BEGIN(StandardSyntaxParser) -package org.apache.lucene.queryParser.standard.parser; +package org.apache.lucene.queryparser.flexible.standard.parser; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -37,28 +37,28 @@ import org.apache.lucene.messages.Message; import org.apache.lucene.messages.MessageImpl; -import org.apache.lucene.queryParser.core.QueryNodeError; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.QueryNodeParseException; -import org.apache.lucene.queryParser.core.messages.QueryParserMessages; -import org.apache.lucene.queryParser.core.nodes.AndQueryNode; -import org.apache.lucene.queryParser.core.nodes.BooleanQueryNode; -import org.apache.lucene.queryParser.core.nodes.BoostQueryNode; -import org.apache.lucene.queryParser.core.nodes.FieldQueryNode; -import org.apache.lucene.queryParser.core.nodes.FuzzyQueryNode; -import org.apache.lucene.queryParser.core.nodes.ModifierQueryNode; -import org.apache.lucene.queryParser.core.nodes.GroupQueryNode; -import org.apache.lucene.queryParser.core.nodes.OpaqueQueryNode; -import org.apache.lucene.queryParser.core.nodes.OrQueryNode; -import org.apache.lucene.queryParser.core.nodes.ParametricQueryNode; -import org.apache.lucene.queryParser.core.nodes.ParametricRangeQueryNode; -import org.apache.lucene.queryParser.standard.nodes.RegexpQueryNode; -import org.apache.lucene.queryParser.core.nodes.SlopQueryNode; -import org.apache.lucene.queryParser.core.nodes.ProximityQueryNode; -import org.apache.lucene.queryParser.core.nodes.QueryNode; -import org.apache.lucene.queryParser.core.nodes.QueryNodeImpl; -import org.apache.lucene.queryParser.core.nodes.QuotedFieldQueryNode; -import org.apache.lucene.queryParser.core.parser.SyntaxParser; +import org.apache.lucene.queryparser.flexible.core.QueryNodeError; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.QueryNodeParseException; +import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages; +import org.apache.lucene.queryparser.flexible.core.nodes.AndQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.BooleanQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.BoostQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.FieldQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.FuzzyQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.ModifierQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.GroupQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.OpaqueQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.OrQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.ParametricQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.ParametricRangeQueryNode; +import org.apache.lucene.queryparser.flexible.standard.nodes.RegexpQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.SlopQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.ProximityQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNodeImpl; +import org.apache.lucene.queryparser.flexible.core.nodes.QuotedFieldQueryNode; +import org.apache.lucene.queryparser.flexible.core.parser.SyntaxParser; public class StandardSyntaxParser implements SyntaxParser { Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/ParseException.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/ParseException.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/ParseException.java (working copy) @@ -1,11 +1,11 @@ /* Generated By:JavaCC: Do not edit this line. ParseException.java Version 4.1 */ /* JavaCCOptions:KEEP_LINE_COL=null */ -package org.apache.lucene.queryParser.standard.parser; +package org.apache.lucene.queryparser.flexible.standard.parser; import org.apache.lucene.messages.Message; import org.apache.lucene.messages.MessageImpl; - import org.apache.lucene.queryParser.core.*; - import org.apache.lucene.queryParser.core.messages.*; + import org.apache.lucene.queryparser.flexible.core.QueryNodeParseException; + import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages; /** * This exception is thrown when parse errors are encountered. Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/JavaCharStream.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/JavaCharStream.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/JavaCharStream.java (working copy) @@ -1,6 +1,6 @@ /* Generated By:JavaCC: Do not edit this line. JavaCharStream.java Version 4.1 */ /* JavaCCOptions:STATIC=false */ -package org.apache.lucene.queryParser.standard.parser; +package org.apache.lucene.queryparser.flexible.standard.parser; /** * An implementation of interface CharStream, where the stream is assumed to Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/package.html =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/package.html (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/package.html (working copy) @@ -23,7 +23,7 @@

Lucene Query Parser

-The package org.apache.lucene.queryParser.standard.parser contains the query parser. +The package org.apache.lucene.queryparser.flexible.standard.parser contains the query parser.

This text parser only performs the syntax validation and creates an QueryNode tree Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/package.html =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/package.html (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/package.html (working copy) @@ -36,7 +36,7 @@

-Check org.apache.lucene.queryParser.standard.StandardQueryParser to quick start using the Lucene query parser. +Check org.apache.lucene.queryparser.flexible.standard.StandardQueryParser to quick start using the Lucene query parser.

Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryParserHelper.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryParserHelper.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryParserHelper.java (working copy) @@ -1,5 +1,11 @@ -package org.apache.lucene.queryParser.core; +package org.apache.lucene.queryparser.flexible.core; +import org.apache.lucene.queryparser.flexible.core.builders.QueryBuilder; +import org.apache.lucene.queryparser.flexible.core.config.QueryConfigHandler; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.parser.SyntaxParser; +import org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessor; + /** * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,12 +23,7 @@ * limitations under the License. */ -import org.apache.lucene.queryParser.core.builders.QueryBuilder; -import org.apache.lucene.queryParser.core.config.QueryConfigHandler; -import org.apache.lucene.queryParser.core.nodes.QueryNode; -import org.apache.lucene.queryParser.core.parser.SyntaxParser; -import org.apache.lucene.queryParser.core.processors.QueryNodeProcessor; - + /** *

* This class is a helper for the query parser framework, it does all the three Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/QueryNodeProcessorPipeline.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/QueryNodeProcessorPipeline.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/QueryNodeProcessorPipeline.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.processors; +package org.apache.lucene.queryparser.flexible.core.processors; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -19,9 +19,9 @@ import java.util.*; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.config.QueryConfigHandler; -import org.apache.lucene.queryParser.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.config.QueryConfigHandler; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; /** * A {@link QueryNodeProcessorPipeline} class should be used to build a query Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/NoChildOptimizationQueryNodeProcessor.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/NoChildOptimizationQueryNodeProcessor.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/NoChildOptimizationQueryNodeProcessor.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.processors; +package org.apache.lucene.queryparser.flexible.core.processors; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -19,14 +19,8 @@ import java.util.List; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.nodes.BooleanQueryNode; -import org.apache.lucene.queryParser.core.nodes.BoostQueryNode; -import org.apache.lucene.queryParser.core.nodes.DeletedQueryNode; -import org.apache.lucene.queryParser.core.nodes.MatchNoDocsQueryNode; -import org.apache.lucene.queryParser.core.nodes.ModifierQueryNode; -import org.apache.lucene.queryParser.core.nodes.QueryNode; -import org.apache.lucene.queryParser.core.nodes.TokenizedPhraseQueryNode; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.nodes.*; /** *

Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/RemoveDeletedQueryNodesProcessor.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/RemoveDeletedQueryNodesProcessor.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/RemoveDeletedQueryNodesProcessor.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.processors; +package org.apache.lucene.queryparser.flexible.core.processors; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -20,10 +20,10 @@ import java.util.Iterator; import java.util.List; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.nodes.DeletedQueryNode; -import org.apache.lucene.queryParser.core.nodes.MatchNoDocsQueryNode; -import org.apache.lucene.queryParser.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.nodes.DeletedQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.MatchNoDocsQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; /** * A {@link QueryNodeProcessorPipeline} class removes every instance of Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/QueryNodeProcessor.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/QueryNodeProcessor.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/QueryNodeProcessor.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.processors; +package org.apache.lucene.queryparser.flexible.core.processors; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,9 +17,9 @@ * limitations under the License. */ -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.config.QueryConfigHandler; -import org.apache.lucene.queryParser.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.config.QueryConfigHandler; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; /** *

Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/QueryNodeProcessorImpl.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/QueryNodeProcessorImpl.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/QueryNodeProcessorImpl.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.processors; +package org.apache.lucene.queryparser.flexible.core.processors; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -20,9 +20,9 @@ import java.util.ArrayList; import java.util.List; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.config.QueryConfigHandler; -import org.apache.lucene.queryParser.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.config.QueryConfigHandler; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; /** *

@@ -69,7 +69,7 @@ * postProcessNode( a ) * * - * @see org.apache.lucene.queryParser.core.processors.QueryNodeProcessor + * @see org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessor */ public abstract class QueryNodeProcessorImpl implements QueryNodeProcessor { Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/package.html =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/package.html (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/package.html (working copy) @@ -29,28 +29,28 @@ that should be implemented by every query node processor.

-The interface that every query node processor should implement is {@link org.apache.lucene.queryParser.core.processors.QueryNodeProcessor}. +The interface that every query node processor should implement is {@link org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessor}.

-A query node processor should be used to process a {@link org.apache.lucene.queryParser.core.nodes.QueryNode} tree. -{@link org.apache.lucene.queryParser.core.nodes.QueryNode} trees can be programmatically created or generated by a -text parser. See {@link org.apache.lucene.queryParser.core.parser} for more details about text parsers. +A query node processor should be used to process a {@link org.apache.lucene.queryparser.flexible.core.nodes.QueryNode} tree. +{@link org.apache.lucene.queryparser.flexible.core.nodes.QueryNode} trees can be programmatically created or generated by a +text parser. See {@link org.apache.lucene.queryparser.flexible.core.parser} for more details about text parsers.

-A query node processor should be used to process a {@link org.apache.lucene.queryParser.core.nodes.QueryNode} tree. -{@link org.apache.lucene.queryParser.core.nodes.QueryNode} trees can be programmatically created or generated by a -text parser. See {@link org.apache.lucene.queryParser.core.parser} for more details about text parsers. +A query node processor should be used to process a {@link org.apache.lucene.queryparser.flexible.core.nodes.QueryNode} tree. +{@link org.apache.lucene.queryparser.flexible.core.nodes.QueryNode} trees can be programmatically created or generated by a +text parser. See {@link org.apache.lucene.queryparser.flexible.core.parser} for more details about text parsers.

-A pipeline of processors can be assembled using {@link org.apache.lucene.queryParser.core.processors.QueryNodeProcessorPipeline}. +A pipeline of processors can be assembled using {@link org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessorPipeline}.

-Implementors may want to extend {@link org.apache.lucene.queryParser.core.processors.QueryNodeProcessorImpl}, which simplifies -the implementation, because it walks automatically the {@link org.apache.lucene.queryParser.core.nodes.QueryNode}. See -{@link org.apache.lucene.queryParser.core.processors.QueryNodeProcessorImpl} for more details. +Implementors may want to extend {@link org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessorImpl}, which simplifies +the implementation, because it walks automatically the {@link org.apache.lucene.queryparser.flexible.core.nodes.QueryNode}. See +{@link org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessorImpl} for more details.

Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryNodeError.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryNodeError.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryNodeError.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core; +package org.apache.lucene.queryparser.flexible.core; /** * Licensed to the Apache Software Foundation (ASF) under one or more Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryNodeParseException.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryNodeParseException.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryNodeParseException.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core; +package org.apache.lucene.queryparser.flexible.core; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -19,9 +19,9 @@ import org.apache.lucene.messages.Message; import org.apache.lucene.messages.MessageImpl; -import org.apache.lucene.queryParser.core.messages.QueryParserMessages; -import org.apache.lucene.queryParser.core.nodes.QueryNode; -import org.apache.lucene.queryParser.core.parser.SyntaxParser; +import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages; +import org.apache.lucene.queryparser.flexible.core.parser.SyntaxParser; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; /** * This should be thrown when an exception happens during the query parsing from Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/AbstractQueryConfig.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/AbstractQueryConfig.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/AbstractQueryConfig.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.config; +package org.apache.lucene.queryparser.flexible.core.config; /** * Licensed to the Apache Software Foundation (ASF) under one or more Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/FieldConfigListener.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/FieldConfigListener.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/FieldConfigListener.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.config; +package org.apache.lucene.queryparser.flexible.core.config; /** * Licensed to the Apache Software Foundation (ASF) under one or more Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/ConfigurationKey.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/ConfigurationKey.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/ConfigurationKey.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.config; +package org.apache.lucene.queryparser.flexible.core.config; /** * Licensed to the Apache Software Foundation (ASF) under one or more Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/FieldConfig.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/FieldConfig.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/FieldConfig.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.config; +package org.apache.lucene.queryparser.flexible.core.config; /** * Licensed to the Apache Software Foundation (ASF) under one or more Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/QueryConfigHandler.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/QueryConfigHandler.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/QueryConfigHandler.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.config; +package org.apache.lucene.queryparser.flexible.core.config; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -19,8 +19,8 @@ import java.util.LinkedList; -import org.apache.lucene.queryParser.core.processors.QueryNodeProcessor; -import org.apache.lucene.queryParser.core.util.StringUtils; +import org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessor; +import org.apache.lucene.queryparser.flexible.core.util.StringUtils; /** * This class can be used to hold any query configuration and no field Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/package.html =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/package.html (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/package.html (working copy) @@ -25,19 +25,19 @@

Query Configuration Interfaces

-The package org.apache.lucene.queryParser.config contains query configuration handler +The package org.apache.lucene.queryparser.flexible.config contains query configuration handler abstract class that all config handlers should extend.

-See {@link org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler} for a reference +See {@link org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler} for a reference implementation.

-The {@link org.apache.lucene.queryParser.core.config.QueryConfigHandler} and {@link org.apache.lucene.queryParser.core.config.FieldConfig} are used in the processors to access config +The {@link org.apache.lucene.queryparser.flexible.core.config.QueryConfigHandler} and {@link org.apache.lucene.queryparser.flexible.core.config.FieldConfig} are used in the processors to access config information in a flexible and independent way. -See {@link org.apache.lucene.queryParser.standard.processors.ParametricRangeQueryNodeProcessor} for a +See {@link org.apache.lucene.queryparser.flexible.standard.processors.ParametricRangeQueryNodeProcessor} for a reference implementation.

- Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/messages/QueryParserMessages.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/messages/QueryParserMessages.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/messages/QueryParserMessages.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.messages; +package org.apache.lucene.queryparser.flexible.core.messages; /** * Licensed to the Apache Software Foundation (ASF) under one or more Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/ParametricRangeQueryNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/ParametricRangeQueryNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/ParametricRangeQueryNode.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.nodes; +package org.apache.lucene.queryparser.flexible.core.nodes; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,10 +17,10 @@ * limitations under the License. */ +import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; + import java.util.List; -import org.apache.lucene.queryParser.core.nodes.ParametricQueryNode.CompareOperator; -import org.apache.lucene.queryParser.core.parser.EscapeQuerySyntax; /** * A {@link ParametricRangeQueryNode} represents LE, LT, GE, GT, EQ, NE query. @@ -32,16 +32,16 @@ public ParametricRangeQueryNode(ParametricQueryNode lowerBound, ParametricQueryNode upperBound) { - if (upperBound.getOperator() != CompareOperator.LE - && upperBound.getOperator() != CompareOperator.LT) { + if (upperBound.getOperator() != ParametricQueryNode.CompareOperator.LE + && upperBound.getOperator() != ParametricQueryNode.CompareOperator.LT) { throw new IllegalArgumentException("upper bound should have " - + CompareOperator.LE + " or " + CompareOperator.LT); + + ParametricQueryNode.CompareOperator.LE + " or " + ParametricQueryNode.CompareOperator.LT); } - if (lowerBound.getOperator() != CompareOperator.GE - && lowerBound.getOperator() != CompareOperator.GT) { + if (lowerBound.getOperator() != ParametricQueryNode.CompareOperator.GE + && lowerBound.getOperator() != ParametricQueryNode.CompareOperator.GT) { throw new IllegalArgumentException("lower bound should have " - + CompareOperator.GE + " or " + CompareOperator.GT); + + ParametricQueryNode.CompareOperator.GE + " or " + ParametricQueryNode.CompareOperator.GT); } if (upperBound.getField() != lowerBound.getField() Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/ProximityQueryNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/ProximityQueryNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/ProximityQueryNode.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.nodes; +package org.apache.lucene.queryparser.flexible.core.nodes; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -20,9 +20,9 @@ import java.util.List; import org.apache.lucene.messages.MessageImpl; -import org.apache.lucene.queryParser.core.QueryNodeError; -import org.apache.lucene.queryParser.core.messages.QueryParserMessages; -import org.apache.lucene.queryParser.core.parser.EscapeQuerySyntax; +import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; +import org.apache.lucene.queryparser.flexible.core.QueryNodeError; +import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages; /** * A {@link ProximityQueryNode} represents a query where the terms should meet Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/QuotedFieldQueryNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/QuotedFieldQueryNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/QuotedFieldQueryNode.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.nodes; +package org.apache.lucene.queryparser.flexible.core.nodes; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,7 +17,7 @@ * limitations under the License. */ -import org.apache.lucene.queryParser.core.parser.EscapeQuerySyntax; +import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; /** * A {@link QuotedFieldQueryNode} represents phrase query. Example: Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/DeletedQueryNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/DeletedQueryNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/DeletedQueryNode.java (working copy) @@ -1,5 +1,7 @@ -package org.apache.lucene.queryParser.core.nodes; +package org.apache.lucene.queryparser.flexible.core.nodes; +import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; + /** * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,8 +19,7 @@ * limitations under the License. */ -import org.apache.lucene.queryParser.core.parser.EscapeQuerySyntax; -import org.apache.lucene.queryParser.core.processors.RemoveDeletedQueryNodesProcessor; +import org.apache.lucene.queryparser.flexible.core.processors.RemoveDeletedQueryNodesProcessor; /** * A {@link DeletedQueryNode} represents a node that was deleted from the query Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/TextableQueryNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/TextableQueryNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/TextableQueryNode.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.nodes; +package org.apache.lucene.queryparser.flexible.core.nodes; /** * Licensed to the Apache Software Foundation (ASF) under one or more Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/NoTokenFoundQueryNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/NoTokenFoundQueryNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/NoTokenFoundQueryNode.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.nodes; +package org.apache.lucene.queryparser.flexible.core.nodes; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,7 +17,7 @@ * limitations under the License. */ -import org.apache.lucene.queryParser.core.parser.EscapeQuerySyntax; +import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; /** * A {@link NoTokenFoundQueryNode} is used if a term is convert into no tokens Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/ValueQueryNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/ValueQueryNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/ValueQueryNode.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.nodes; +package org.apache.lucene.queryparser.flexible.core.nodes; /** * Licensed to the Apache Software Foundation (ASF) under one or more Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/SlopQueryNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/SlopQueryNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/SlopQueryNode.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.nodes; +package org.apache.lucene.queryparser.flexible.core.nodes; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -18,9 +18,9 @@ */ import org.apache.lucene.messages.MessageImpl; -import org.apache.lucene.queryParser.core.QueryNodeError; -import org.apache.lucene.queryParser.core.messages.QueryParserMessages; -import org.apache.lucene.queryParser.core.parser.EscapeQuerySyntax; +import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; +import org.apache.lucene.queryparser.flexible.core.QueryNodeError; +import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages; /** * A {@link SlopQueryNode} represents phrase query with a slop. Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/BooleanQueryNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/BooleanQueryNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/BooleanQueryNode.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.nodes; +package org.apache.lucene.queryparser.flexible.core.nodes; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,9 +17,10 @@ * limitations under the License. */ +import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; + import java.util.List; -import org.apache.lucene.queryParser.core.parser.EscapeQuerySyntax; /** * A {@link BooleanQueryNode} represents a list of elements which do not have an Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/QueryNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/QueryNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/QueryNode.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.nodes; +package org.apache.lucene.queryparser.flexible.core.nodes; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,10 +17,11 @@ * limitations under the License. */ +import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; + import java.util.List; import java.util.Map; -import org.apache.lucene.queryParser.core.parser.EscapeQuerySyntax; /** * A {@link QueryNode} is a interface implemented by all nodes on a QueryNode Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/OrQueryNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/OrQueryNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/OrQueryNode.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.nodes; +package org.apache.lucene.queryparser.flexible.core.nodes; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -20,7 +20,7 @@ import java.util.Iterator; import java.util.List; -import org.apache.lucene.queryParser.core.parser.EscapeQuerySyntax; +import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; /** * A {@link OrQueryNode} represents an OR boolean operation performed on a list Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/PhraseSlopQueryNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/PhraseSlopQueryNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/PhraseSlopQueryNode.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.nodes; +package org.apache.lucene.queryparser.flexible.core.nodes; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -18,11 +18,11 @@ */ import org.apache.lucene.messages.MessageImpl; -import org.apache.lucene.queryParser.core.QueryNodeError; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.QueryNodeParseException; -import org.apache.lucene.queryParser.core.messages.QueryParserMessages; -import org.apache.lucene.queryParser.core.parser.EscapeQuerySyntax; +import org.apache.lucene.queryparser.flexible.core.QueryNodeError; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages; +import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; +import org.apache.lucene.queryparser.flexible.core.QueryNodeParseException; public class PhraseSlopQueryNode extends QueryNodeImpl implements FieldableNode { Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/FieldableNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/FieldableNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/FieldableNode.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.nodes; +package org.apache.lucene.queryparser.flexible.core.nodes; /** * Licensed to the Apache Software Foundation (ASF) under one or more Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/package.html =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/package.html (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/package.html (working copy) @@ -26,17 +26,17 @@

Query Nodes

The package org.apache.lucene.queryParser.nodes contains all the basic query nodes. The interface -that represents a query node is {@link org.apache.lucene.queryParser.core.nodes.QueryNode}. +that represents a query node is {@link org.apache.lucene.queryparser.flexible.core.nodes.QueryNode}.

-{@link org.apache.lucene.queryParser.core.nodes.QueryNode}s are used by the text parser to create a syntax tree. +{@link org.apache.lucene.queryparser.flexible.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.standard.parser.StandardSyntaxParser}, +The default Lucene text parser is {@link org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser}, it implements Lucene's standard syntax.

-{@link org.apache.lucene.queryParser.core.nodes.QueryNode} interface should be implemented by all query nodes, -the class {@link org.apache.lucene.queryParser.core.nodes.QueryNodeImpl} implements {@link org.apache.lucene.queryParser.core.nodes.QueryNode} and is extended +{@link org.apache.lucene.queryparser.flexible.core.nodes.QueryNode} interface should be implemented by all query nodes, +the class {@link org.apache.lucene.queryparser.flexible.core.nodes.QueryNodeImpl} implements {@link org.apache.lucene.queryparser.flexible.core.nodes.QueryNode} and is extended by all current query node implementations.

@@ -68,7 +68,7 @@ Leaf Nodes:

  • FieldQueryNode - field/value node
    • -
  • PathQueryNode - {@link org.apache.lucene.queryParser.core.nodes.QueryNode} object used with path-like queries
    • +
  • PathQueryNode - {@link org.apache.lucene.queryparser.flexible.core.nodes.QueryNode} object used with path-like queries
  • OpaqueQueryNode - Used as for part of the query that can be parsed by other parsers. schema/value
  • ParametricQueryNode - used for parametric field [>=|<=|=|<|>] value
  • PrefixWildcardQueryNode - non-phrase wildcard query
    • Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/FieldQueryNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/FieldQueryNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/FieldQueryNode.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.nodes; +package org.apache.lucene.queryparser.flexible.core.nodes; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,10 +17,10 @@ * limitations under the License. */ +import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; + import java.util.Locale; -import org.apache.lucene.queryParser.core.parser.EscapeQuerySyntax; -import org.apache.lucene.queryParser.core.parser.EscapeQuerySyntax.Type; /** * A {@link FieldQueryNode} represents a element that contains field/text tuple @@ -73,11 +73,11 @@ } protected CharSequence getTermEscaped(EscapeQuerySyntax escaper) { - return escaper.escape(this.text, Locale.getDefault(), Type.NORMAL); + return escaper.escape(this.text, Locale.getDefault(), EscapeQuerySyntax.Type.NORMAL); } protected CharSequence getTermEscapeQuoted(EscapeQuerySyntax escaper) { - return escaper.escape(this.text, Locale.getDefault(), Type.STRING); + return escaper.escape(this.text, Locale.getDefault(), EscapeQuerySyntax.Type.STRING); } public CharSequence toQueryString(EscapeQuerySyntax escaper) { Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/BoostQueryNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/BoostQueryNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/BoostQueryNode.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.nodes; +package org.apache.lucene.queryparser.flexible.core.nodes; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -20,10 +20,10 @@ import java.util.List; import org.apache.lucene.messages.MessageImpl; -import org.apache.lucene.queryParser.core.QueryNodeError; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.messages.QueryParserMessages; -import org.apache.lucene.queryParser.core.parser.EscapeQuerySyntax; +import org.apache.lucene.queryparser.flexible.core.QueryNodeError; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages; +import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; /** * A {@link BoostQueryNode} boosts the QueryNode tree which is under this node. Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/FuzzyQueryNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/FuzzyQueryNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/FuzzyQueryNode.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.nodes; +package org.apache.lucene.queryparser.flexible.core.nodes; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,7 +17,7 @@ * limitations under the License. */ -import org.apache.lucene.queryParser.core.parser.EscapeQuerySyntax; +import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; /** * A {@link FuzzyQueryNode} represents a element that contains Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/AnyQueryNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/AnyQueryNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/AnyQueryNode.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.nodes; +package org.apache.lucene.queryparser.flexible.core.nodes; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,9 +17,10 @@ * limitations under the License. */ +import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; + import java.util.List; -import org.apache.lucene.queryParser.core.parser.EscapeQuerySyntax; /** * A {@link AnyQueryNode} represents an ANY operator performed on a list of Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/ParametricQueryNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/ParametricQueryNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/ParametricQueryNode.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.nodes; +package org.apache.lucene.queryparser.flexible.core.nodes; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,7 +17,7 @@ * limitations under the License. */ -import org.apache.lucene.queryParser.core.parser.EscapeQuerySyntax; +import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; /** * A {@link ParametricQueryNode} represents LE, LT, GE, GT, EQ, NE query. Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/NumberQueryNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/NumberQueryNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/NumberQueryNode.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.nodes; +package org.apache.lucene.queryparser.flexible.core.nodes; /** * Licensed to the Apache Software Foundation (ASF) under one or more Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/OpaqueQueryNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/OpaqueQueryNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/OpaqueQueryNode.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.nodes; +package org.apache.lucene.queryparser.flexible.core.nodes; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,7 +17,7 @@ * limitations under the License. */ -import org.apache.lucene.queryParser.core.parser.EscapeQuerySyntax; +import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; /** * A {@link OpaqueQueryNode} is used for specify values that are not supposed to Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/GroupQueryNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/GroupQueryNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/GroupQueryNode.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.nodes; +package org.apache.lucene.queryparser.flexible.core.nodes; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -21,9 +21,9 @@ import java.util.List; import org.apache.lucene.messages.MessageImpl; -import org.apache.lucene.queryParser.core.QueryNodeError; -import org.apache.lucene.queryParser.core.messages.QueryParserMessages; -import org.apache.lucene.queryParser.core.parser.EscapeQuerySyntax; +import org.apache.lucene.queryparser.flexible.core.QueryNodeError; +import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages; +import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; /** * A {@link GroupQueryNode} represents a location where the original user typed Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/FieldValuePairQueryNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/FieldValuePairQueryNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/FieldValuePairQueryNode.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.nodes; +package org.apache.lucene.queryparser.flexible.core.nodes; /** * Licensed to the Apache Software Foundation (ASF) under one or more Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/PathQueryNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/PathQueryNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/PathQueryNode.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.nodes; +package org.apache.lucene.queryparser.flexible.core.nodes; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -21,8 +21,8 @@ import java.util.List; import java.util.Locale; -import org.apache.lucene.queryParser.core.parser.EscapeQuerySyntax; -import org.apache.lucene.queryParser.core.parser.EscapeQuerySyntax.Type; +import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; +import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax.Type; /** * A {@link PathQueryNode} is used to store queries like Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/ModifierQueryNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/ModifierQueryNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/ModifierQueryNode.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.nodes; +package org.apache.lucene.queryparser.flexible.core.nodes; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -21,9 +21,9 @@ import java.util.List; import org.apache.lucene.messages.MessageImpl; -import org.apache.lucene.queryParser.core.QueryNodeError; -import org.apache.lucene.queryParser.core.messages.QueryParserMessages; -import org.apache.lucene.queryParser.core.parser.EscapeQuerySyntax; +import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; +import org.apache.lucene.queryparser.flexible.core.QueryNodeError; +import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages; /** * A {@link ModifierQueryNode} indicates the modifier value (+,-,?,NONE) for Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/MatchAllDocsQueryNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/MatchAllDocsQueryNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/MatchAllDocsQueryNode.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.nodes; +package org.apache.lucene.queryparser.flexible.core.nodes; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,7 +17,7 @@ * limitations under the License. */ -import org.apache.lucene.queryParser.core.parser.EscapeQuerySyntax; +import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; /** * A {@link MatchAllDocsQueryNode} indicates that a query node tree or subtree Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/TokenizedPhraseQueryNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/TokenizedPhraseQueryNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/TokenizedPhraseQueryNode.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.nodes; +package org.apache.lucene.queryparser.flexible.core.nodes; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -19,7 +19,7 @@ import java.util.List; -import org.apache.lucene.queryParser.core.parser.EscapeQuerySyntax; +import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; /** * A {@link TokenizedPhraseQueryNode} represents a node created by a code that Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/QueryNodeImpl.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/QueryNodeImpl.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/QueryNodeImpl.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.nodes; +package org.apache.lucene.queryparser.flexible.core.nodes; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -24,8 +24,8 @@ import java.util.ResourceBundle; import org.apache.lucene.messages.NLS; -import org.apache.lucene.queryParser.core.messages.QueryParserMessages; -import org.apache.lucene.queryParser.core.util.StringUtils; +import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages; +import org.apache.lucene.queryparser.flexible.core.util.StringUtils; /** * A {@link QueryNodeImpl} is the default implementation of the interface @@ -212,7 +212,7 @@ * * For FieldQueryNode: * - * @see org.apache.lucene.queryParser.core.nodes.QueryNode#toString() + * @see org.apache.lucene.queryparser.flexible.core.nodes.QueryNode#toString() */ @Override public String toString() { Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/MatchNoDocsQueryNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/MatchNoDocsQueryNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/MatchNoDocsQueryNode.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.nodes; +package org.apache.lucene.queryparser.flexible.core.nodes; /** * Licensed to the Apache Software Foundation (ASF) under one or more Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/AndQueryNode.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/AndQueryNode.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/AndQueryNode.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.nodes; +package org.apache.lucene.queryparser.flexible.core.nodes; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,9 +17,10 @@ * limitations under the License. */ +import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; + import java.util.List; -import org.apache.lucene.queryParser.core.parser.EscapeQuerySyntax; /** * A {@link AndQueryNode} represents an AND boolean operation performed on a Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/builders/QueryBuilder.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/builders/QueryBuilder.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/builders/QueryBuilder.java (working copy) @@ -1,5 +1,8 @@ -package org.apache.lucene.queryParser.core.builders; +package org.apache.lucene.queryparser.flexible.core.builders; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; + /** * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,8 +20,6 @@ * limitations under the License. */ -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.nodes.QueryNode; /** * This interface is used by implementors classes that builds some kind of Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/builders/QueryTreeBuilder.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/builders/QueryTreeBuilder.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/builders/QueryTreeBuilder.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.builders; +package org.apache.lucene.queryparser.flexible.core.builders; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -21,11 +21,11 @@ import java.util.List; import org.apache.lucene.messages.MessageImpl; -import org.apache.lucene.queryParser.core.QueryNodeException; -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.standard.parser.EscapeQuerySyntaxImpl; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages; +import org.apache.lucene.queryparser.flexible.core.nodes.FieldableNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.standard.parser.EscapeQuerySyntaxImpl; /** * This class should be used when there is a builder for each type of node. Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/builders/package.html =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/builders/package.html (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/builders/package.html (working copy) @@ -26,7 +26,7 @@

    Query Parser Builders

    The package org.apache.lucene.queryParser.builders contains the interface that -builders must implement, it also contain a utility {@link org.apache.lucene.queryParser.core.builders.QueryTreeBuilder}, which walks the tree +builders must implement, it also contain a utility {@link org.apache.lucene.queryparser.flexible.core.builders.QueryTreeBuilder}, which walks the tree and call the Builder for each node in the tree. Builder normally convert QueryNode Object into a Lucene Query Object, and normally it's a one-to-one mapping class. Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryNodeException.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryNodeException.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryNodeException.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core; +package org.apache.lucene.queryparser.flexible.core; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -23,8 +23,8 @@ import org.apache.lucene.messages.MessageImpl; import org.apache.lucene.messages.NLS; import org.apache.lucene.messages.NLSException; -import org.apache.lucene.queryParser.core.messages.QueryParserMessages; -import org.apache.lucene.queryParser.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; /** *

    Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/parser/SyntaxParser.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/parser/SyntaxParser.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/parser/SyntaxParser.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.parser; +package org.apache.lucene.queryparser.flexible.core.parser; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,8 +17,8 @@ * limitations under the License. */ -import org.apache.lucene.queryParser.core.QueryNodeParseException; -import org.apache.lucene.queryParser.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.QueryNodeParseException; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; /** * A parser needs to implement {@link SyntaxParser} interface Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/parser/EscapeQuerySyntax.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/parser/EscapeQuerySyntax.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/parser/EscapeQuerySyntax.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.parser; +package org.apache.lucene.queryparser.flexible.core.parser; /** * Licensed to the Apache Software Foundation (ASF) under one or more Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/parser/package.html =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/parser/package.html (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/parser/package.html (working copy) @@ -25,7 +25,7 @@

    Parser

    -The package org.apache.lucene.queryParser.parser contains interfaces +The package org.apache.lucene.queryparser.flexible.parser contains interfaces that should be implemented by the parsers. Parsers produce QueryNode Trees from a string object. Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/util/StringUtils.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/util/StringUtils.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/util/StringUtils.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.util; +package org.apache.lucene.queryparser.flexible.core.util; /** * Licensed to the Apache Software Foundation (ASF) under one or more Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/util/QueryNodeOperation.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/util/QueryNodeOperation.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/util/QueryNodeOperation.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.util; +package org.apache.lucene.queryparser.flexible.core.util; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,12 +17,13 @@ * limitations under the License. */ +import org.apache.lucene.queryparser.flexible.core.QueryNodeError; +import org.apache.lucene.queryparser.flexible.core.nodes.AndQueryNode; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; + import java.util.ArrayList; import java.util.List; -import org.apache.lucene.queryParser.core.QueryNodeError; -import org.apache.lucene.queryParser.core.nodes.AndQueryNode; -import org.apache.lucene.queryParser.core.nodes.QueryNode; /** * Allow joining 2 QueryNode Trees, into one. Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/util/UnescapedCharSequence.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/util/UnescapedCharSequence.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/util/UnescapedCharSequence.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.core.util; +package org.apache.lucene.queryparser.flexible.core.util; /** * Licensed to the Apache Software Foundation (ASF) under one or more Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/package.html =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/package.html (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/package.html (working copy) @@ -35,23 +35,23 @@

    First Phase: Text Parsing

    -The text parsing phase is performed by a text parser, which implements {@link org.apache.lucene.queryParser.core.parser.SyntaxParser} interface. -A text parser is responsible to get a query string and convert it to a {@link org.apache.lucene.queryParser.core.nodes.QueryNode} tree, +The text parsing phase is performed by a text parser, which implements {@link org.apache.lucene.queryparser.flexible.core.parser.SyntaxParser} interface. +A text parser is responsible to get a query string and convert it to a {@link org.apache.lucene.queryparser.flexible.core.nodes.QueryNode} tree, which is an object structure that represents the elements defined in the query string.

    Second (optional) Phase: Query Processing

    -The query processing phase is performed by a query processor, which implements {@link org.apache.lucene.queryParser.core.processors.QueryNodeProcessor}. -A query processor is responsible to perform any processing on a {@link org.apache.lucene.queryParser.core.nodes.QueryNode} tree. This phase -is optional and is used only if an extra processing, validation, query expansion, etc needs to be performed in a {@link org.apache.lucene.queryParser.core.nodes.QueryNode} tree. -The {@link org.apache.lucene.queryParser.core.nodes.QueryNode} tree can be either be generated by a text parser or programmatically created. +The query processing phase is performed by a query processor, which implements {@link org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessor}. +A query processor is responsible to perform any processing on a {@link org.apache.lucene.queryparser.flexible.core.nodes.QueryNode} tree. This phase +is optional and is used only if an extra processing, validation, query expansion, etc needs to be performed in a {@link org.apache.lucene.queryparser.flexible.core.nodes.QueryNode} tree. +The {@link org.apache.lucene.queryparser.flexible.core.nodes.QueryNode} tree can be either be generated by a text parser or programmatically created.

    Third Phase: Query Building

    -The query building phase is performed by a query builder, which implements {@link org.apache.lucene.queryParser.core.builders.QueryBuilder}. -A query builder is responsible to convert a {@link org.apache.lucene.queryParser.core.nodes.QueryNode} tree into an arbitrary object, which +The query building phase is performed by a query builder, which implements {@link org.apache.lucene.queryparser.flexible.core.builders.QueryBuilder}. +A query builder is responsible to convert a {@link org.apache.lucene.queryparser.flexible.core.nodes.QueryNode} tree into an arbitrary object, which is usually used to be executed against a search index.

    Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/precedence/PrecedenceQueryParser.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/precedence/PrecedenceQueryParser.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/precedence/PrecedenceQueryParser.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.precedence; +package org.apache.lucene.queryparser.flexible.precedence; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -18,9 +18,9 @@ */ import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.queryParser.precedence.processors.PrecedenceQueryNodeProcessorPipeline; -import org.apache.lucene.queryParser.standard.StandardQueryParser; -import org.apache.lucene.queryParser.standard.processors.StandardQueryNodeProcessorPipeline; +import org.apache.lucene.queryparser.flexible.standard.StandardQueryParser; +import org.apache.lucene.queryparser.flexible.standard.processors.StandardQueryNodeProcessorPipeline; +import org.apache.lucene.queryparser.flexible.precedence.processors.PrecedenceQueryNodeProcessorPipeline; /** *

    Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/precedence/processors/PrecedenceQueryNodeProcessorPipeline.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/precedence/processors/PrecedenceQueryNodeProcessorPipeline.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/precedence/processors/PrecedenceQueryNodeProcessorPipeline.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.precedence.processors; +package org.apache.lucene.queryparser.flexible.precedence.processors; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -17,10 +17,10 @@ * limitations under the License. */ -import org.apache.lucene.queryParser.core.config.QueryConfigHandler; -import org.apache.lucene.queryParser.precedence.PrecedenceQueryParser; -import org.apache.lucene.queryParser.standard.processors.GroupQueryNodeProcessor; -import org.apache.lucene.queryParser.standard.processors.StandardQueryNodeProcessorPipeline; +import org.apache.lucene.queryparser.flexible.precedence.PrecedenceQueryParser; +import org.apache.lucene.queryparser.flexible.standard.processors.GroupQueryNodeProcessor; +import org.apache.lucene.queryparser.flexible.standard.processors.StandardQueryNodeProcessorPipeline; +import org.apache.lucene.queryparser.flexible.core.config.QueryConfigHandler; /** *

    Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/precedence/processors/BooleanModifiersQueryNodeProcessor.java =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/precedence/processors/BooleanModifiersQueryNodeProcessor.java (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/precedence/processors/BooleanModifiersQueryNodeProcessor.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.queryParser.precedence.processors; +package org.apache.lucene.queryparser.flexible.precedence.processors; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -20,18 +20,14 @@ import java.util.ArrayList; import java.util.List; -import org.apache.lucene.queryParser.core.QueryNodeException; -import org.apache.lucene.queryParser.core.nodes.AndQueryNode; -import org.apache.lucene.queryParser.core.nodes.BooleanQueryNode; -import org.apache.lucene.queryParser.core.nodes.ModifierQueryNode; -import org.apache.lucene.queryParser.core.nodes.OrQueryNode; -import org.apache.lucene.queryParser.core.nodes.QueryNode; -import org.apache.lucene.queryParser.core.nodes.ModifierQueryNode.Modifier; -import org.apache.lucene.queryParser.core.processors.QueryNodeProcessorImpl; -import org.apache.lucene.queryParser.precedence.PrecedenceQueryParser; -import org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler; -import org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler.ConfigurationKeys; -import org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler.Operator; +import org.apache.lucene.queryparser.flexible.precedence.PrecedenceQueryParser; +import org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler; +import org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler.ConfigurationKeys; +import org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler.Operator; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.nodes.*; +import org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessorImpl; +import org.apache.lucene.queryparser.flexible.core.nodes.ModifierQueryNode.Modifier; /** *

    @@ -81,7 +77,7 @@ List children = node.getChildren(); for (QueryNode child : children) { - this.childrenBuffer.add(applyModifier(child, Modifier.MOD_REQ)); + this.childrenBuffer.add(applyModifier(child, ModifierQueryNode.Modifier.MOD_REQ)); } node.set(this.childrenBuffer); @@ -93,7 +89,7 @@ List children = node.getChildren(); for (QueryNode child : children) { - this.childrenBuffer.add(applyModifier(child, Modifier.MOD_REQ)); + this.childrenBuffer.add(applyModifier(child, ModifierQueryNode.Modifier.MOD_REQ)); } node.set(this.childrenBuffer); @@ -104,7 +100,7 @@ } - private QueryNode applyModifier(QueryNode node, Modifier mod) { + private QueryNode applyModifier(QueryNode node, ModifierQueryNode.Modifier mod) { // check if modifier is not already defined and is default if (!(node instanceof ModifierQueryNode)) { @@ -113,7 +109,7 @@ } else { ModifierQueryNode modNode = (ModifierQueryNode) node; - if (modNode.getModifier() == Modifier.MOD_NONE) { + if (modNode.getModifier() == ModifierQueryNode.Modifier.MOD_NONE) { return new ModifierQueryNode(modNode.getChild(), mod); } Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/precedence/processors/package.html =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/precedence/processors/package.html (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/precedence/processors/package.html (working copy) @@ -26,20 +26,20 @@

    Lucene Precedence Query Parser Processors

    -This package contains the 2 {@link org.apache.lucene.queryParser.core.processors.QueryNodeProcessor}s used by -{@link org.apache.lucene.queryParser.precedence.PrecedenceQueryParser}. +This package contains the 2 {@link org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessor}s used by +{@link org.apache.lucene.queryparser.flexible.precedence.PrecedenceQueryParser}.

    -{@link org.apache.lucene.queryParser.precedence.processors.BooleanModifiersQueryNodeProcessor}: this processor -is used to apply {@link org.apache.lucene.queryParser.core.nodes.ModifierQueryNode}s on -{@link org.apache.lucene.queryParser.core.nodes.BooleanQueryNode} children according to the boolean type +{@link org.apache.lucene.queryparser.flexible.precedence.processors.BooleanModifiersQueryNodeProcessor}: this processor +is used to apply {@link org.apache.lucene.queryparser.flexible.core.nodes.ModifierQueryNode}s on +{@link org.apache.lucene.queryparser.flexible.core.nodes.BooleanQueryNode} children according to the boolean type or the default operator.

    -{@link org.apache.lucene.queryParser.precedence.processors.PrecedenceQueryNodeProcessorPipeline}: this -processor pipeline is used by {@link org.apache.lucene.queryParser.precedence.PrecedenceQueryParser}. It extends -{@link org.apache.lucene.queryParser.standard.processors.StandardQueryNodeProcessorPipeline} and rearrange -the pipeline so the boolean precedence is processed correctly. Check {@link org.apache.lucene.queryParser.precedence.processors.PrecedenceQueryNodeProcessorPipeline} +{@link org.apache.lucene.queryparser.flexible.precedence.processors.PrecedenceQueryNodeProcessorPipeline}: this +processor pipeline is used by {@link org.apache.lucene.queryparser.flexible.precedence.PrecedenceQueryParser}. It extends +{@link org.apache.lucene.queryparser.flexible.standard.processors.StandardQueryNodeProcessorPipeline} and rearrange +the pipeline so the boolean precedence is processed correctly. Check {@link org.apache.lucene.queryparser.flexible.precedence.processors.PrecedenceQueryNodeProcessorPipeline} for more details.

    Index: modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/precedence/package.html =================================================================== --- modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/precedence/package.html (revision 1145556) +++ modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/precedence/package.html (working copy) @@ -31,7 +31,7 @@ <(+a +b) (+c +d)> instead of <+a +b +c +d>.

    -Check {@link org.apache.lucene.queryParser.standard.StandardQueryParser} for more details about the +Check {@link org.apache.lucene.queryparser.flexible.standard.StandardQueryParser} for more details about the supported syntax and query parser functionalities.

    Index: modules/queryparser/build.xml =================================================================== --- modules/queryparser/build.xml (revision 1145556) +++ modules/queryparser/build.xml (working copy) @@ -28,21 +28,15 @@ - - - - - - - - - - + - - + + + + + @@ -60,9 +54,77 @@ + + + + + + + + + + + + + + + + + + + + + Index: lucene/contrib/queryparser/README.javacc (deleted) =================================================================== Index: lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQPHelper.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQPHelper.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiAnalyzerQPHelper.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestNumericQueryParser.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/TestSpanQueryParserSimpleSample.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/UniqueFieldAttributeImpl.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/SpansQueryTreeBuilder.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/TestSpanQueryParser.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/SpanOrQueryNodeBuilder.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/SpansValidatorQueryNodeProcessor.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/UniqueFieldQueryNodeProcessor.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/SpanTermQueryNodeBuilder.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/SpansQueryConfigHandler.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/spans/UniqueFieldAttribute.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/core/nodes/TestQueryNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/core/builders/TestQueryTreeBuilder.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/precedence/TestPrecedenceQueryParser.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/QueryParserUtil.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/ParametricRangeQueryNodeProcessor.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/LowercaseExpandedTermsQueryNodeProcessor.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/NumericRangeQueryNodeProcessor.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/RemoveEmptyNonLeafQueryNodeProcessor.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/PhraseSlopQueryNodeProcessor.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/AllowLeadingWildcardProcessor.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/package.html (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/DefaultPhraseSlopQueryNodeProcessor.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/AnalyzerQueryNodeProcessor.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/BoostQueryNodeProcessor.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/StandardQueryNodeProcessorPipeline.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/FuzzyQueryNodeProcessor.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/MultiTermRewriteMethodProcessor.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/WildcardQueryNodeProcessor.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/GroupQueryNodeProcessor.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/BooleanSingleChildOptimizationQueryNodeProcessor.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/MultiFieldQueryNodeProcessor.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/MatchAllDocsQueryNodeProcessor.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/NumericQueryNodeProcessor.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/StandardQueryParser.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/NumberDateFormat.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/NumericFieldConfigListener.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldDateResolutionFCListener.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldBoostMapFCListener.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/NumericConfig.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/StandardQueryConfigHandler.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FuzzyConfig.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/package.html (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/TermRangeQueryNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/PrefixWildcardQueryNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/BooleanModifierNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/WildcardQueryNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/RegexpQueryNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/RangeQueryNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/MultiPhraseQueryNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/NumericRangeQueryNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/AbstractRangeQueryNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/StandardBooleanQueryNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/NumericQueryNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/package.html (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/RangeQueryNodeBuilder.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/GroupQueryNodeBuilder.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/MultiPhraseQueryNodeBuilder.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/ModifierQueryNodeBuilder.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/MatchAllDocsQueryNodeBuilder.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/StandardBooleanQueryNodeBuilder.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/MatchNoDocsQueryNodeBuilder.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/PrefixWildcardQueryNodeBuilder.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/StandardQueryTreeBuilder.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/package.html (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/SlopQueryNodeBuilder.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/NumericRangeQueryNodeBuilder.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/BooleanQueryNodeBuilder.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/PhraseQueryNodeBuilder.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/FieldQueryNodeBuilder.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/TermRangeQueryNodeBuilder.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/BoostQueryNodeBuilder.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/FuzzyQueryNodeBuilder.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/AnyQueryNodeBuilder.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/WildcardQueryNodeBuilder.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/RegexpQueryNodeBuilder.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/StandardQueryBuilder.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/builders/DummyQueryNodeBuilder.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/EscapeQuerySyntaxImpl.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParserTokenManager.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/Token.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/TokenMgrError.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParserConstants.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParser.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParser.jj (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/ParseException.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/JavaCharStream.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/package.html (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/package.html (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/QueryParserHelper.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/processors/QueryNodeProcessorPipeline.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/processors/NoChildOptimizationQueryNodeProcessor.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/processors/RemoveDeletedQueryNodesProcessor.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/processors/QueryNodeProcessor.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/processors/QueryNodeProcessorImpl.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/processors/package.html (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/QueryNodeError.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/QueryNodeParseException.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/config/AbstractQueryConfig.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/config/FieldConfigListener.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/config/ConfigurationKey.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/config/FieldConfig.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/config/QueryConfigHandler.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/config/package.html (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/messages/QueryParserMessages.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/messages/package.html (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ParametricRangeQueryNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ProximityQueryNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QuotedFieldQueryNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/DeletedQueryNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/TextableQueryNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/NoTokenFoundQueryNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ValueQueryNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/SlopQueryNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/BooleanQueryNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QueryNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/OrQueryNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/PhraseSlopQueryNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/FieldableNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/package.html (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/FieldQueryNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/BoostQueryNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/FuzzyQueryNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/AnyQueryNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ParametricQueryNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/NumberQueryNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/OpaqueQueryNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/GroupQueryNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/FieldValuePairQueryNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/PathQueryNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/ModifierQueryNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/MatchAllDocsQueryNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/TokenizedPhraseQueryNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QueryNodeImpl.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/MatchNoDocsQueryNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/AndQueryNode.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/builders/QueryBuilder.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/builders/QueryTreeBuilder.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/builders/package.html (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/QueryNodeException.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/parser/SyntaxParser.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/parser/EscapeQuerySyntax.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/parser/package.html (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/util/StringUtils.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/util/QueryNodeOperation.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/util/UnescapedCharSequence.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/util/package.html (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/package.html (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/processors/PrecedenceQueryNodeProcessorPipeline.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/processors/BooleanModifiersQueryNodeProcessor.java (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/processors/package.html (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/package.html (deleted) =================================================================== Index: lucene/contrib/queryparser/src/java/overview.html (deleted) =================================================================== Index: lucene/contrib/queryparser/src/resources/org/apache/lucene/queryParser/core/messages/QueryParserMessages.properties (deleted) =================================================================== Index: lucene/contrib/queryparser/README.txt (deleted) =================================================================== Index: lucene/contrib/queryparser/build.xml (deleted) =================================================================== Index: lucene/build.xml =================================================================== --- lucene/build.xml (revision 1145556) +++ lucene/build.xml (working copy) @@ -231,7 +231,6 @@ - @@ -247,7 +246,6 @@ - @@ -414,22 +412,8 @@ - - - - - - - - - - - - + - Index: dev-tools/idea/.idea/workspace.xml =================================================================== --- dev-tools/idea/.idea/workspace.xml (revision 1145556) +++ dev-tools/idea/.idea/workspace.xml (working copy) @@ -148,13 +148,6 @@ - - - - - + @@ -226,14 +219,13 @@ - - - - - - - - + + + + + + + Index: dev-tools/idea/modules/queryparser/queryparser.iml =================================================================== --- dev-tools/idea/modules/queryparser/queryparser.iml (revision 1145556) +++ dev-tools/idea/modules/queryparser/queryparser.iml (working copy) @@ -6,6 +6,7 @@ + Index: dev-tools/idea/lucene/contrib/queryparser/queryparser-contrib.iml (deleted) =================================================================== Index: dev-tools/eclipse/dot.classpath =================================================================== --- dev-tools/eclipse/dot.classpath (revision 1145556) +++ dev-tools/eclipse/dot.classpath (working copy) @@ -15,9 +15,6 @@ - - - Index: dev-tools/maven/lucene/contrib/queryparser/pom.xml.template (deleted) =================================================================== Index: dev-tools/maven/lucene/contrib/pom.xml.template =================================================================== --- dev-tools/maven/lucene/contrib/pom.xml.template (revision 1145556) +++ dev-tools/maven/lucene/contrib/pom.xml.template (working copy) @@ -37,7 +37,6 @@ memory misc queries - queryparser spatial xml-query-parser