This is an automated email from the ASF dual-hosted git repository. orudyy pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 7fe4191f8f6fd35ea0137fdcda3f5e49d320facf Author: Dedeepya Tunga <[email protected]> AuthorDate: Mon Jul 20 15:58:09 2020 +0530 QPID-8457: [Broker-J] Change broker version to 9.0.0-SNAPSHOT This closes #50 --- apache-qpid-broker-j/pom.xml | 2 +- bdbstore/pom.xml | 2 +- bdbstore/systests/pom.xml | 2 +- broker-codegen/pom.xml | 2 +- broker-core/pom.xml | 2 +- .../org/apache/qpid/server/model/BrokerModel.java | 2 +- .../store/BrokerStoreUpgraderAndRecoverer.java | 24 ++++++++++++++ .../VirtualHostStoreUpgraderAndRecoverer.java | 24 ++++++++++++++ broker-plugins/access-control/pom.xml | 2 +- broker-plugins/amqp-0-10-protocol/pom.xml | 2 +- broker-plugins/amqp-0-8-protocol/pom.xml | 2 +- broker-plugins/amqp-1-0-bdb-store/pom.xml | 2 +- broker-plugins/amqp-1-0-jdbc-store/pom.xml | 2 +- broker-plugins/amqp-1-0-protocol/pom.xml | 2 +- broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml | 2 +- broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml | 2 +- broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml | 2 +- broker-plugins/derby-store/pom.xml | 2 +- broker-plugins/jdbc-logging-logback/pom.xml | 2 +- broker-plugins/jdbc-provider-bone/pom.xml | 2 +- broker-plugins/jdbc-store/pom.xml | 2 +- broker-plugins/logging-logback/pom.xml | 2 +- broker-plugins/management-amqp/pom.xml | 2 +- broker-plugins/management-http/pom.xml | 2 +- .../latest/LatestManagementControllerFactory.java | 2 +- .../LegacyManagementControllerFactory_v8_0.java} | 16 ++++++---- .../LegacyCategoryControllerFactory_v8_0.java | 37 +++++++--------------- broker-plugins/memory-store/pom.xml | 2 +- broker-plugins/websocket/pom.xml | 2 +- broker/pom.xml | 2 +- doc/developer-guide/pom.xml | 2 +- doc/java-broker/pom.xml | 2 +- ...roker-Appendix-BDB-HA-Initial-Configuration.xml | 2 +- .../docbkx/Java-Broker-Initial-Configuration.xml | 2 +- doc/java-perftests/pom.xml | 2 +- doc/pom.xml | 2 +- joramtests/pom.xml | 2 +- perftests/pom.xml | 2 +- perftests/visualisation-jfc/pom.xml | 2 +- pom.xml | 2 +- qpid-perftests-systests/pom.xml | 2 +- qpid-systests-parent/pom.xml | 4 +-- qpid-test-utils/pom.xml | 2 +- systests/end-to-end-conversion-tests/pom.xml | 2 +- .../config-end-to-end-conversion-tests.json | 2 +- systests/protocol-tests-amqp-0-10/pom.xml | 2 +- .../main/resources/config-protocol-tests-0-10.json | 2 +- systests/protocol-tests-amqp-0-8/pom.xml | 2 +- .../main/resources/config-protocol-tests-0-8.json | 2 +- systests/protocol-tests-amqp-1-0/pom.xml | 2 +- .../src/main/resources/config-protocol-tests.json | 2 +- systests/protocol-tests-core/pom.xml | 2 +- systests/qpid-systests-http-management/pom.xml | 2 +- .../resources/config-http-management-tests.json | 2 +- systests/qpid-systests-jms-core/pom.xml | 2 +- .../src/main/resources/config-jms-tests.json | 2 +- systests/qpid-systests-jms_1.1/pom.xml | 2 +- systests/qpid-systests-jms_2.0/pom.xml | 2 +- systests/qpid-systests-spawn-admin/pom.xml | 2 +- .../src/main/resources/spawn-broker.json | 2 +- systests/systests-utils/pom.xml | 2 +- tck/pom.xml | 2 +- tools/pom.xml | 2 +- 63 files changed, 130 insertions(+), 91 deletions(-) diff --git a/apache-qpid-broker-j/pom.xml b/apache-qpid-broker-j/pom.xml index aa6f5b4..fc2326f 100644 --- a/apache-qpid-broker-j/pom.xml +++ b/apache-qpid-broker-j/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/bdbstore/pom.xml b/bdbstore/pom.xml index 2b781a1..81ba182 100644 --- a/bdbstore/pom.xml +++ b/bdbstore/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>qpid-bdbstore</artifactId> diff --git a/bdbstore/systests/pom.xml b/bdbstore/systests/pom.xml index 0fa3b5d..90d0b37 100644 --- a/bdbstore/systests/pom.xml +++ b/bdbstore/systests/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-systests-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> <relativePath>../../qpid-systests-parent/pom.xml</relativePath> </parent> diff --git a/broker-codegen/pom.xml b/broker-codegen/pom.xml index 9c47e03..465c63b 100644 --- a/broker-codegen/pom.xml +++ b/broker-codegen/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>qpid-broker-codegen</artifactId> diff --git a/broker-core/pom.xml b/broker-core/pom.xml index ee2e736..ee5b8d3 100644 --- a/broker-core/pom.xml +++ b/broker-core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>qpid-broker-core</artifactId> diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java b/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java index ee078c3..78176f2 100644 --- a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java +++ b/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java @@ -81,7 +81,7 @@ public final class BrokerModel extends Model * Added new broker statistics: processCpuTime, processCpuLoad * Added new context variables for queues and exchanges to configure behaviour on unknown declared arguments */ - public static final int MODEL_MAJOR_VERSION = 8; + public static final int MODEL_MAJOR_VERSION = 9; public static final int MODEL_MINOR_VERSION = 0; public static final String MODEL_VERSION = MODEL_MAJOR_VERSION + "." + MODEL_MINOR_VERSION; private static final Model MODEL_INSTANCE = new BrokerModel(); diff --git a/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java b/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java index 57b989c..3925f72 100644 --- a/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java +++ b/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java @@ -69,6 +69,7 @@ public class BrokerStoreUpgraderAndRecoverer extends AbstractConfigurationStoreU register(new Upgrader_6_1_to_7_0()); register(new Upgrader_7_0_to_7_1()); register(new Upgrader_7_1_to_8_0()); + register(new Upgrader_8_0_to_9_0()); } private static final class Upgrader_1_0_to_1_1 extends StoreUpgraderPhase @@ -733,6 +734,29 @@ public class BrokerStoreUpgraderAndRecoverer extends AbstractConfigurationStoreU } } + private class Upgrader_8_0_to_9_0 extends StoreUpgraderPhase + { + public Upgrader_8_0_to_9_0() + { + super("modelVersion", "8.0", "9.0"); + } + + @Override + public void configuredObject(final ConfiguredObjectRecord record) + { + if("Broker".equals(record.getType())) + { + upgradeRootRecord(record); + } + } + + @Override + public void complete() + { + + } + } + private static class VirtualHostEntryUpgrader { @SuppressWarnings("serial") diff --git a/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java b/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java index db16180..d1bc608 100644 --- a/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java +++ b/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java @@ -78,6 +78,7 @@ public class VirtualHostStoreUpgraderAndRecoverer extends AbstractConfigurationS register(new Upgrader_6_1_to_7_0()); register(new Upgrader_7_0_to_7_1()); register(new Upgrader_7_1_to_8_0()); + register(new Upgrader_8_0_to_9_0()); Map<String, UUID> defaultExchangeIds = new HashMap<String, UUID>(); for (String exchangeName : DEFAULT_EXCHANGES.keySet()) @@ -1087,6 +1088,29 @@ public class VirtualHostStoreUpgraderAndRecoverer extends AbstractConfigurationS } } + private class Upgrader_8_0_to_9_0 extends StoreUpgraderPhase + { + public Upgrader_8_0_to_9_0() + { + super("modelVersion", "8.0", "9.0"); + } + + @Override + public void configuredObject(final ConfiguredObjectRecord record) + { + if("VirtualHost".equals(record.getType())) + { + upgradeRootRecord(record); + } + } + + @Override + public void complete() + { + + } + } + public boolean upgradeAndRecover(final DurableConfigurationStore durableConfigurationStore, final ConfiguredObjectRecord... initialRecords) { diff --git a/broker-plugins/access-control/pom.xml b/broker-plugins/access-control/pom.xml index 41250aa..ba09cd8 100644 --- a/broker-plugins/access-control/pom.xml +++ b/broker-plugins/access-control/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/broker-plugins/amqp-0-10-protocol/pom.xml b/broker-plugins/amqp-0-10-protocol/pom.xml index 75a1c35..796a09c 100644 --- a/broker-plugins/amqp-0-10-protocol/pom.xml +++ b/broker-plugins/amqp-0-10-protocol/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/broker-plugins/amqp-0-8-protocol/pom.xml b/broker-plugins/amqp-0-8-protocol/pom.xml index 667bb9b..99eaf26 100644 --- a/broker-plugins/amqp-0-8-protocol/pom.xml +++ b/broker-plugins/amqp-0-8-protocol/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/broker-plugins/amqp-1-0-bdb-store/pom.xml b/broker-plugins/amqp-1-0-bdb-store/pom.xml index 03cf0f0..0738695 100644 --- a/broker-plugins/amqp-1-0-bdb-store/pom.xml +++ b/broker-plugins/amqp-1-0-bdb-store/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/broker-plugins/amqp-1-0-jdbc-store/pom.xml b/broker-plugins/amqp-1-0-jdbc-store/pom.xml index 92fdf8e..821a17f 100644 --- a/broker-plugins/amqp-1-0-jdbc-store/pom.xml +++ b/broker-plugins/amqp-1-0-jdbc-store/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> diff --git a/broker-plugins/amqp-1-0-protocol/pom.xml b/broker-plugins/amqp-1-0-protocol/pom.xml index d1a3201..4c16494 100644 --- a/broker-plugins/amqp-1-0-protocol/pom.xml +++ b/broker-plugins/amqp-1-0-protocol/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml b/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml index ca90d4c..9009cad 100644 --- a/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml +++ b/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml b/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml index 2cc9d35..9a01780 100644 --- a/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml +++ b/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml b/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml index 88eb3ab..53b5419 100644 --- a/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml +++ b/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/broker-plugins/derby-store/pom.xml b/broker-plugins/derby-store/pom.xml index 5d994ba..78ee584 100644 --- a/broker-plugins/derby-store/pom.xml +++ b/broker-plugins/derby-store/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/broker-plugins/jdbc-logging-logback/pom.xml b/broker-plugins/jdbc-logging-logback/pom.xml index 9f7f005..dba5c6c 100644 --- a/broker-plugins/jdbc-logging-logback/pom.xml +++ b/broker-plugins/jdbc-logging-logback/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/broker-plugins/jdbc-provider-bone/pom.xml b/broker-plugins/jdbc-provider-bone/pom.xml index 3671ef9..345ce15 100644 --- a/broker-plugins/jdbc-provider-bone/pom.xml +++ b/broker-plugins/jdbc-provider-bone/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/broker-plugins/jdbc-store/pom.xml b/broker-plugins/jdbc-store/pom.xml index 9b4c804..033c58d 100644 --- a/broker-plugins/jdbc-store/pom.xml +++ b/broker-plugins/jdbc-store/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/broker-plugins/logging-logback/pom.xml b/broker-plugins/logging-logback/pom.xml index 2d706fb..f381a0e 100644 --- a/broker-plugins/logging-logback/pom.xml +++ b/broker-plugins/logging-logback/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/broker-plugins/management-amqp/pom.xml b/broker-plugins/management-amqp/pom.xml index d4c2d20..0fc3098 100644 --- a/broker-plugins/management-amqp/pom.xml +++ b/broker-plugins/management-amqp/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>qpid-broker-parent</artifactId> <groupId>org.apache.qpid</groupId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/broker-plugins/management-http/pom.xml b/broker-plugins/management-http/pom.xml index c363c2f..3c34234 100644 --- a/broker-plugins/management-http/pom.xml +++ b/broker-plugins/management-http/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/controller/latest/LatestManagementControllerFactory.java b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/controller/latest/LatestManagementControllerFactory.java index be5981c..be8e43e 100644 --- a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/controller/latest/LatestManagementControllerFactory.java +++ b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/controller/latest/LatestManagementControllerFactory.java @@ -44,7 +44,7 @@ public class LatestManagementControllerFactory implements ManagementControllerFa @Override public String getPreviousVersion() { - return "7.1"; + return "8.0"; } @Override diff --git a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/controller/latest/LatestManagementControllerFactory.java b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/controller/v7_0/LegacyManagementControllerFactory_v8_0.java similarity index 75% copy from broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/controller/latest/LatestManagementControllerFactory.java copy to broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/controller/v7_0/LegacyManagementControllerFactory_v8_0.java index be5981c..977029e 100644 --- a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/controller/latest/LatestManagementControllerFactory.java +++ b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/controller/v7_0/LegacyManagementControllerFactory_v8_0.java @@ -18,27 +18,28 @@ * under the License. * */ -package org.apache.qpid.server.management.plugin.controller.latest; +package org.apache.qpid.server.management.plugin.controller.v7_0; import org.apache.qpid.server.management.plugin.HttpManagementConfiguration; import org.apache.qpid.server.management.plugin.ManagementController; import org.apache.qpid.server.management.plugin.ManagementControllerFactory; -import org.apache.qpid.server.model.BrokerModel; import org.apache.qpid.server.plugin.PluggableService; @PluggableService -public class LatestManagementControllerFactory implements ManagementControllerFactory +public class LegacyManagementControllerFactory_v8_0 implements ManagementControllerFactory { + public static final String MODEL_VERSION = "8.0"; + @Override public String getType() { - return "org.apache.qpid.server.management.plugin.model.latest"; + return "org.apache.qpid.server.management.plugin.model.v8_0"; } @Override public String getVersion() { - return BrokerModel.MODEL_VERSION; + return MODEL_VERSION; } @Override @@ -51,6 +52,9 @@ public class LatestManagementControllerFactory implements ManagementControllerFa public ManagementController createManagementController(final HttpManagementConfiguration<?> httpManagement, final ManagementController nextVersionManagementController) { - return new LatestManagementController(httpManagement); + + LegacyManagementController controller = new LegacyManagementController(nextVersionManagementController, MODEL_VERSION); + controller.initialize(); + return controller; } } diff --git a/systests/end-to-end-conversion-tests/src/main/resources/config-end-to-end-conversion-tests.json b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/controller/v7_0/category/LegacyCategoryControllerFactory_v8_0.java similarity index 57% copy from systests/end-to-end-conversion-tests/src/main/resources/config-end-to-end-conversion-tests.json copy to broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/controller/v7_0/category/LegacyCategoryControllerFactory_v8_0.java index 3188fda..7be3a34 100644 --- a/systests/end-to-end-conversion-tests/src/main/resources/config-end-to-end-conversion-tests.json +++ b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/controller/v7_0/category/LegacyCategoryControllerFactory_v8_0.java @@ -18,30 +18,17 @@ * under the License. * */ +package org.apache.qpid.server.management.plugin.controller.v7_0.category; + +import org.apache.qpid.server.management.plugin.controller.v7_0.LegacyManagementControllerFactory_v8_0; +import org.apache.qpid.server.plugin.PluggableService; + +@PluggableService +public class LegacyCategoryControllerFactory_v8_0 extends LegacyCategoryControllerFactory { - "name" : "${broker.name}", - "modelVersion" : "8.0", - "authenticationproviders" : [ { - "name" : "anon", - "type" : "Anonymous" - } ], - "ports" : [ { - "name" : "ANONYMOUS_AMQP", - "type" : "AMQP", - "authenticationProvider" : "anon", - "port" : "0", - "virtualhostaliases" : [ { - "name" : "defaultAlias", - "type" : "defaultAlias", - "durable" : true - }, { - "name": "patternMatchingAlias", - "type": "patternMatchingAlias" - }, { - "name" : "nameAlias", - "type" : "nameAlias", - "durable" : true - } ] - } ], - "virtualhostnodes" : [] + @Override + public String getModelVersion() + { + return LegacyManagementControllerFactory_v8_0.MODEL_VERSION; + } } diff --git a/broker-plugins/memory-store/pom.xml b/broker-plugins/memory-store/pom.xml index 684cd7a..6771fcc 100644 --- a/broker-plugins/memory-store/pom.xml +++ b/broker-plugins/memory-store/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/broker-plugins/websocket/pom.xml b/broker-plugins/websocket/pom.xml index 9e80c44..bdba8a6 100644 --- a/broker-plugins/websocket/pom.xml +++ b/broker-plugins/websocket/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/broker/pom.xml b/broker/pom.xml index 49562fd..61ca655 100644 --- a/broker/pom.xml +++ b/broker/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>qpid-broker</artifactId> diff --git a/doc/developer-guide/pom.xml b/doc/developer-guide/pom.xml index 240af8d..dbfbcc8 100644 --- a/doc/developer-guide/pom.xml +++ b/doc/developer-guide/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-java-doc</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>qpid-broker-j-developer-guide</artifactId> diff --git a/doc/java-broker/pom.xml b/doc/java-broker/pom.xml index a1de3f8..25f99c0 100644 --- a/doc/java-broker/pom.xml +++ b/doc/java-broker/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-java-doc</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>qpid-java-doc-broker</artifactId> diff --git a/doc/java-broker/src/docbkx/Java-Broker-Appendix-BDB-HA-Initial-Configuration.xml b/doc/java-broker/src/docbkx/Java-Broker-Appendix-BDB-HA-Initial-Configuration.xml index 465e201..e50940d 100644 --- a/doc/java-broker/src/docbkx/Java-Broker-Appendix-BDB-HA-Initial-Configuration.xml +++ b/doc/java-broker/src/docbkx/Java-Broker-Appendix-BDB-HA-Initial-Configuration.xml @@ -64,7 +64,7 @@ <programlisting> { "name": "\${broker.name}", - "modelVersion" : "8.0", + "modelVersion" : "9.0", "authenticationproviders" : [ { "name" : "plain", "type" : "Plain", diff --git a/doc/java-broker/src/docbkx/Java-Broker-Initial-Configuration.xml b/doc/java-broker/src/docbkx/Java-Broker-Initial-Configuration.xml index 0fae218..ad552b2 100644 --- a/doc/java-broker/src/docbkx/Java-Broker-Initial-Configuration.xml +++ b/doc/java-broker/src/docbkx/Java-Broker-Initial-Configuration.xml @@ -264,7 +264,7 @@ $ ./qpid-server -prop "qpid.amqp_port=10000" -prop "qpid.http_port=10001" <programlisting> { "name": "\${broker.name}", - "modelVersion" : "8.0", + "modelVersion" : "9.0", "authenticationproviders" : [ { "name" : "plain", "type" : "Plain", diff --git a/doc/java-perftests/pom.xml b/doc/java-perftests/pom.xml index 76b806e..e1d044e 100644 --- a/doc/java-perftests/pom.xml +++ b/doc/java-perftests/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-java-doc</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>qpid-java-doc-perftests</artifactId> diff --git a/doc/pom.xml b/doc/pom.xml index bd14a9f..9d5bf82 100644 --- a/doc/pom.xml +++ b/doc/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>qpid-java-doc</artifactId> diff --git a/joramtests/pom.xml b/joramtests/pom.xml index e248f74..ed50a64 100644 --- a/joramtests/pom.xml +++ b/joramtests/pom.xml @@ -24,7 +24,7 @@ <parent> <artifactId>qpid-broker-parent</artifactId> <groupId>org.apache.qpid</groupId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/perftests/pom.xml b/perftests/pom.xml index 28ba542..8469da5 100644 --- a/perftests/pom.xml +++ b/perftests/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>qpid-perftests</artifactId> diff --git a/perftests/visualisation-jfc/pom.xml b/perftests/visualisation-jfc/pom.xml index 9a65991..8a9c83d 100644 --- a/perftests/visualisation-jfc/pom.xml +++ b/perftests/visualisation-jfc/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/pom.xml b/pom.xml index f8c9d92..bafdcdc 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache Qpid Broker-J Parent</name> diff --git a/qpid-perftests-systests/pom.xml b/qpid-perftests-systests/pom.xml index 31617a9..cd17f42 100644 --- a/qpid-perftests-systests/pom.xml +++ b/qpid-perftests-systests/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-systests-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> <relativePath>../qpid-systests-parent/pom.xml</relativePath> </parent> diff --git a/qpid-systests-parent/pom.xml b/qpid-systests-parent/pom.xml index 6f2b335..6e13815 100644 --- a/qpid-systests-parent/pom.xml +++ b/qpid-systests-parent/pom.xml @@ -21,11 +21,11 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>qpid-systests-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache Qpid Broker-J System Test Parent</name> <description>Parent POM for Qpid system testing modules</description> diff --git a/qpid-test-utils/pom.xml b/qpid-test-utils/pom.xml index b44ac54..23d528e 100644 --- a/qpid-test-utils/pom.xml +++ b/qpid-test-utils/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>qpid-test-utils</artifactId> diff --git a/systests/end-to-end-conversion-tests/pom.xml b/systests/end-to-end-conversion-tests/pom.xml index 91463d0..ee2457c 100644 --- a/systests/end-to-end-conversion-tests/pom.xml +++ b/systests/end-to-end-conversion-tests/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-systests-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> <relativePath>../../qpid-systests-parent/pom.xml</relativePath> </parent> diff --git a/systests/end-to-end-conversion-tests/src/main/resources/config-end-to-end-conversion-tests.json b/systests/end-to-end-conversion-tests/src/main/resources/config-end-to-end-conversion-tests.json index 3188fda..5776a0a 100644 --- a/systests/end-to-end-conversion-tests/src/main/resources/config-end-to-end-conversion-tests.json +++ b/systests/end-to-end-conversion-tests/src/main/resources/config-end-to-end-conversion-tests.json @@ -20,7 +20,7 @@ */ { "name" : "${broker.name}", - "modelVersion" : "8.0", + "modelVersion" : "9.0", "authenticationproviders" : [ { "name" : "anon", "type" : "Anonymous" diff --git a/systests/protocol-tests-amqp-0-10/pom.xml b/systests/protocol-tests-amqp-0-10/pom.xml index c66e388..f3c9a62 100644 --- a/systests/protocol-tests-amqp-0-10/pom.xml +++ b/systests/protocol-tests-amqp-0-10/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-systests-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> <relativePath>../../qpid-systests-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/systests/protocol-tests-amqp-0-10/src/main/resources/config-protocol-tests-0-10.json b/systests/protocol-tests-amqp-0-10/src/main/resources/config-protocol-tests-0-10.json index a4fd9f3..583f32a 100644 --- a/systests/protocol-tests-amqp-0-10/src/main/resources/config-protocol-tests-0-10.json +++ b/systests/protocol-tests-amqp-0-10/src/main/resources/config-protocol-tests-0-10.json @@ -20,7 +20,7 @@ */ { "name" : "${broker.name}", - "modelVersion" : "8.0", + "modelVersion" : "9.0", "authenticationproviders" : [ { "name" : "anon", "type" : "Anonymous" diff --git a/systests/protocol-tests-amqp-0-8/pom.xml b/systests/protocol-tests-amqp-0-8/pom.xml index 420cb9d..6ac90df 100644 --- a/systests/protocol-tests-amqp-0-8/pom.xml +++ b/systests/protocol-tests-amqp-0-8/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-systests-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> <relativePath>../../qpid-systests-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/systests/protocol-tests-amqp-0-8/src/main/resources/config-protocol-tests-0-8.json b/systests/protocol-tests-amqp-0-8/src/main/resources/config-protocol-tests-0-8.json index c74f09d..b314d73 100644 --- a/systests/protocol-tests-amqp-0-8/src/main/resources/config-protocol-tests-0-8.json +++ b/systests/protocol-tests-amqp-0-8/src/main/resources/config-protocol-tests-0-8.json @@ -20,7 +20,7 @@ */ { "name" : "${broker.name}", - "modelVersion" : "8.0", + "modelVersion" : "9.0", "authenticationproviders" : [ { "name" : "anon", "type" : "Anonymous" diff --git a/systests/protocol-tests-amqp-1-0/pom.xml b/systests/protocol-tests-amqp-1-0/pom.xml index b4c691c..29cba10 100644 --- a/systests/protocol-tests-amqp-1-0/pom.xml +++ b/systests/protocol-tests-amqp-1-0/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-systests-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> <relativePath>../../qpid-systests-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/systests/protocol-tests-amqp-1-0/src/main/resources/config-protocol-tests.json b/systests/protocol-tests-amqp-1-0/src/main/resources/config-protocol-tests.json index 7ccded1..f96ba68 100644 --- a/systests/protocol-tests-amqp-1-0/src/main/resources/config-protocol-tests.json +++ b/systests/protocol-tests-amqp-1-0/src/main/resources/config-protocol-tests.json @@ -20,7 +20,7 @@ */ { "name" : "${broker.name}", - "modelVersion" : "8.0", + "modelVersion" : "9.0", "authenticationproviders" : [ { "name" : "anon", "type" : "Anonymous" diff --git a/systests/protocol-tests-core/pom.xml b/systests/protocol-tests-core/pom.xml index 7566e37..9aac67b 100644 --- a/systests/protocol-tests-core/pom.xml +++ b/systests/protocol-tests-core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-systests-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> <relativePath>../../qpid-systests-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/systests/qpid-systests-http-management/pom.xml b/systests/qpid-systests-http-management/pom.xml index 92a323a..4faa3b5 100644 --- a/systests/qpid-systests-http-management/pom.xml +++ b/systests/qpid-systests-http-management/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-systests-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> <relativePath>../../qpid-systests-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/systests/qpid-systests-http-management/src/main/resources/config-http-management-tests.json b/systests/qpid-systests-http-management/src/main/resources/config-http-management-tests.json index 0825206..e29cd96 100644 --- a/systests/qpid-systests-http-management/src/main/resources/config-http-management-tests.json +++ b/systests/qpid-systests-http-management/src/main/resources/config-http-management-tests.json @@ -20,7 +20,7 @@ */ { "name": "${broker.name}", - "modelVersion" : "8.0", + "modelVersion" : "9.0", "keystores": [ { "name": "systestsKeyStore", diff --git a/systests/qpid-systests-jms-core/pom.xml b/systests/qpid-systests-jms-core/pom.xml index 933f5a2..1797eee 100644 --- a/systests/qpid-systests-jms-core/pom.xml +++ b/systests/qpid-systests-jms-core/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-systests-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> <relativePath>../../qpid-systests-parent/pom.xml</relativePath> </parent> diff --git a/systests/qpid-systests-jms-core/src/main/resources/config-jms-tests.json b/systests/qpid-systests-jms-core/src/main/resources/config-jms-tests.json index af190a0..5e708aa 100644 --- a/systests/qpid-systests-jms-core/src/main/resources/config-jms-tests.json +++ b/systests/qpid-systests-jms-core/src/main/resources/config-jms-tests.json @@ -20,7 +20,7 @@ */ { "name" : "${broker.name}", - "modelVersion" : "8.0", + "modelVersion" : "9.0", "authenticationproviders" : [ { "name" : "anon", "type" : "Anonymous" diff --git a/systests/qpid-systests-jms_1.1/pom.xml b/systests/qpid-systests-jms_1.1/pom.xml index 96a2db6..17940a5 100644 --- a/systests/qpid-systests-jms_1.1/pom.xml +++ b/systests/qpid-systests-jms_1.1/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-systests-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> <relativePath>../../qpid-systests-parent/pom.xml</relativePath> </parent> diff --git a/systests/qpid-systests-jms_2.0/pom.xml b/systests/qpid-systests-jms_2.0/pom.xml index 5db2de2..7b0a633 100644 --- a/systests/qpid-systests-jms_2.0/pom.xml +++ b/systests/qpid-systests-jms_2.0/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-systests-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> <relativePath>../../qpid-systests-parent/pom.xml</relativePath> </parent> diff --git a/systests/qpid-systests-spawn-admin/pom.xml b/systests/qpid-systests-spawn-admin/pom.xml index e4f0d03..49fdf9e 100644 --- a/systests/qpid-systests-spawn-admin/pom.xml +++ b/systests/qpid-systests-spawn-admin/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-systests-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> <relativePath>../../qpid-systests-parent/pom.xml</relativePath> </parent> diff --git a/systests/qpid-systests-spawn-admin/src/main/resources/spawn-broker.json b/systests/qpid-systests-spawn-admin/src/main/resources/spawn-broker.json index 7e7eaae..c39951b 100644 --- a/systests/qpid-systests-spawn-admin/src/main/resources/spawn-broker.json +++ b/systests/qpid-systests-spawn-admin/src/main/resources/spawn-broker.json @@ -20,7 +20,7 @@ */ { "name" : "${broker.name}", - "modelVersion" : "8.0", + "modelVersion" : "9.0", "authenticationproviders" : [ { "name" : "plain", "type" : "Plain", diff --git a/systests/systests-utils/pom.xml b/systests/systests-utils/pom.xml index ed6a3d9..ae21b37 100644 --- a/systests/systests-utils/pom.xml +++ b/systests/systests-utils/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-systests-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> <relativePath>../../qpid-systests-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/tck/pom.xml b/tck/pom.xml index 117c672..6b9ed62 100644 --- a/tck/pom.xml +++ b/tck/pom.xml @@ -24,7 +24,7 @@ <parent> <artifactId>qpid-broker-parent</artifactId> <groupId>org.apache.qpid</groupId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/tools/pom.xml b/tools/pom.xml index 7269e12..2121182 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-parent</artifactId> - <version>8.0.1-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>qpid-tools</artifactId> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
