qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oru...@apache.org
Subject qpid-broker-j git commit: QPID-8261: [Broker-J] Change broker model version to 7.1
Date Mon, 03 Dec 2018 16:08:46 GMT
Repository: qpid-broker-j
Updated Branches:
  refs/heads/master ce967f5dc -> 40691ecb9


QPID-8261: [Broker-J] Change broker model version to 7.1


Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/40691ecb
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/40691ecb
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/40691ecb

Branch: refs/heads/master
Commit: 40691ecb9409c91fedf6ab561e4fde671f5dd565
Parents: ce967f5
Author: Alex Rudyy <orudyy@apache.org>
Authored: Mon Dec 3 16:08:34 2018 +0000
Committer: Alex Rudyy <orudyy@apache.org>
Committed: Mon Dec 3 16:08:34 2018 +0000

----------------------------------------------------------------------
 .../apache/qpid/server/model/BrokerModel.java   | 22 ++++++++++++++++-
 .../store/BrokerStoreUpgraderAndRecoverer.java  | 26 +++++++++++++++++++-
 .../VirtualHostStoreUpgraderAndRecoverer.java   | 26 +++++++++++++++++++-
 .../src/main/resources/initial-config.json      |  2 +-
 .../Java-Broker-Initial-Configuration.xml       |  2 +-
 .../config-end-to-end-conversion-tests.json     |  2 +-
 .../resources/config-protocol-tests-0-10.json   |  2 +-
 .../resources/config-protocol-tests-0-8.json    |  2 +-
 .../main/resources/config-protocol-tests.json   |  2 +-
 .../resources/config-http-management-tests.json |  2 +-
 .../src/main/resources/config-jms-tests.json    |  2 +-
 .../src/main/resources/spawn-broker.json        |  2 +-
 12 files changed, 80 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/40691ecb/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java
----------------------------------------------------------------------
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 3d21df4..aad9c23 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
@@ -56,9 +56,29 @@ public final class BrokerModel extends Model
      * 7.0 Remove bindings, Consumer sole parent is Queue
      *     Remodelled alternateExchange as alternateBindings
      *     Remodelled Queue grouping attributes
+     * 7.1 Operations for transition into DELETE state are replaced with delete method on
AbstractConfiguredObject similar to open/close
+     *     Introduced pluggable service AuthIdentityConnectionPropertyEnricher
+     *     Introduced attribute Port#bindingAddress
+     *     Introduced attribute Queue#expiryPolicy and context variable 'queue.defaultExpiryPolicy'
+     *     Introduced property 'abstract' in annotation ManagedAttributeValueType
+     *     Attributes property 'initialization' is set to 'materialize' for
+     *         FileKeyStore#keyManagerFactoryAlgorithm and FileKeyStore#keyStoreType
+     *         FileTrustStore#trustManagerFactoryAlgorithm and FileTrustStore#trustStoreType
+     *     Introduced attribute FileKeyStore#useHostNameMatching
+     *     Introduced context variable 'broker.failStartupWithErroredChildScope'
+     *     Introduced ACL rule owner attribute
+     *     // changes below are back ported into 7.0
+     *     Introduced context variables for named caches on VirtualHost
+     *     Introduced statistic Broker#inboundMessageSizeHighWatermark
+     *     Introduced statistics Connection#lastInboundMessageTime, Connection#lastOutboundMessageTime
and Connection#lastMessageTime
+     *     Introduced statistics AmqpPort#totalConnectionCount
+     *     Parameter bindingKey is made mandatory in Exchange#bind and Exchange#unbind
+     *     Attribute OAuth2AuthenticationProvider#clientSecret is not mandatory anymore
+     *     Introduced statistics QueueManagingVirtualHost#totalConnectionCount and QueueManagingVirtualHost#InboundMessageSizeHighWatermark
+     *     BDBHAVirtualHostNode attributes name, groupName, address are made immutable
      */
     public static final int MODEL_MAJOR_VERSION = 7;
-    public static final int MODEL_MINOR_VERSION = 0;
+    public static final int MODEL_MINOR_VERSION = 1;
     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>, Class<? extends ConfiguredObject>>
_parents =

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/40691ecb/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java
----------------------------------------------------------------------
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 e69fe77..cc92f2f 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
@@ -67,7 +67,7 @@ public class BrokerStoreUpgraderAndRecoverer extends AbstractConfigurationStoreU
         register(new Upgrader_3_0_to_6_0());
         register(new Upgrader_6_0_to_6_1());
         register(new Upgrader_6_1_to_7_0());
-
+        register(new Upgrader_7_0_to_7_1());
     }
 
     private static final class Upgrader_1_0_to_1_1 extends StoreUpgraderPhase
@@ -684,6 +684,30 @@ public class BrokerStoreUpgraderAndRecoverer extends AbstractConfigurationStoreU
         }
     }
 
