diff options
Diffstat (limited to 'qpid/java')
3 files changed, 21 insertions, 5 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/StoreUpgrader.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/StoreUpgrader.java index 0789664dd8..1a5ef9adca 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/StoreUpgrader.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/StoreUpgrader.java @@ -66,6 +66,22 @@ public abstract class StoreUpgrader } }; + private final static StoreUpgrader UPGRADE_1_1 = new StoreUpgrader("1.1") + { + @Override + protected void doUpgrade(ConfigurationEntryStore store) + { + ConfigurationEntry root = store.getRootEntry(); + + Map<String, Object> attributes = new HashMap<String, Object>(root.getAttributes()); + attributes.put(Broker.MODEL_VERSION, "1.2"); + ConfigurationEntry newRoot = new ConfigurationEntry(root.getId(),root.getType(),attributes,root.getChildrenIds(),store); + + store.save(newRoot); + + } + }; + private StoreUpgrader(String version) { _upgraders.put(version, this); @@ -73,8 +89,8 @@ public abstract class StoreUpgrader public static void upgrade(ConfigurationEntryStore store) { - StoreUpgrader upgrader = _upgraders.get(store.getRootEntry().getAttributes().get(Broker.MODEL_VERSION).toString()); - if(upgrader != null) + StoreUpgrader upgrader = null; + while ((upgrader = _upgraders.get(store.getRootEntry().getAttributes().get(Broker.MODEL_VERSION).toString())) != null) { upgrader.doUpgrade(store); } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Model.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Model.java index 45fadbdbcb..50538a5580 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Model.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Model.java @@ -37,7 +37,7 @@ public class Model * */ public static final int MODEL_MAJOR_VERSION = 1; - public static final int MODEL_MINOR_VERSION = 1; + public static final int MODEL_MINOR_VERSION = 2; public static final String MODEL_VERSION = MODEL_MAJOR_VERSION + "." + MODEL_MINOR_VERSION; private static final Model MODEL_INSTANCE = new Model(); 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 a203190c4b..7173433aa8 100644 --- a/qpid/java/broker-core/src/main/resources/initial-config.json +++ b/qpid/java/broker-core/src/main/resources/initial-config.json @@ -21,7 +21,7 @@ { "name": "Broker", "storeVersion": 1, - "modelVersion": "1.1", + "modelVersion": "1.2", "defaultVirtualHost" : "default", "authenticationproviders" : [ { "name" : "passwordFile", @@ -30,7 +30,7 @@ "preferencesproviders" : [{ "name": "fileSystemPreferences", "type": "FileSystemPreferences", - "path" : "${qpid.work_dir}/preferences/passwordFile" + "path" : "${qpid.work_dir}/user.preferences.json" }] } ], "ports" : [ { |