[qpid-broker-j] branch main updated: QPID-8581: [Broker-J] Renamed query engine plugin to match other plugins naming (#149)

[vavrtom]

This is an automated email from the ASF dual-hosted git repository.

vavrtom pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git


The following commit(s) were added to refs/heads/main by this push:
     new 02510127b6 QPID-8581: [Broker-J] Renamed query engine plugin to match 
other plugins naming (#149)
02510127b6 is described below

commit 02510127b61e57fffeac2ccb01beeb32301d5544
Author: vavrtom <vavricka.to...@gmail.com>
AuthorDate: Fri Oct 21 10:28:27 2022 +0200

    QPID-8581: [Broker-J] Renamed query engine plugin to match other plugins 
naming (#149)
---
 broker-plugins/management-http/pom.xml                              | 2 +-
 broker-plugins/{broker-query-engine => query-engine}/README.md      | 0
 broker-plugins/{broker-query-engine => query-engine}/pom.xml        | 6 +++---
 .../src/main/grammar/ExpressionParser.jj                            | 0
 .../main/java/org/apache/qpid/server/query/engine/QueryEngine.java  | 0
 .../org/apache/qpid/server/query/engine/cache/MaxSizeHashMap.java   | 0
 .../org/apache/qpid/server/query/engine/evaluator/DateFormat.java   | 0
 .../qpid/server/query/engine/evaluator/EvaluationContext.java       | 0
 .../qpid/server/query/engine/evaluator/EvaluationContextHolder.java | 0
 .../apache/qpid/server/query/engine/evaluator/EvaluationPhase.java  | 0
 .../apache/qpid/server/query/engine/evaluator/EvaluationResult.java | 0
 .../apache/qpid/server/query/engine/evaluator/QueryEvaluator.java   | 0
 .../apache/qpid/server/query/engine/evaluator/SelectEvaluator.java  | 0
 .../query/engine/evaluator/settings/DefaultQuerySettings.java       | 0
 .../qpid/server/query/engine/evaluator/settings/QuerySettings.java  | 0
 .../java/org/apache/qpid/server/query/engine/exception/Errors.java  | 0
 .../qpid/server/query/engine/exception/QueryEngineException.java    | 0
 .../server/query/engine/exception/QueryEvaluationException.java     | 0
 .../qpid/server/query/engine/exception/QueryParsingException.java   | 0
 .../server/query/engine/exception/QueryValidationException.java     | 0
 .../main/java/org/apache/qpid/server/query/engine/model/Domain.java | 0
 .../org/apache/qpid/server/query/engine/model/QueryRequest.java     | 0
 .../qpid/server/query/engine/parsing/collector/CollectorType.java   | 0
 .../server/query/engine/parsing/converter/DateTimeConverter.java    | 0
 .../server/query/engine/parsing/converter/ImplicitConverter.java    | 0
 .../qpid/server/query/engine/parsing/converter/NumberConverter.java | 0
 .../query/engine/parsing/expression/AbstractExpressionNode.java     | 0
 .../qpid/server/query/engine/parsing/expression/Expression.java     | 0
 .../qpid/server/query/engine/parsing/expression/ExpressionNode.java | 0
 .../qpid/server/query/engine/parsing/expression/Metadata.java       | 0
 .../engine/parsing/expression/accessor/ChainedObjectAccessor.java   | 0
 .../parsing/expression/accessor/CollectionObjectAccessor.java       | 0
 .../expression/accessor/ConfiguredObjectAccessorExpression.java     | 0
 .../expression/accessor/DelegatingCollectionAccessorExpression.java | 0
 .../parsing/expression/accessor/DelegatingObjectAccessor.java       | 0
 .../query/engine/parsing/expression/accessor/MapObjectAccessor.java | 0
 .../parsing/expression/accessor/ObjectAccessorExpression.java       | 0
 .../parsing/expression/arithmetic/AbstractArithmeticExpression.java | 0
 .../engine/parsing/expression/arithmetic/DivideExpression.java      | 0
 .../query/engine/parsing/expression/arithmetic/MinusExpression.java | 0
 .../query/engine/parsing/expression/arithmetic/ModExpression.java   | 0
 .../engine/parsing/expression/arithmetic/MultiplyExpression.java    | 0
 .../query/engine/parsing/expression/arithmetic/PlusExpression.java  | 0
 .../parsing/expression/comparison/AbstractComparisonExpression.java | 0
 .../engine/parsing/expression/comparison/BetweenExpression.java     | 0
 .../query/engine/parsing/expression/comparison/EqualExpression.java | 0
 .../engine/parsing/expression/comparison/GreaterThanExpression.java | 0
 .../parsing/expression/comparison/GreaterThanOrEqualExpression.java | 0
 .../query/engine/parsing/expression/comparison/InExpression.java    | 0
 .../engine/parsing/expression/comparison/IsNullExpression.java      | 0
 .../engine/parsing/expression/comparison/LessThanExpression.java    | 0
 .../parsing/expression/comparison/LessThanOrEqualExpression.java    | 0
 .../query/engine/parsing/expression/comparison/LikeExpression.java  | 0
 .../query/engine/parsing/expression/conditional/CaseExpression.java | 0
 .../parsing/expression/function/AbstractFunctionExpression.java     | 0
 .../function/aggregation/AbstractAggregationExpression.java         | 0
 .../parsing/expression/function/aggregation/AvgExpression.java      | 0
 .../parsing/expression/function/aggregation/CountExpression.java    | 0
 .../parsing/expression/function/aggregation/MaxExpression.java      | 0
 .../parsing/expression/function/aggregation/MinExpression.java      | 0
 .../parsing/expression/function/aggregation/SumExpression.java      | 0
 .../expression/function/datetime/CurrentTimestampExpression.java    | 0
 .../parsing/expression/function/datetime/DateAddExpression.java     | 0
 .../parsing/expression/function/datetime/DateDiffExpression.java    | 0
 .../engine/parsing/expression/function/datetime/DateExpression.java | 0
 .../parsing/expression/function/datetime/ExtractExpression.java     | 0
 .../parsing/expression/function/nulls/CoalesceExpression.java       | 0
 .../engine/parsing/expression/function/numeric/AbsExpression.java   | 0
 .../engine/parsing/expression/function/numeric/RoundExpression.java | 0
 .../engine/parsing/expression/function/numeric/TruncExpression.java | 0
 .../engine/parsing/expression/function/string/ConcatExpression.java | 0
 .../parsing/expression/function/string/LeftTrimExpression.java      | 0
 .../engine/parsing/expression/function/string/LengthExpression.java | 0
 .../engine/parsing/expression/function/string/LowerExpression.java  | 0
 .../parsing/expression/function/string/PositionExpression.java      | 0
 .../parsing/expression/function/string/ReplaceExpression.java       | 0
 .../parsing/expression/function/string/RightTrimExpression.java     | 0
 .../parsing/expression/function/string/SubstringExpression.java     | 0
 .../engine/parsing/expression/function/string/TrimExpression.java   | 0
 .../engine/parsing/expression/function/string/UpperExpression.java  | 0
 .../query/engine/parsing/expression/literal/ConstantExpression.java | 0
 .../engine/parsing/expression/literal/FalseLiteralExpression.java   | 0
 .../engine/parsing/expression/literal/NullLiteralExpression.java    | 0
 .../engine/parsing/expression/literal/NumberLiteralExpression.java  | 0
 .../engine/parsing/expression/literal/StringLiteralExpression.java  | 0
 .../engine/parsing/expression/literal/TrueLiteralExpression.java    | 0
 .../server/query/engine/parsing/expression/logic/AndExpression.java | 0
 .../parsing/expression/logic/ExpressionWrapperExpression.java       | 0
 .../server/query/engine/parsing/expression/logic/NotExpression.java | 0
 .../server/query/engine/parsing/expression/logic/OrExpression.java  | 0
 .../engine/parsing/expression/logic/PredicateWrapperExpression.java | 0
 .../query/engine/parsing/expression/set/AbstractSetExpression.java  | 0
 .../query/engine/parsing/expression/set/EmptySetExpression.java     | 0
 .../query/engine/parsing/expression/set/IntersectExpression.java    | 0
 .../server/query/engine/parsing/expression/set/MinusExpression.java | 0
 .../server/query/engine/parsing/expression/set/SetExpression.java   | 0
 .../server/query/engine/parsing/expression/set/UnionExpression.java | 0
 .../query/engine/parsing/factory/AccessorExpressionFactory.java     | 0
 .../query/engine/parsing/factory/ArithmeticExpressionFactory.java   | 0
 .../qpid/server/query/engine/parsing/factory/CollectorFactory.java  | 0
 .../query/engine/parsing/factory/ComparisonExpressionFactory.java   | 0
 .../query/engine/parsing/factory/ConditionalExpressionFactory.java  | 0
 .../query/engine/parsing/factory/FunctionExpressionFactory.java     | 0
 .../query/engine/parsing/factory/LiteralExpressionFactory.java      | 0
 .../server/query/engine/parsing/factory/LogicExpressionFactory.java | 0
 .../query/engine/parsing/factory/NumberExpressionFactory.java       | 0
 .../query/engine/parsing/factory/ProjectionExpressionFactory.java   | 0
 .../server/query/engine/parsing/factory/SetExpressionFactory.java   | 0
 .../server/query/engine/parsing/factory/UnaryExpressionFactory.java | 0
 .../qpid/server/query/engine/parsing/query/FromExpression.java      | 0
 .../qpid/server/query/engine/parsing/query/HavingExpression.java    | 0
 .../org/apache/qpid/server/query/engine/parsing/query/Order.java    | 0
 .../apache/qpid/server/query/engine/parsing/query/OrderItem.java    | 0
 .../server/query/engine/parsing/query/ProjectionExpression.java     | 0
 .../qpid/server/query/engine/parsing/query/QueryExpression.java     | 0
 .../qpid/server/query/engine/parsing/query/SelectExpression.java    | 0
 .../org/apache/qpid/server/query/engine/parsing/query/WithItem.java | 0
 .../apache/qpid/server/query/engine/parsing/utils/StringUtils.java  | 0
 .../apache/qpid/server/query/engine/retriever/AclRuleRetriever.java | 0
 .../apache/qpid/server/query/engine/retriever/BindingRetriever.java | 0
 .../qpid/server/query/engine/retriever/CertificateRetriever.java    | 0
 .../server/query/engine/retriever/ConfiguredObjectRetriever.java    | 0
 .../server/query/engine/retriever/ConnectionLimitRuleRetriever.java | 0
 .../apache/qpid/server/query/engine/retriever/DomainRetriever.java  | 0
 .../apache/qpid/server/query/engine/retriever/EntityRetriever.java  | 0
 .../apache/qpid/server/query/engine/retriever/SessionRetriever.java | 0
 .../query/engine/validation/FunctionParameterTypePredicate.java     | 0
 .../server/query/engine/validation/FunctionParametersValidator.java | 0
 .../server/query/engine/validation/QueryExpressionValidator.java    | 0
 .../server/query/engine/validation/SelectExpressionValidator.java   | 0
 .../test/java/org/apache/qpid/server/query/engine/TestBroker.java   | 0
 .../apache/qpid/server/query/engine/broker/BindingQueryTest.java    | 0
 .../qpid/server/query/engine/broker/BrokerDigestQueryTest.java      | 0
 .../qpid/server/query/engine/broker/CertificateQueryTest.java       | 0
 .../apache/qpid/server/query/engine/broker/ConnectionQueryTest.java | 0
 .../apache/qpid/server/query/engine/broker/ConsumerQueryTest.java   | 0
 .../org/apache/qpid/server/query/engine/broker/DomainQueryTest.java | 0
 .../org/apache/qpid/server/query/engine/broker/PortQueryTest.java   | 0
 .../org/apache/qpid/server/query/engine/broker/QueueQueryTest.java  | 0
 .../apache/qpid/server/query/engine/broker/SessionQueryTest.java    | 0
 .../qpid/server/query/engine/broker/VirtualHostNodeQueryTest.java   | 0
 .../qpid/server/query/engine/broker/VirtualHostQueryTest.java       | 0
 .../qpid/server/query/engine/evaluator/QueryEvaluatorTest.java      | 0
 .../query/engine/parsing/converter/DateTimeConverterTest.java       | 0
 .../engine/parsing/expression/accessor/ChainedAccessorTest.java     | 0
 .../parsing/expression/arithmetic/ArithmeticExpressionsTest.java    | 0
 .../parsing/expression/arithmetic/NumericTypeConversionsTest.java   | 0
 .../engine/parsing/expression/comparison/BetweenExpressionTest.java | 0
 .../engine/parsing/expression/comparison/EqualExpressionTest.java   | 0
 .../parsing/expression/comparison/GreaterThanExpressionTest.java    | 0
 .../expression/comparison/GreaterThanOrEqualExpressionTest.java     | 0
 .../engine/parsing/expression/comparison/InExpressionTest.java      | 0
 .../engine/parsing/expression/comparison/IsNullExpressionTest.java  | 0
 .../parsing/expression/comparison/LessThanExpressionTest.java       | 0
 .../expression/comparison/LessThanOrEqualExpressionTest.java        | 0
 .../engine/parsing/expression/comparison/LikeExpressionTest.java    | 0
 .../engine/parsing/expression/conditional/CaseExpressionTest.java   | 0
 .../parsing/expression/function/aggregation/AvgExpressionTest.java  | 0
 .../expression/function/aggregation/CountExpressionTest.java        | 0
 .../engine/parsing/expression/function/aggregation/GroupByTest.java | 0
 .../parsing/expression/function/aggregation/MaxExpressionTest.java  | 0
 .../parsing/expression/function/aggregation/MinExpressionTest.java  | 0
 .../parsing/expression/function/aggregation/SumExpressionTest.java  | 0
 .../function/datetime/CurrentTimestampExpressionTest.java           | 0
 .../parsing/expression/function/datetime/DateAddExpressionTest.java | 0
 .../expression/function/datetime/DateDiffExpressionTest.java        | 0
 .../parsing/expression/function/datetime/DateExpressionTest.java    | 0
 .../parsing/expression/function/datetime/ExtractExpressionTest.java | 0
 .../parsing/expression/function/nulls/CoalesceExpressionTest.java   | 0
 .../parsing/expression/function/numeric/AbsExpressionTest.java      | 0
 .../parsing/expression/function/numeric/RoundExpressionTest.java    | 0
 .../parsing/expression/function/numeric/TruncExpressionTest.java    | 0
 .../parsing/expression/function/string/ConcatExpressionTest.java    | 0
 .../parsing/expression/function/string/LeftTrimExpressionTest.java  | 0
 .../parsing/expression/function/string/LengthExpressionTest.java    | 0
 .../parsing/expression/function/string/LowerExpressionTest.java     | 0
 .../parsing/expression/function/string/PositionExpressionTest.java  | 0
 .../parsing/expression/function/string/ReplaceExpressionTest.java   | 0
 .../parsing/expression/function/string/RightTrimExpressionTest.java | 0
 .../parsing/expression/function/string/SubstringExpressionTest.java | 0
 .../parsing/expression/function/string/TrimExpressionTest.java      | 0
 .../parsing/expression/function/string/UpperExpressionTest.java     | 0
 .../engine/parsing/expression/literal/LiteralExpressionTest.java    | 0
 .../query/engine/parsing/expression/logic/AndExpressionTest.java    | 0
 .../query/engine/parsing/expression/logic/NotExpressionTest.java    | 0
 .../query/engine/parsing/expression/logic/OrExpressionTest.java     | 0
 .../engine/parsing/expression/set/IntersectExpressionTest.java      | 0
 .../query/engine/parsing/expression/set/MinusExpressionTest.java    | 0
 .../query/engine/parsing/expression/set/UnionExpressionTest.java    | 0
 .../query/engine/parsing/factory/AccessorExpressionFactoryTest.java | 0
 .../engine/parsing/factory/ArithmeticExpressionFactoryTest.java     | 0
 .../server/query/engine/parsing/factory/CollectorFactoryTest.java   | 0
 .../engine/parsing/factory/ComparisonExpressionFactoryTest.java     | 0
 .../engine/parsing/factory/ConditionalExpressionFactoryTest.java    | 0
 .../query/engine/parsing/factory/FunctionExpressionFactoryTest.java | 0
 .../query/engine/parsing/factory/LiteralExpressionFactoryTest.java  | 0
 .../query/engine/parsing/factory/LogicExpressionFactoryTest.java    | 0
 .../query/engine/parsing/factory/NumberExpressionFactoryTest.java   | 0
 .../engine/parsing/factory/ProjectionExpressionFactoryTest.java     | 0
 .../query/engine/parsing/factory/SetExpressionFactoryTest.java      | 0
 .../query/engine/parsing/factory/UnaryExpressionFactoryTest.java    | 0
 .../apache/qpid/server/query/engine/parsing/query/AliasTest.java    | 0
 .../apache/qpid/server/query/engine/parsing/query/HavingTest.java   | 0
 .../apache/qpid/server/query/engine/parsing/query/OrderByTest.java  | 0
 .../qpid/server/query/engine/parsing/query/QuerySettingsTest.java   | 0
 .../qpid/server/query/engine/parsing/query/QueryValidatorTest.java  | 0
 .../apache/qpid/server/query/engine/parsing/query/SubqueryTest.java | 0
 .../org/apache/qpid/server/query/engine/parsing/query/WithTest.java | 0
 .../apache/qpid/server/query/engine/utils/QuerySettingsBuilder.java | 0
 .../query/engine/validation/FunctionParameterTypePredicateTest.java | 0
 .../query/engine/validation/FunctionParametersValidatorTest.java    | 0
 .../query/engine/validation/QueryExpressionValidatorTest.java       | 0
 .../query/engine/validation/SelectExpressionValidatorTest.java      | 0
 pom.xml                                                             | 4 ++--
 214 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/broker-plugins/management-http/pom.xml 
b/broker-plugins/management-http/pom.xml
index daf7e183e8..4b67343a1d 100644
--- a/broker-plugins/management-http/pom.xml
+++ b/broker-plugins/management-http/pom.xml
@@ -74,7 +74,7 @@
 
     <dependency>
       <groupId>org.apache.qpid</groupId>
-      <artifactId>qpid-broker-query-engine</artifactId>
+      <artifactId>qpid-broker-plugins-query-engine</artifactId>
     </dependency>
 
     <dependency>
diff --git a/broker-plugins/broker-query-engine/README.md 
b/broker-plugins/query-engine/README.md
similarity index 100%
rename from broker-plugins/broker-query-engine/README.md
rename to broker-plugins/query-engine/README.md
diff --git a/broker-plugins/broker-query-engine/pom.xml 
b/broker-plugins/query-engine/pom.xml
similarity index 94%
rename from broker-plugins/broker-query-engine/pom.xml
rename to broker-plugins/query-engine/pom.xml
index afa7d26e4c..a420482141 100644
--- a/broker-plugins/broker-query-engine/pom.xml
+++ b/broker-plugins/query-engine/pom.xml
@@ -25,9 +25,9 @@
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
-  <artifactId>qpid-broker-query-engine</artifactId>
-  <name>Apache Qpid Broker-J Query Engine</name>
-  <description>Broker-J Query Engine</description>
+  <artifactId>qpid-broker-plugins-query-engine</artifactId>
+  <name>Apache Qpid Broker-J Query Engine Plug-In</name>
+  <description>Query engine plug-in</description>
 
   <dependencies>
     <dependency>
diff --git 
a/broker-plugins/broker-query-engine/src/main/grammar/ExpressionParser.jj 
b/broker-plugins/query-engine/src/main/grammar/ExpressionParser.jj
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/grammar/ExpressionParser.jj
rename to broker-plugins/query-engine/src/main/grammar/ExpressionParser.jj
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/QueryEngine.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/QueryEngine.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/QueryEngine.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/QueryEngine.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/cache/MaxSizeHashMap.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/cache/MaxSizeHashMap.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/cache/MaxSizeHashMap.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/cache/MaxSizeHashMap.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/evaluator/DateFormat.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/evaluator/DateFormat.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/evaluator/DateFormat.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/evaluator/DateFormat.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/evaluator/EvaluationContext.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/evaluator/EvaluationContext.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/evaluator/EvaluationContext.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/evaluator/EvaluationContext.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/evaluator/EvaluationContextHolder.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/evaluator/EvaluationContextHolder.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/evaluator/EvaluationContextHolder.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/evaluator/EvaluationContextHolder.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/evaluator/EvaluationPhase.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/evaluator/EvaluationPhase.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/evaluator/EvaluationPhase.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/evaluator/EvaluationPhase.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/evaluator/EvaluationResult.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/evaluator/EvaluationResult.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/evaluator/EvaluationResult.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/evaluator/EvaluationResult.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/evaluator/QueryEvaluator.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/evaluator/QueryEvaluator.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/evaluator/QueryEvaluator.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/evaluator/QueryEvaluator.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/evaluator/SelectEvaluator.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/evaluator/SelectEvaluator.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/evaluator/SelectEvaluator.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/evaluator/SelectEvaluator.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/evaluator/settings/DefaultQuerySettings.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/evaluator/settings/DefaultQuerySettings.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/evaluator/settings/DefaultQuerySettings.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/evaluator/settings/DefaultQuerySettings.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/evaluator/settings/QuerySettings.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/evaluator/settings/QuerySettings.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/evaluator/settings/QuerySettings.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/evaluator/settings/QuerySettings.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/exception/Errors.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/exception/Errors.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/exception/Errors.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/exception/Errors.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/exception/QueryEngineException.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/exception/QueryEngineException.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/exception/QueryEngineException.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/exception/QueryEngineException.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/exception/QueryEvaluationException.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/exception/QueryEvaluationException.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/exception/QueryEvaluationException.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/exception/QueryEvaluationException.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/exception/QueryParsingException.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/exception/QueryParsingException.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/exception/QueryParsingException.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/exception/QueryParsingException.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/exception/QueryValidationException.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/exception/QueryValidationException.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/exception/QueryValidationException.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/exception/QueryValidationException.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/model/Domain.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/model/Domain.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/model/Domain.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/model/Domain.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/model/QueryRequest.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/model/QueryRequest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/model/QueryRequest.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/model/QueryRequest.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/collector/CollectorType.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/collector/CollectorType.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/collector/CollectorType.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/collector/CollectorType.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/converter/DateTimeConverter.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/converter/DateTimeConverter.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/converter/DateTimeConverter.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/converter/DateTimeConverter.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/converter/ImplicitConverter.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/converter/ImplicitConverter.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/converter/ImplicitConverter.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/converter/ImplicitConverter.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/converter/NumberConverter.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/converter/NumberConverter.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/converter/NumberConverter.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/converter/NumberConverter.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/AbstractExpressionNode.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/AbstractExpressionNode.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/AbstractExpressionNode.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/AbstractExpressionNode.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/Expression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/Expression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/Expression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/Expression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/ExpressionNode.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/ExpressionNode.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/ExpressionNode.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/ExpressionNode.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/Metadata.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/Metadata.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/Metadata.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/Metadata.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/accessor/ChainedObjectAccessor.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/accessor/ChainedObjectAccessor.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/accessor/ChainedObjectAccessor.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/accessor/ChainedObjectAccessor.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/accessor/CollectionObjectAccessor.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/accessor/CollectionObjectAccessor.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/accessor/CollectionObjectAccessor.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/accessor/CollectionObjectAccessor.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/accessor/ConfiguredObjectAccessorExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/accessor/ConfiguredObjectAccessorExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/accessor/ConfiguredObjectAccessorExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/accessor/ConfiguredObjectAccessorExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/accessor/DelegatingCollectionAccessorExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/accessor/DelegatingCollectionAccessorExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/accessor/DelegatingCollectionAccessorExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/accessor/DelegatingCollectionAccessorExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/accessor/DelegatingObjectAccessor.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/accessor/DelegatingObjectAccessor.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/accessor/DelegatingObjectAccessor.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/accessor/DelegatingObjectAccessor.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/accessor/MapObjectAccessor.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/accessor/MapObjectAccessor.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/accessor/MapObjectAccessor.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/accessor/MapObjectAccessor.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/accessor/ObjectAccessorExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/accessor/ObjectAccessorExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/accessor/ObjectAccessorExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/accessor/ObjectAccessorExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/arithmetic/AbstractArithmeticExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/arithmetic/AbstractArithmeticExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/arithmetic/AbstractArithmeticExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/arithmetic/AbstractArithmeticExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/arithmetic/DivideExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/arithmetic/DivideExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/arithmetic/DivideExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/arithmetic/DivideExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/arithmetic/MinusExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/arithmetic/MinusExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/arithmetic/MinusExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/arithmetic/MinusExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/arithmetic/ModExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/arithmetic/ModExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/arithmetic/ModExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/arithmetic/ModExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/arithmetic/MultiplyExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/arithmetic/MultiplyExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/arithmetic/MultiplyExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/arithmetic/MultiplyExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/arithmetic/PlusExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/arithmetic/PlusExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/arithmetic/PlusExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/arithmetic/PlusExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/AbstractComparisonExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/AbstractComparisonExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/AbstractComparisonExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/AbstractComparisonExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/BetweenExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/BetweenExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/BetweenExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/BetweenExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/EqualExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/EqualExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/EqualExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/EqualExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/GreaterThanExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/GreaterThanExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/GreaterThanExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/GreaterThanExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/GreaterThanOrEqualExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/GreaterThanOrEqualExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/GreaterThanOrEqualExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/GreaterThanOrEqualExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/InExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/InExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/InExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/InExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/IsNullExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/IsNullExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/IsNullExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/IsNullExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/LessThanExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/LessThanExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/LessThanExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/LessThanExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/LessThanOrEqualExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/LessThanOrEqualExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/LessThanOrEqualExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/LessThanOrEqualExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/LikeExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/LikeExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/LikeExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/LikeExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/conditional/CaseExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/conditional/CaseExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/conditional/CaseExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/conditional/CaseExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/AbstractFunctionExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/AbstractFunctionExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/AbstractFunctionExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/AbstractFunctionExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/AbstractAggregationExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/AbstractAggregationExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/AbstractAggregationExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/AbstractAggregationExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/AvgExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/AvgExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/AvgExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/AvgExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/CountExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/CountExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/CountExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/CountExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/MaxExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/MaxExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/MaxExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/MaxExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/MinExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/MinExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/MinExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/MinExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/SumExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/SumExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/SumExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/SumExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/CurrentTimestampExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/CurrentTimestampExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/CurrentTimestampExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/CurrentTimestampExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/DateAddExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/DateAddExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/DateAddExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/DateAddExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/DateDiffExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/DateDiffExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/DateDiffExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/DateDiffExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/DateExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/DateExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/DateExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/DateExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/ExtractExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/ExtractExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/ExtractExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/ExtractExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/nulls/CoalesceExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/nulls/CoalesceExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/nulls/CoalesceExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/nulls/CoalesceExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/numeric/AbsExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/numeric/AbsExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/numeric/AbsExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/numeric/AbsExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/numeric/RoundExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/numeric/RoundExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/numeric/RoundExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/numeric/RoundExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/numeric/TruncExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/numeric/TruncExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/numeric/TruncExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/numeric/TruncExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/ConcatExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/ConcatExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/ConcatExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/ConcatExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/LeftTrimExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/LeftTrimExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/LeftTrimExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/LeftTrimExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/LengthExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/LengthExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/LengthExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/LengthExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/LowerExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/LowerExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/LowerExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/LowerExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/PositionExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/PositionExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/PositionExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/PositionExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/ReplaceExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/ReplaceExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/ReplaceExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/ReplaceExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/RightTrimExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/RightTrimExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/RightTrimExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/RightTrimExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/SubstringExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/SubstringExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/SubstringExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/SubstringExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/TrimExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/TrimExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/TrimExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/TrimExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/UpperExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/UpperExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/UpperExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/UpperExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/literal/ConstantExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/literal/ConstantExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/literal/ConstantExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/literal/ConstantExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/literal/FalseLiteralExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/literal/FalseLiteralExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/literal/FalseLiteralExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/literal/FalseLiteralExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/literal/NullLiteralExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/literal/NullLiteralExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/literal/NullLiteralExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/literal/NullLiteralExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/literal/NumberLiteralExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/literal/NumberLiteralExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/literal/NumberLiteralExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/literal/NumberLiteralExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/literal/StringLiteralExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/literal/StringLiteralExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/literal/StringLiteralExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/literal/StringLiteralExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/literal/TrueLiteralExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/literal/TrueLiteralExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/literal/TrueLiteralExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/literal/TrueLiteralExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/logic/AndExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/logic/AndExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/logic/AndExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/logic/AndExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/logic/ExpressionWrapperExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/logic/ExpressionWrapperExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/logic/ExpressionWrapperExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/logic/ExpressionWrapperExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/logic/NotExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/logic/NotExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/logic/NotExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/logic/NotExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/logic/OrExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/logic/OrExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/logic/OrExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/logic/OrExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/logic/PredicateWrapperExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/logic/PredicateWrapperExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/logic/PredicateWrapperExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/logic/PredicateWrapperExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/set/AbstractSetExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/set/AbstractSetExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/set/AbstractSetExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/set/AbstractSetExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/set/EmptySetExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/set/EmptySetExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/set/EmptySetExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/set/EmptySetExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/set/IntersectExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/set/IntersectExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/set/IntersectExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/set/IntersectExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/set/MinusExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/set/MinusExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/set/MinusExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/set/MinusExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/set/SetExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/set/SetExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/set/SetExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/set/SetExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/set/UnionExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/set/UnionExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/set/UnionExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/expression/set/UnionExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/AccessorExpressionFactory.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/AccessorExpressionFactory.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/AccessorExpressionFactory.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/AccessorExpressionFactory.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/ArithmeticExpressionFactory.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/ArithmeticExpressionFactory.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/ArithmeticExpressionFactory.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/ArithmeticExpressionFactory.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/CollectorFactory.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/CollectorFactory.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/CollectorFactory.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/CollectorFactory.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/ComparisonExpressionFactory.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/ComparisonExpressionFactory.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/ComparisonExpressionFactory.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/ComparisonExpressionFactory.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/ConditionalExpressionFactory.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/ConditionalExpressionFactory.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/ConditionalExpressionFactory.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/ConditionalExpressionFactory.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/FunctionExpressionFactory.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/FunctionExpressionFactory.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/FunctionExpressionFactory.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/FunctionExpressionFactory.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/LiteralExpressionFactory.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/LiteralExpressionFactory.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/LiteralExpressionFactory.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/LiteralExpressionFactory.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/LogicExpressionFactory.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/LogicExpressionFactory.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/LogicExpressionFactory.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/LogicExpressionFactory.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/NumberExpressionFactory.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/NumberExpressionFactory.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/NumberExpressionFactory.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/NumberExpressionFactory.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/ProjectionExpressionFactory.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/ProjectionExpressionFactory.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/ProjectionExpressionFactory.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/ProjectionExpressionFactory.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/SetExpressionFactory.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/SetExpressionFactory.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/SetExpressionFactory.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/SetExpressionFactory.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/UnaryExpressionFactory.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/UnaryExpressionFactory.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/UnaryExpressionFactory.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/factory/UnaryExpressionFactory.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/query/FromExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/query/FromExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/query/FromExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/query/FromExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/query/HavingExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/query/HavingExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/query/HavingExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/query/HavingExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/query/Order.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/query/Order.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/query/Order.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/query/Order.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/query/OrderItem.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/query/OrderItem.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/query/OrderItem.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/query/OrderItem.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/query/ProjectionExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/query/ProjectionExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/query/ProjectionExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/query/ProjectionExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/query/QueryExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/query/QueryExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/query/QueryExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/query/QueryExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/query/SelectExpression.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/query/SelectExpression.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/query/SelectExpression.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/query/SelectExpression.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/query/WithItem.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/query/WithItem.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/query/WithItem.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/query/WithItem.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/utils/StringUtils.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/utils/StringUtils.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/utils/StringUtils.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/parsing/utils/StringUtils.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/retriever/AclRuleRetriever.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/retriever/AclRuleRetriever.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/retriever/AclRuleRetriever.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/retriever/AclRuleRetriever.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/retriever/BindingRetriever.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/retriever/BindingRetriever.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/retriever/BindingRetriever.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/retriever/BindingRetriever.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/retriever/CertificateRetriever.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/retriever/CertificateRetriever.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/retriever/CertificateRetriever.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/retriever/CertificateRetriever.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/retriever/ConfiguredObjectRetriever.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/retriever/ConfiguredObjectRetriever.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/retriever/ConfiguredObjectRetriever.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/retriever/ConfiguredObjectRetriever.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/retriever/ConnectionLimitRuleRetriever.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/retriever/ConnectionLimitRuleRetriever.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/retriever/ConnectionLimitRuleRetriever.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/retriever/ConnectionLimitRuleRetriever.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/retriever/DomainRetriever.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/retriever/DomainRetriever.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/retriever/DomainRetriever.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/retriever/DomainRetriever.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/retriever/EntityRetriever.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/retriever/EntityRetriever.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/retriever/EntityRetriever.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/retriever/EntityRetriever.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/retriever/SessionRetriever.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/retriever/SessionRetriever.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/retriever/SessionRetriever.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/retriever/SessionRetriever.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/validation/FunctionParameterTypePredicate.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/validation/FunctionParameterTypePredicate.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/validation/FunctionParameterTypePredicate.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/validation/FunctionParameterTypePredicate.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/validation/FunctionParametersValidator.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/validation/FunctionParametersValidator.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/validation/FunctionParametersValidator.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/validation/FunctionParametersValidator.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/validation/QueryExpressionValidator.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/validation/QueryExpressionValidator.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/validation/QueryExpressionValidator.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/validation/QueryExpressionValidator.java
diff --git 
a/broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/validation/SelectExpressionValidator.java
 
b/broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/validation/SelectExpressionValidator.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/main/java/org/apache/qpid/server/query/engine/validation/SelectExpressionValidator.java
rename to 
broker-plugins/query-engine/src/main/java/org/apache/qpid/server/query/engine/validation/SelectExpressionValidator.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/TestBroker.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/TestBroker.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/TestBroker.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/TestBroker.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/BindingQueryTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/BindingQueryTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/BindingQueryTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/BindingQueryTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/BrokerDigestQueryTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/BrokerDigestQueryTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/BrokerDigestQueryTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/BrokerDigestQueryTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/CertificateQueryTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/CertificateQueryTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/CertificateQueryTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/CertificateQueryTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/ConnectionQueryTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/ConnectionQueryTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/ConnectionQueryTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/ConnectionQueryTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/ConsumerQueryTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/ConsumerQueryTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/ConsumerQueryTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/ConsumerQueryTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/DomainQueryTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/DomainQueryTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/DomainQueryTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/DomainQueryTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/PortQueryTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/PortQueryTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/PortQueryTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/PortQueryTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/QueueQueryTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/QueueQueryTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/QueueQueryTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/QueueQueryTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/SessionQueryTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/SessionQueryTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/SessionQueryTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/SessionQueryTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/VirtualHostNodeQueryTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/VirtualHostNodeQueryTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/VirtualHostNodeQueryTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/VirtualHostNodeQueryTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/VirtualHostQueryTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/VirtualHostQueryTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/VirtualHostQueryTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/broker/VirtualHostQueryTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/evaluator/QueryEvaluatorTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/evaluator/QueryEvaluatorTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/evaluator/QueryEvaluatorTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/evaluator/QueryEvaluatorTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/converter/DateTimeConverterTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/converter/DateTimeConverterTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/converter/DateTimeConverterTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/converter/DateTimeConverterTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/accessor/ChainedAccessorTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/accessor/ChainedAccessorTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/accessor/ChainedAccessorTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/accessor/ChainedAccessorTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/arithmetic/ArithmeticExpressionsTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/arithmetic/ArithmeticExpressionsTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/arithmetic/ArithmeticExpressionsTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/arithmetic/ArithmeticExpressionsTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/arithmetic/NumericTypeConversionsTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/arithmetic/NumericTypeConversionsTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/arithmetic/NumericTypeConversionsTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/arithmetic/NumericTypeConversionsTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/BetweenExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/BetweenExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/BetweenExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/BetweenExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/EqualExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/EqualExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/EqualExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/EqualExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/GreaterThanExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/GreaterThanExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/GreaterThanExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/GreaterThanExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/GreaterThanOrEqualExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/GreaterThanOrEqualExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/GreaterThanOrEqualExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/GreaterThanOrEqualExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/InExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/InExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/InExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/InExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/IsNullExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/IsNullExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/IsNullExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/IsNullExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/LessThanExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/LessThanExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/LessThanExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/LessThanExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/LessThanOrEqualExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/LessThanOrEqualExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/LessThanOrEqualExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/LessThanOrEqualExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/LikeExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/LikeExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/LikeExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/comparison/LikeExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/conditional/CaseExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/conditional/CaseExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/conditional/CaseExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/conditional/CaseExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/AvgExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/AvgExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/AvgExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/AvgExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/CountExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/CountExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/CountExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/CountExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/GroupByTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/GroupByTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/GroupByTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/GroupByTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/MaxExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/MaxExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/MaxExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/MaxExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/MinExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/MinExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/MinExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/MinExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/SumExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/SumExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/SumExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/aggregation/SumExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/CurrentTimestampExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/CurrentTimestampExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/CurrentTimestampExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/CurrentTimestampExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/DateAddExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/DateAddExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/DateAddExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/DateAddExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/DateDiffExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/DateDiffExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/DateDiffExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/DateDiffExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/DateExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/DateExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/DateExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/DateExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/ExtractExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/ExtractExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/ExtractExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/datetime/ExtractExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/nulls/CoalesceExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/nulls/CoalesceExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/nulls/CoalesceExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/nulls/CoalesceExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/numeric/AbsExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/numeric/AbsExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/numeric/AbsExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/numeric/AbsExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/numeric/RoundExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/numeric/RoundExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/numeric/RoundExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/numeric/RoundExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/numeric/TruncExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/numeric/TruncExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/numeric/TruncExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/numeric/TruncExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/ConcatExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/ConcatExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/ConcatExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/ConcatExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/LeftTrimExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/LeftTrimExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/LeftTrimExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/LeftTrimExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/LengthExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/LengthExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/LengthExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/LengthExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/LowerExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/LowerExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/LowerExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/LowerExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/PositionExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/PositionExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/PositionExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/PositionExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/ReplaceExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/ReplaceExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/ReplaceExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/ReplaceExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/RightTrimExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/RightTrimExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/RightTrimExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/RightTrimExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/SubstringExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/SubstringExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/SubstringExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/SubstringExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/TrimExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/TrimExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/TrimExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/TrimExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/UpperExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/UpperExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/UpperExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/function/string/UpperExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/literal/LiteralExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/literal/LiteralExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/literal/LiteralExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/literal/LiteralExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/logic/AndExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/logic/AndExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/logic/AndExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/logic/AndExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/logic/NotExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/logic/NotExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/logic/NotExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/logic/NotExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/logic/OrExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/logic/OrExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/logic/OrExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/logic/OrExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/set/IntersectExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/set/IntersectExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/set/IntersectExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/set/IntersectExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/set/MinusExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/set/MinusExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/set/MinusExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/set/MinusExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/set/UnionExpressionTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/set/UnionExpressionTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/set/UnionExpressionTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/expression/set/UnionExpressionTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/AccessorExpressionFactoryTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/AccessorExpressionFactoryTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/AccessorExpressionFactoryTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/AccessorExpressionFactoryTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/ArithmeticExpressionFactoryTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/ArithmeticExpressionFactoryTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/ArithmeticExpressionFactoryTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/ArithmeticExpressionFactoryTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/CollectorFactoryTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/CollectorFactoryTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/CollectorFactoryTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/CollectorFactoryTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/ComparisonExpressionFactoryTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/ComparisonExpressionFactoryTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/ComparisonExpressionFactoryTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/ComparisonExpressionFactoryTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/ConditionalExpressionFactoryTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/ConditionalExpressionFactoryTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/ConditionalExpressionFactoryTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/ConditionalExpressionFactoryTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/FunctionExpressionFactoryTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/FunctionExpressionFactoryTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/FunctionExpressionFactoryTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/FunctionExpressionFactoryTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/LiteralExpressionFactoryTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/LiteralExpressionFactoryTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/LiteralExpressionFactoryTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/LiteralExpressionFactoryTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/LogicExpressionFactoryTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/LogicExpressionFactoryTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/LogicExpressionFactoryTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/LogicExpressionFactoryTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/NumberExpressionFactoryTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/NumberExpressionFactoryTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/NumberExpressionFactoryTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/NumberExpressionFactoryTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/ProjectionExpressionFactoryTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/ProjectionExpressionFactoryTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/ProjectionExpressionFactoryTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/ProjectionExpressionFactoryTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/SetExpressionFactoryTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/SetExpressionFactoryTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/SetExpressionFactoryTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/SetExpressionFactoryTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/UnaryExpressionFactoryTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/UnaryExpressionFactoryTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/UnaryExpressionFactoryTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/factory/UnaryExpressionFactoryTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/query/AliasTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/query/AliasTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/query/AliasTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/query/AliasTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/query/HavingTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/query/HavingTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/query/HavingTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/query/HavingTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/query/OrderByTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/query/OrderByTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/query/OrderByTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/query/OrderByTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/query/QuerySettingsTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/query/QuerySettingsTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/query/QuerySettingsTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/query/QuerySettingsTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/query/QueryValidatorTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/query/QueryValidatorTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/query/QueryValidatorTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/query/QueryValidatorTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/query/SubqueryTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/query/SubqueryTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/query/SubqueryTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/query/SubqueryTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/query/WithTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/query/WithTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/query/WithTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/parsing/query/WithTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/utils/QuerySettingsBuilder.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/utils/QuerySettingsBuilder.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/utils/QuerySettingsBuilder.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/utils/QuerySettingsBuilder.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/validation/FunctionParameterTypePredicateTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/validation/FunctionParameterTypePredicateTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/validation/FunctionParameterTypePredicateTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/validation/FunctionParameterTypePredicateTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/validation/FunctionParametersValidatorTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/validation/FunctionParametersValidatorTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/validation/FunctionParametersValidatorTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/validation/FunctionParametersValidatorTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/validation/QueryExpressionValidatorTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/validation/QueryExpressionValidatorTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/validation/QueryExpressionValidatorTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/validation/QueryExpressionValidatorTest.java
diff --git 
a/broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/validation/SelectExpressionValidatorTest.java
 
b/broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/validation/SelectExpressionValidatorTest.java
similarity index 100%
rename from 
broker-plugins/broker-query-engine/src/test/java/org/apache/qpid/server/query/engine/validation/SelectExpressionValidatorTest.java
rename to 
broker-plugins/query-engine/src/test/java/org/apache/qpid/server/query/engine/validation/SelectExpressionValidatorTest.java
diff --git a/pom.xml b/pom.xml
index 3c5fc830b6..0f194f9e60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -179,7 +179,7 @@
     <module>broker-plugins/amqp-msg-conv-0-8-to-0-10</module>
     <module>broker-plugins/amqp-msg-conv-0-8-to-1-0</module>
     <module>broker-plugins/amqp-msg-conv-0-10-to-1-0</module>
-    <module>broker-plugins/broker-query-engine</module>
+    <module>broker-plugins/query-engine</module>
     <module>broker-plugins/derby-store</module>
     <module>broker-plugins/jdbc-provider-bone</module>
     <module>broker-plugins/jdbc-store</module>
@@ -401,7 +401,7 @@
 
       <dependency>
         <groupId>org.apache.qpid</groupId>
-        <artifactId>qpid-broker-query-engine</artifactId>
+        <artifactId>qpid-broker-plugins-query-engine</artifactId>
         <version>${project.version}</version>
       </dependency>
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org