Author: orudyy
Date: Fri Feb 6 17:46:57 2015
New Revision: 1657905
URL: http://svn.apache.org/r1657905
Log:
QPID-6367: [Java Broker] Change broker model version to 3.0 due to backward
incompatible model changes
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java
qpid/trunk/qpid/java/broker-core/src/main/resources/initial-config.json
qpid/trunk/qpid/java/systests/etc/config-systests.json
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java?rev=1657905&r1=1657904&r2=1657905&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java
Fri Feb 6 17:46:57 2015
@@ -42,12 +42,13 @@ public final class BrokerModel extends M
* 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 =
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java?rev=1657905&r1=1657904&r2=1657905&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java
Fri Feb 6 17:46:57 2015
@@ -54,7 +54,7 @@ public class BrokerStoreUpgraderAndRecov
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 BrokerStoreUpgraderAndRecov
}
}
- 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
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java?rev=1657905&r1=1657904&r2=1657905&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java
Fri Feb 6 17:46:57 2015
@@ -63,7 +63,7 @@ public class VirtualHostStoreUpgraderAnd
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 VirtualHostStoreUpgraderAnd
}
- 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
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=1657905&r1=1657904&r2=1657905&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 Fri
Feb 6 17:46:57 2015
@@ -20,7 +20,7 @@
*/
{
"name": "${broker.name}",
- "modelVersion": "2.1",
+ "modelVersion": "3.0",
"defaultVirtualHost" : "default",
"authenticationproviders" : [ {
"name" : "passwordFile",
Modified: qpid/trunk/qpid/java/systests/etc/config-systests.json
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/etc/config-systests.json?rev=1657905&r1=1657904&r2=1657905&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/etc/config-systests.json (original)
+++ qpid/trunk/qpid/java/systests/etc/config-systests.json Fri Feb 6 17:46:57
2015
@@ -21,7 +21,7 @@
{
"name": "Broker",
"defaultVirtualHost" : "test",
- "modelVersion": "2.1",
+ "modelVersion": "3.0",
"authenticationproviders" : [ {
"name" : "plain",
"type" : "PlainPasswordFile",
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