+    private class Upgrader_7_0_to_7_1 extends StoreUpgraderPhase
+    {
+
+        public Upgrader_7_0_to_7_1()
+        {
+            super("modelVersion", "7.0", "7.1");
+        }
+
+        @Override
+        public void configuredObject(final ConfiguredObjectRecord record)
+        {
+            if("Broker".equals(record.getType()))
+            {
+                upgradeRootRecord(record);
+            }
+        }
+
+        @Override
+        public void complete()
+        {
+
+        }
+    }
+
     private static class VirtualHostEntryUpgrader
     {
         @SuppressWarnings("serial")

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/40691ecb/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java
----------------------------------------------------------------------
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 988f492..8b854b9 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
@@ -76,7 +76,7 @@ public class VirtualHostStoreUpgraderAndRecoverer extends AbstractConfigurationS
         register(new Upgrader_3_0_to_6_0());
         register(new Upgrader_6_0_to_6_1());
         register(new Upgrader_6_1_to_7_0());
-
+        register(new Upgrader_7_0_to_7_1());
 
         Map<String, UUID> defaultExchangeIds = new HashMap<String, UUID>();
         for (String exchangeName : DEFAULT_EXCHANGES.keySet())
@@ -1038,6 +1038,30 @@ public class VirtualHostStoreUpgraderAndRecoverer extends AbstractConfigurationS
     }
 
 
+    private class Upgrader_7_0_to_7_1 extends StoreUpgraderPhase
+    {
+
+        public Upgrader_7_0_to_7_1()
+        {
+            super("modelVersion", "7.0", "7.1");
+        }
+
+        @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)
     {

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/40691ecb/broker-core/src/main/resources/initial-config.json
----------------------------------------------------------------------
diff --git a/broker-core/src/main/resources/initial-config.json b/broker-core/src/main/resources/initial-config.json
index 512eaf5..f2a82c1 100644
--- a/broker-core/src/main/resources/initial-config.json
+++ b/broker-core/src/main/resources/initial-config.json
@@ -20,7 +20,7 @@
  */
 {
   "name": "${broker.name}",
-  "modelVersion": "7.0",
+  "modelVersion": "7.1",
   "authenticationproviders" : [ {
     "name" : "plain",
     "type" : "Plain",

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/40691ecb/doc/java-broker/src/docbkx/Java-Broker-Initial-Configuration.xml
----------------------------------------------------------------------
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 676a4b2..bfd68f2 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": "7.0",
+  "modelVersion" : "7.1",
   "authenticationproviders" : [ {
     "name" : "passwordFile",
     "type" : "PlainPasswordFile",

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/40691ecb/systests/end-to-end-conversion-tests/src/main/resources/config-end-to-end-conversion-tests.json
----------------------------------------------------------------------
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 c9fe08e..9d512f0 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" : "7.0",
+  "modelVersion" : "7.1",
   "authenticationproviders" : [ {
     "name" : "anon",
     "type" : "Anonymous"

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/40691ecb/systests/protocol-tests-amqp-0-10/src/main/resources/config-protocol-tests-0-10.json
----------------------------------------------------------------------
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 c7e5998..813d127 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" : "7.0",
+  "modelVersion" : "7.1",
   "authenticationproviders" : [ {
     "name" : "anon",
     "type" : "Anonymous"

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/40691ecb/systests/protocol-tests-amqp-0-8/src/main/resources/config-protocol-tests-0-8.json
----------------------------------------------------------------------
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 791d9ef..d34fb4e 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" : "7.0",
+  "modelVersion" : "7.1",
   "authenticationproviders" : [ {
     "name" : "anon",
     "type" : "Anonymous"

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/40691ecb/systests/protocol-tests-amqp-1-0/src/main/resources/config-protocol-tests.json
----------------------------------------------------------------------
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 ca54cc4..9793fe9 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" : "7.0",
+  "modelVersion" : "7.1",
   "authenticationproviders" : [ {
     "name" : "anon",
     "type" : "Anonymous"

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/40691ecb/systests/qpid-systests-http-management/src/main/resources/config-http-management-tests.json
----------------------------------------------------------------------
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 356c4bb..f8405de 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": "7.0",
+  "modelVersion" : "7.1",
   "keystores": [
     {
       "name": "systestsKeyStore",

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/40691ecb/systests/qpid-systests-jms-core/src/main/resources/config-jms-tests.json
----------------------------------------------------------------------
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 7fc0416..fe06e08 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" : "7.0",
+  "modelVersion" : "7.1",
   "authenticationproviders" : [ {
     "name" : "anon",
     "type" : "Anonymous"

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/40691ecb/systests/qpid-systests-spawn-admin/src/main/resources/spawn-broker.json
----------------------------------------------------------------------
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 3d4df12..42af64c 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" : "7.0",
+  "modelVersion" : "7.1",
   "authenticationproviders" : [ {
     "name" : "plain",
     "type" : "Plain",


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message