QPID-6367: [Java Broker] Change broker model version to 3.0 due to backward incompatible model changes

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1657905 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 14 insertions, 13 deletions

diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java
index a9e9f26af0..57d61b963a 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java
@@ -42,12 +42,13 @@ public final class BrokerModel extends Model
      * 1.3 Truststore/Keystore type => trustStoreType / type => keyStoreType
      * 1.4 Separate messageStoreSettings from virtualhost
      * 2.0 Introduce VirtualHostNode as a child of a Broker instead of VirtualHost
-     * 2.1 Add VH aliases;
+     * 3.0 Add VH aliases;
      *     Remove Broker#supportedVirtualHostNodeTypes, #supportedVirtualHostTypes, #supportedAuthenticationProviders,
      *            supportedPreferencesProviderTypes, VH#supportedExchangeTypes, VH#supportedQueueTypes
+     *     Renamed FileTrustStore/FileKeyStore.path => FileTrustStore/FileKeyStore.storeUrl
      */
-    public static final int MODEL_MAJOR_VERSION = 2;
-    public static final int MODEL_MINOR_VERSION = 1;
+    public static final int MODEL_MAJOR_VERSION = 3;
+    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();
     private final Map<Class<? extends ConfiguredObject>, Collection<Class<? extends ConfiguredObject>>> _parents =
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java
index 08612825de..4da9c898f2 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java
@@ -54,7 +54,7 @@ public class BrokerStoreUpgraderAndRecoverer
         register(new Upgrader_1_1_to_1_2());
         register(new Upgrader_1_2_to_1_3());
         register(new Upgrader_1_3_to_2_0());
-        register(new Upgrader_2_0_to_2_1());
+        register(new Upgrader_2_0_to_3_0());
     }
 
     private void register(StoreUpgraderPhase upgrader)
@@ -217,11 +217,11 @@ public class BrokerStoreUpgraderAndRecoverer
         }
 
     }
-    private class Upgrader_2_0_to_2_1 extends StoreUpgraderPhase
+    private class Upgrader_2_0_to_3_0 extends StoreUpgraderPhase
     {
-        public Upgrader_2_0_to_2_1()
+        public Upgrader_2_0_to_3_0()
         {
-            super("modelVersion", "2.0", "2.1");
+            super("modelVersion", "2.0", "3.0");
         }
 
         @Override
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java
index cd3ae5fdb7..10d8a5d61c 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java
@@ -63,7 +63,7 @@ public class VirtualHostStoreUpgraderAndRecoverer
         register(new Upgrader_0_2_to_0_3());
         register(new Upgrader_0_3_to_0_4());
         register(new Upgrader_0_4_to_2_0());
-        register(new Upgrader_2_0_to_2_1());
+        register(new Upgrader_2_0_to_3_0());
 
         Map<String, UUID> defaultExchangeIds = new HashMap<String, UUID>();
         for (String exchangeName : DEFAULT_EXCHANGES.keySet())
@@ -483,11 +483,11 @@ public class VirtualHostStoreUpgraderAndRecoverer
 
     }
 
-    private class Upgrader_2_0_to_2_1 extends StoreUpgraderPhase
+    private class Upgrader_2_0_to_3_0 extends StoreUpgraderPhase
     {
-        public Upgrader_2_0_to_2_1()
+        public Upgrader_2_0_to_3_0()
         {
-            super("modelVersion", "2.0", "2.1");
+            super("modelVersion", "2.0", "3.0");
         }
 
         @Override
diff --git a/qpid/java/broker-core/src/main/resources/initial-config.json b/qpid/java/broker-core/src/main/resources/initial-config.json
index 12411fc436..7d88d8fd5c 100644
--- a/qpid/java/broker-core/src/main/resources/initial-config.json
+++ b/qpid/java/broker-core/src/main/resources/initial-config.json
@@ -20,7 +20,7 @@
  */
 {
   "name": "${broker.name}",
-  "modelVersion": "2.1",
+  "modelVersion": "3.0",
   "defaultVirtualHost" : "default",
   "authenticationproviders" : [ {
     "name" : "passwordFile",
diff --git a/qpid/java/systests/etc/config-systests.json b/qpid/java/systests/etc/config-systests.json
index 8103f4568c..05ba4f2178 100644
--- a/qpid/java/systests/etc/config-systests.json
+++ b/qpid/java/systests/etc/config-systests.json
@@ -21,7 +21,7 @@
 {
   "name": "Broker",
   "defaultVirtualHost" : "test",
-  "modelVersion": "2.1",
+  "modelVersion": "3.0",
   "authenticationproviders" : [ {
     "name" : "plain",
     "type" : "PlainPasswordFile",