You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2013/10/05 02:34:23 UTC
svn commit: r1529366 - in /qpid/trunk/qpid/java/broker-core/src/main:
java/org/apache/qpid/server/configuration/startup/StoreUpgrader.java
java/org/apache/qpid/server/model/Model.java resources/initial-config.json
Author: orudyy
Date: Sat Oct 5 00:34:23 2013
New Revision: 1529366
URL: http://svn.apache.org/r1529366
Log:
QPID-5138: Bump broker model version to 1.2
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/StoreUpgrader.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Model.java
qpid/trunk/qpid/java/broker-core/src/main/resources/initial-config.json
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/StoreUpgrader.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/StoreUpgrader.java?rev=1529366&r1=1529365&r2=1529366&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/StoreUpgrader.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/StoreUpgrader.java Sat Oct 5 00:34:23 2013
@@ -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);
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Model.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Model.java?rev=1529366&r1=1529365&r2=1529366&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Model.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Model.java Sat Oct 5 00:34:23 2013
@@ -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();
Modified: qpid/trunk/qpid/java/broker-core/src/main/resources/initial-config.json
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/resources/initial-config.json?rev=1529366&r1=1529365&r2=1529366&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/resources/initial-config.json (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/resources/initial-config.json Sat Oct 5 00:34:23 2013
@@ -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" : [ {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org