From ac96d90b53bcdacdfc4b625d43b940b31cabeee5 Mon Sep 17 00:00:00 2001 From: Uwe Schindler Date: Sat, 17 Dec 2011 12:57:41 +0000 Subject: [PATCH] LUCENE-3652: Move org.apache.lucene.messages to QueryParser module git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1215480 13f79535-47bb-0310-9956-ffa450edef68 --- modules/queryparser/build.xml | 4 ++-- .../lucene/queryparser/flexible/core/QueryNodeError.java | 4 ++-- .../queryparser/flexible/core/QueryNodeException.java | 8 ++++---- .../flexible/core/QueryNodeParseException.java | 4 ++-- .../flexible/core/builders/QueryTreeBuilder.java | 2 +- .../flexible/core/messages/QueryParserMessages.java | 2 +- .../queryparser/flexible/core/nodes/BoostQueryNode.java | 2 +- .../queryparser/flexible/core/nodes/GroupQueryNode.java | 2 +- .../flexible/core/nodes/ModifierQueryNode.java | 2 +- .../flexible/core/nodes/PhraseSlopQueryNode.java | 2 +- .../flexible/core/nodes/ProximityQueryNode.java | 2 +- .../queryparser/flexible/core/nodes/QueryNodeImpl.java | 2 +- .../queryparser/flexible/core/nodes/SlopQueryNode.java | 2 +- .../lucene/queryparser/flexible}/messages/Message.java | 2 +- .../queryparser/flexible}/messages/MessageImpl.java | 2 +- .../apache/lucene/queryparser/flexible}/messages/NLS.java | 2 +- .../queryparser/flexible}/messages/NLSException.java | 2 +- .../lucene/queryparser/flexible}/messages/package.html | 0 .../flexible/standard/builders/AnyQueryNodeBuilder.java | 2 +- .../standard/builders/BooleanQueryNodeBuilder.java | 2 +- .../standard/builders/MatchAllDocsQueryNodeBuilder.java | 2 +- .../standard/builders/MatchNoDocsQueryNodeBuilder.java | 2 +- .../standard/builders/NumericRangeQueryNodeBuilder.java | 2 +- .../builders/StandardBooleanQueryNodeBuilder.java | 2 +- .../flexible/standard/nodes/NumericRangeQueryNode.java | 2 +- .../flexible/standard/parser/EscapeQuerySyntaxImpl.java | 2 +- .../flexible/standard/parser/JavaCharStream.java | 2 +- .../flexible/standard/parser/ParseException.java | 6 +++--- .../flexible/standard/parser/StandardSyntaxParser.java | 4 ++-- .../flexible/standard/parser/StandardSyntaxParser.jj | 4 ++-- .../standard/parser/StandardSyntaxParserTokenManager.java | 4 ++-- .../queryparser/flexible/standard/parser/Token.java | 2 +- .../flexible/standard/parser/TokenMgrError.java | 2 +- .../processors/AllowLeadingWildcardProcessor.java | 2 +- .../standard/processors/NumericQueryNodeProcessor.java | 2 +- .../processors/NumericRangeQueryNodeProcessor.java | 2 +- .../flexible}/messages/MessagesTestBundle.java | 2 +- .../flexible}/messages/MessagesTestBundle.properties | 0 .../flexible}/messages/MessagesTestBundle_ja.properties | 0 .../lucene/queryparser/flexible}/messages/TestNLS.java | 2 +- .../flexible/spans/SpansValidatorQueryNodeProcessor.java | 2 +- .../queryparser/flexible/standard/TestQPHelper.java | 2 +- 42 files changed, 50 insertions(+), 50 deletions(-) rename {lucene/src/java/org/apache/lucene => modules/queryparser/src/java/org/apache/lucene/queryparser/flexible}/messages/Message.java (95%) rename {lucene/src/java/org/apache/lucene => modules/queryparser/src/java/org/apache/lucene/queryparser/flexible}/messages/MessageImpl.java (97%) rename {lucene/src/java/org/apache/lucene => modules/queryparser/src/java/org/apache/lucene/queryparser/flexible}/messages/NLS.java (99%) rename {lucene/src/java/org/apache/lucene => modules/queryparser/src/java/org/apache/lucene/queryparser/flexible}/messages/NLSException.java (95%) rename {lucene/src/java/org/apache/lucene => modules/queryparser/src/java/org/apache/lucene/queryparser/flexible}/messages/package.html (100%) rename {lucene/src/test/org/apache/lucene => modules/queryparser/src/test/org/apache/lucene/queryparser/flexible}/messages/MessagesTestBundle.java (96%) rename {lucene/src/test/org/apache/lucene => modules/queryparser/src/test/org/apache/lucene/queryparser/flexible}/messages/MessagesTestBundle.properties (100%) rename {lucene/src/test/org/apache/lucene => modules/queryparser/src/test/org/apache/lucene/queryparser/flexible}/messages/MessagesTestBundle_ja.properties (100%) rename {lucene/src/test/org/apache/lucene => modules/queryparser/src/test/org/apache/lucene/queryparser/flexible}/messages/TestNLS.java (98%) diff --git a/modules/queryparser/build.xml b/modules/queryparser/build.xml index 4987f37fd66..9087b668d8c 100644 --- a/modules/queryparser/build.xml +++ b/modules/queryparser/build.xml @@ -90,8 +90,8 @@ match="package org.apache.lucene.queryparser.flexible.standard.parser;" replace="package org.apache.lucene.queryparser.flexible.standard.parser;${line.separator} ${line.separator} -import org.apache.lucene.messages.Message;${line.separator} -import org.apache.lucene.messages.MessageImpl;${line.separator} +import org.apache.lucene.queryparser.flexible.messages.Message;${line.separator} +import org.apache.lucene.queryparser.flexible.messages.MessageImpl;${line.separator} import org.apache.lucene.queryparser.flexible.core.*;${line.separator} import org.apache.lucene.queryparser.flexible.core.messages.*;" flags="g" diff --git a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryNodeError.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryNodeError.java index 636567fc90b..da66b5c603d 100644 --- a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryNodeError.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryNodeError.java @@ -17,8 +17,8 @@ package org.apache.lucene.queryparser.flexible.core; * limitations under the License. */ -import org.apache.lucene.messages.Message; -import org.apache.lucene.messages.NLSException; +import org.apache.lucene.queryparser.flexible.messages.Message; +import org.apache.lucene.queryparser.flexible.messages.NLSException; /** * Error class with NLS support diff --git a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryNodeException.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryNodeException.java index 2e7ceec3ba8..c2f37790479 100644 --- a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryNodeException.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryNodeException.java @@ -19,10 +19,10 @@ package org.apache.lucene.queryparser.flexible.core; import java.util.Locale; -import org.apache.lucene.messages.Message; -import org.apache.lucene.messages.MessageImpl; -import org.apache.lucene.messages.NLS; -import org.apache.lucene.messages.NLSException; +import org.apache.lucene.queryparser.flexible.messages.Message; +import org.apache.lucene.queryparser.flexible.messages.MessageImpl; +import org.apache.lucene.queryparser.flexible.messages.NLS; +import org.apache.lucene.queryparser.flexible.messages.NLSException; import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages; import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; diff --git a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryNodeParseException.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryNodeParseException.java index 24c8e2a2d60..b309ec3405b 100644 --- a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryNodeParseException.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryNodeParseException.java @@ -17,8 +17,8 @@ package org.apache.lucene.queryparser.flexible.core; * limitations under the License. */ -import org.apache.lucene.messages.Message; -import org.apache.lucene.messages.MessageImpl; +import org.apache.lucene.queryparser.flexible.messages.Message; +import org.apache.lucene.queryparser.flexible.messages.MessageImpl; 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; diff --git a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/builders/QueryTreeBuilder.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/builders/QueryTreeBuilder.java index f557a2931d9..f77bc96d88f 100644 --- a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/builders/QueryTreeBuilder.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/builders/QueryTreeBuilder.java @@ -20,7 +20,7 @@ package org.apache.lucene.queryparser.flexible.core.builders; import java.util.HashMap; import java.util.List; -import org.apache.lucene.messages.MessageImpl; +import org.apache.lucene.queryparser.flexible.messages.MessageImpl; 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; diff --git a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/messages/QueryParserMessages.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/messages/QueryParserMessages.java index 82f0e1e08e4..757f4f68deb 100644 --- a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/messages/QueryParserMessages.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/messages/QueryParserMessages.java @@ -17,7 +17,7 @@ package org.apache.lucene.queryparser.flexible.core.messages; * limitations under the License. */ -import org.apache.lucene.messages.NLS; +import org.apache.lucene.queryparser.flexible.messages.NLS; /** * Flexible Query Parser message bundle class diff --git a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/BoostQueryNode.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/BoostQueryNode.java index eb0bc62a369..4da96fa71ad 100644 --- a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/BoostQueryNode.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/BoostQueryNode.java @@ -19,7 +19,7 @@ package org.apache.lucene.queryparser.flexible.core.nodes; import java.util.List; -import org.apache.lucene.messages.MessageImpl; +import org.apache.lucene.queryparser.flexible.messages.MessageImpl; 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; diff --git a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/GroupQueryNode.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/GroupQueryNode.java index eef196370f2..e4fcc0cb2be 100644 --- a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/GroupQueryNode.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/GroupQueryNode.java @@ -20,7 +20,7 @@ package org.apache.lucene.queryparser.flexible.core.nodes; import java.util.ArrayList; import java.util.List; -import org.apache.lucene.messages.MessageImpl; +import org.apache.lucene.queryparser.flexible.messages.MessageImpl; 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; diff --git a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/ModifierQueryNode.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/ModifierQueryNode.java index c6747ac23b5..f092ee998b8 100644 --- a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/ModifierQueryNode.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/ModifierQueryNode.java @@ -20,7 +20,7 @@ package org.apache.lucene.queryparser.flexible.core.nodes; import java.util.ArrayList; import java.util.List; -import org.apache.lucene.messages.MessageImpl; +import org.apache.lucene.queryparser.flexible.messages.MessageImpl; 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; diff --git a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/PhraseSlopQueryNode.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/PhraseSlopQueryNode.java index 175113997e1..c4c592a7f0f 100644 --- a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/PhraseSlopQueryNode.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/PhraseSlopQueryNode.java @@ -17,7 +17,7 @@ package org.apache.lucene.queryparser.flexible.core.nodes; * limitations under the License. */ -import org.apache.lucene.messages.MessageImpl; +import org.apache.lucene.queryparser.flexible.messages.MessageImpl; 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; diff --git a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/ProximityQueryNode.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/ProximityQueryNode.java index 9929d94d9c7..75d1ca34298 100644 --- a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/ProximityQueryNode.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/ProximityQueryNode.java @@ -19,7 +19,7 @@ package org.apache.lucene.queryparser.flexible.core.nodes; import java.util.List; -import org.apache.lucene.messages.MessageImpl; +import org.apache.lucene.queryparser.flexible.messages.MessageImpl; 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; diff --git a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/QueryNodeImpl.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/QueryNodeImpl.java index fba4bdc9d5e..1be795761a4 100644 --- a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/QueryNodeImpl.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/QueryNodeImpl.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Map; import java.util.ResourceBundle; -import org.apache.lucene.messages.NLS; +import org.apache.lucene.queryparser.flexible.messages.NLS; import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages; import org.apache.lucene.queryparser.flexible.core.util.StringUtils; diff --git a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/SlopQueryNode.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/SlopQueryNode.java index e47912b4712..a29ef75233e 100644 --- a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/SlopQueryNode.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/SlopQueryNode.java @@ -17,7 +17,7 @@ package org.apache.lucene.queryparser.flexible.core.nodes; * limitations under the License. */ -import org.apache.lucene.messages.MessageImpl; +import org.apache.lucene.queryparser.flexible.messages.MessageImpl; 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; diff --git a/lucene/src/java/org/apache/lucene/messages/Message.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/Message.java similarity index 95% rename from lucene/src/java/org/apache/lucene/messages/Message.java rename to modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/Message.java index df7ac827019..94229133efa 100644 --- a/lucene/src/java/org/apache/lucene/messages/Message.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/Message.java @@ -1,4 +1,4 @@ -package org.apache.lucene.messages; +package org.apache.lucene.queryparser.flexible.messages; /** * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/src/java/org/apache/lucene/messages/MessageImpl.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/MessageImpl.java similarity index 97% rename from lucene/src/java/org/apache/lucene/messages/MessageImpl.java rename to modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/MessageImpl.java index 78d8e2b42ef..e056f62a828 100644 --- a/lucene/src/java/org/apache/lucene/messages/MessageImpl.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/MessageImpl.java @@ -1,4 +1,4 @@ -package org.apache.lucene.messages; +package org.apache.lucene.queryparser.flexible.messages; /** * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/src/java/org/apache/lucene/messages/NLS.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/NLS.java similarity index 99% rename from lucene/src/java/org/apache/lucene/messages/NLS.java rename to modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/NLS.java index ec90cb14658..ad2b62707ab 100644 --- a/lucene/src/java/org/apache/lucene/messages/NLS.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/NLS.java @@ -1,4 +1,4 @@ -package org.apache.lucene.messages; +package org.apache.lucene.queryparser.flexible.messages; /** * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/src/java/org/apache/lucene/messages/NLSException.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/NLSException.java similarity index 95% rename from lucene/src/java/org/apache/lucene/messages/NLSException.java rename to modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/NLSException.java index 0c6b904c2fe..0e7a1e92b92 100644 --- a/lucene/src/java/org/apache/lucene/messages/NLSException.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/NLSException.java @@ -1,4 +1,4 @@ -package org.apache.lucene.messages; +package org.apache.lucene.queryparser.flexible.messages; /** * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/src/java/org/apache/lucene/messages/package.html b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/package.html similarity index 100% rename from lucene/src/java/org/apache/lucene/messages/package.html rename to modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/package.html diff --git a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/AnyQueryNodeBuilder.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/AnyQueryNodeBuilder.java index 1c08ea897a4..e07ab11a29d 100644 --- a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/AnyQueryNodeBuilder.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/AnyQueryNodeBuilder.java @@ -19,7 +19,7 @@ package org.apache.lucene.queryparser.flexible.standard.builders; import java.util.List; -import org.apache.lucene.messages.MessageImpl; +import org.apache.lucene.queryparser.flexible.messages.MessageImpl; 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; diff --git a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/BooleanQueryNodeBuilder.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/BooleanQueryNodeBuilder.java index e3a419fb156..d5435e9b353 100644 --- a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/BooleanQueryNodeBuilder.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/BooleanQueryNodeBuilder.java @@ -19,7 +19,7 @@ package org.apache.lucene.queryparser.flexible.standard.builders; import java.util.List; -import org.apache.lucene.messages.MessageImpl; +import org.apache.lucene.queryparser.flexible.messages.MessageImpl; 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; diff --git a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/MatchAllDocsQueryNodeBuilder.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/MatchAllDocsQueryNodeBuilder.java index 733728f7fb4..4c9b3e3761d 100644 --- a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/MatchAllDocsQueryNodeBuilder.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/MatchAllDocsQueryNodeBuilder.java @@ -17,7 +17,7 @@ package org.apache.lucene.queryparser.flexible.standard.builders; * limitations under the License. */ -import org.apache.lucene.messages.MessageImpl; +import org.apache.lucene.queryparser.flexible.messages.MessageImpl; 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; diff --git a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/MatchNoDocsQueryNodeBuilder.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/MatchNoDocsQueryNodeBuilder.java index 903c6fc8abc..0a33f75a0b5 100644 --- a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/MatchNoDocsQueryNodeBuilder.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/MatchNoDocsQueryNodeBuilder.java @@ -17,7 +17,7 @@ package org.apache.lucene.queryparser.flexible.standard.builders; * limitations under the License. */ -import org.apache.lucene.messages.MessageImpl; +import org.apache.lucene.queryparser.flexible.messages.MessageImpl; 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; diff --git a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/NumericRangeQueryNodeBuilder.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/NumericRangeQueryNodeBuilder.java index edd8e598f0b..f6d03e996ea 100644 --- a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/NumericRangeQueryNodeBuilder.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/NumericRangeQueryNodeBuilder.java @@ -18,7 +18,7 @@ package org.apache.lucene.queryparser.flexible.standard.builders; */ import org.apache.lucene.document.NumericField; -import org.apache.lucene.messages.MessageImpl; +import org.apache.lucene.queryparser.flexible.messages.MessageImpl; 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; diff --git a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/StandardBooleanQueryNodeBuilder.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/StandardBooleanQueryNodeBuilder.java index 5a4b09ebe43..860c5c18012 100644 --- a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/StandardBooleanQueryNodeBuilder.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/StandardBooleanQueryNodeBuilder.java @@ -19,7 +19,7 @@ package org.apache.lucene.queryparser.flexible.standard.builders; import java.util.List; -import org.apache.lucene.messages.MessageImpl; +import org.apache.lucene.queryparser.flexible.messages.MessageImpl; 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; diff --git a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/NumericRangeQueryNode.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/NumericRangeQueryNode.java index 9910ad3626e..a5aa9378e94 100644 --- a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/NumericRangeQueryNode.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/NumericRangeQueryNode.java @@ -1,7 +1,7 @@ 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.flexible.messages.MessageImpl; 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.FieldQueryNode; diff --git a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/EscapeQuerySyntaxImpl.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/EscapeQuerySyntaxImpl.java index f581f14841e..0e8742e630d 100644 --- a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/EscapeQuerySyntaxImpl.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/EscapeQuerySyntaxImpl.java @@ -19,7 +19,7 @@ package org.apache.lucene.queryparser.flexible.standard.parser; import java.util.Locale; -import org.apache.lucene.messages.MessageImpl; +import org.apache.lucene.queryparser.flexible.messages.MessageImpl; 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; diff --git a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/JavaCharStream.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/JavaCharStream.java index 27dc1468064..59bd8f5f481 100644 --- a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/JavaCharStream.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/JavaCharStream.java @@ -613,4 +613,4 @@ public class JavaCharStream } } -/* JavaCC - OriginalChecksum=7eecaeeaea1254b3e35fe8890a0127ce (do not edit this line) */ +/* JavaCC - OriginalChecksum=a050c1d21b27b6d9eed401dd428aa609 (do not edit this line) */ diff --git a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/ParseException.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/ParseException.java index 48b1a4d96d3..8b1badb939c 100644 --- a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/ParseException.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/ParseException.java @@ -2,8 +2,8 @@ /* JavaCCOptions:KEEP_LINE_COL=null */ 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.flexible.messages.Message; + import org.apache.lucene.queryparser.flexible.messages.MessageImpl; import org.apache.lucene.queryparser.flexible.core.*; import org.apache.lucene.queryparser.flexible.core.messages.*; @@ -193,4 +193,4 @@ public class ParseException extends QueryNodeParseException { } } -/* JavaCC - OriginalChecksum=0f25f4245374bbf9920c9a82efecadd2 (do not edit this line) */ +/* JavaCC - OriginalChecksum=7601d49d11bc059457ae5850628ebc8a (do not edit this line) */ diff --git a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.java index c5c5c8af505..37e71c3c64a 100644 --- a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.java @@ -21,8 +21,8 @@ package org.apache.lucene.queryparser.flexible.standard.parser; import java.io.StringReader; import java.util.Vector; -import org.apache.lucene.messages.Message; -import org.apache.lucene.messages.MessageImpl; +import org.apache.lucene.queryparser.flexible.messages.Message; +import org.apache.lucene.queryparser.flexible.messages.MessageImpl; 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; diff --git a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.jj b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.jj index c9744a5559b..31435b9b16f 100644 --- a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.jj +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.jj @@ -33,8 +33,8 @@ package org.apache.lucene.queryparser.flexible.standard.parser; import java.io.StringReader; import java.util.Vector; -import org.apache.lucene.messages.Message; -import org.apache.lucene.messages.MessageImpl; +import org.apache.lucene.queryparser.flexible.messages.Message; +import org.apache.lucene.queryparser.flexible.messages.MessageImpl; 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; diff --git a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParserTokenManager.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParserTokenManager.java index 1fa8ee5ac2a..aaa1aa7db23 100644 --- a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParserTokenManager.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParserTokenManager.java @@ -19,8 +19,8 @@ package org.apache.lucene.queryparser.flexible.standard.parser; import java.io.StringReader; import java.util.Vector; -import org.apache.lucene.messages.Message; -import org.apache.lucene.messages.MessageImpl; +import org.apache.lucene.queryparser.flexible.messages.Message; +import org.apache.lucene.queryparser.flexible.messages.MessageImpl; 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; diff --git a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/Token.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/Token.java index e005731b549..95869f37545 100644 --- a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/Token.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/Token.java @@ -121,4 +121,4 @@ public class Token { } } -/* JavaCC - OriginalChecksum=e9c55091ec11152bcd3a300ddff5c73a (do not edit this line) */ +/* JavaCC - OriginalChecksum=3b4fe6dcfcfa24a81f1c6ceffae5f73a (do not edit this line) */ diff --git a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/TokenMgrError.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/TokenMgrError.java index c0c63c7e990..24647e18dd3 100644 --- a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/TokenMgrError.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/TokenMgrError.java @@ -138,4 +138,4 @@ public class TokenMgrError extends Error this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason); } } -/* JavaCC - OriginalChecksum=76b513fd9c50f65248056bbeeff49277 (do not edit this line) */ +/* JavaCC - OriginalChecksum=1efb3d906925f2478637c66473b79bae (do not edit this line) */ diff --git a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/AllowLeadingWildcardProcessor.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/AllowLeadingWildcardProcessor.java index 1b3e0b58b92..830b4943cba 100644 --- a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/AllowLeadingWildcardProcessor.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/AllowLeadingWildcardProcessor.java @@ -19,7 +19,7 @@ package org.apache.lucene.queryparser.flexible.standard.processors; import java.util.List; -import org.apache.lucene.messages.MessageImpl; +import org.apache.lucene.queryparser.flexible.messages.MessageImpl; 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; diff --git a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/NumericQueryNodeProcessor.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/NumericQueryNodeProcessor.java index d1114c6fcd8..efea5482b6a 100644 --- a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/NumericQueryNodeProcessor.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/NumericQueryNodeProcessor.java @@ -21,7 +21,7 @@ import java.text.NumberFormat; import java.text.ParseException; import java.util.List; -import org.apache.lucene.messages.MessageImpl; +import org.apache.lucene.queryparser.flexible.messages.MessageImpl; 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; diff --git a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/NumericRangeQueryNodeProcessor.java b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/NumericRangeQueryNodeProcessor.java index fde94494d7a..4fdb2b37583 100644 --- a/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/NumericRangeQueryNodeProcessor.java +++ b/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/NumericRangeQueryNodeProcessor.java @@ -21,7 +21,7 @@ import java.text.NumberFormat; import java.text.ParseException; import java.util.List; -import org.apache.lucene.messages.MessageImpl; +import org.apache.lucene.queryparser.flexible.messages.MessageImpl; 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; diff --git a/lucene/src/test/org/apache/lucene/messages/MessagesTestBundle.java b/modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/messages/MessagesTestBundle.java similarity index 96% rename from lucene/src/test/org/apache/lucene/messages/MessagesTestBundle.java rename to modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/messages/MessagesTestBundle.java index d12b6d55e99..e56f4e94936 100644 --- a/lucene/src/test/org/apache/lucene/messages/MessagesTestBundle.java +++ b/modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/messages/MessagesTestBundle.java @@ -1,4 +1,4 @@ -package org.apache.lucene.messages; +package org.apache.lucene.queryparser.flexible.messages; /** * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/src/test/org/apache/lucene/messages/MessagesTestBundle.properties b/modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/messages/MessagesTestBundle.properties similarity index 100% rename from lucene/src/test/org/apache/lucene/messages/MessagesTestBundle.properties rename to modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/messages/MessagesTestBundle.properties diff --git a/lucene/src/test/org/apache/lucene/messages/MessagesTestBundle_ja.properties b/modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/messages/MessagesTestBundle_ja.properties similarity index 100% rename from lucene/src/test/org/apache/lucene/messages/MessagesTestBundle_ja.properties rename to modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/messages/MessagesTestBundle_ja.properties diff --git a/lucene/src/test/org/apache/lucene/messages/TestNLS.java b/modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/messages/TestNLS.java similarity index 98% rename from lucene/src/test/org/apache/lucene/messages/TestNLS.java rename to modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/messages/TestNLS.java index c9ea9c13478..7cf4d9a6b97 100644 --- a/lucene/src/test/org/apache/lucene/messages/TestNLS.java +++ b/modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/messages/TestNLS.java @@ -1,4 +1,4 @@ -package org.apache.lucene.messages; +package org.apache.lucene.queryparser.flexible.messages; /** * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpansValidatorQueryNodeProcessor.java b/modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpansValidatorQueryNodeProcessor.java index 3ebc3063305..965aaa7809b 100644 --- a/modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpansValidatorQueryNodeProcessor.java +++ b/modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpansValidatorQueryNodeProcessor.java @@ -19,7 +19,7 @@ package org.apache.lucene.queryparser.flexible.spans; import java.util.List; -import org.apache.lucene.messages.MessageImpl; +import org.apache.lucene.queryparser.flexible.messages.MessageImpl; 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; diff --git a/modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java b/modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java index 03ad2c3b1b9..70f8266a4ad 100644 --- a/modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java +++ b/modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java @@ -38,7 +38,7 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.Term; -import org.apache.lucene.messages.MessageImpl; +import org.apache.lucene.queryparser.flexible.messages.MessageImpl; 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;