From 596d6b0bddaa2eab30572b1cfbc01ef8a02d6545 Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Sun, 31 Mar 2013 21:47:30 +0000
Subject: QPID-4390, QPID-4681: change attribute name to "modelVersion" to
 better refelect its purpose

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1463062 13f79535-47bb-0310-9956-ffa450edef68
---
 .../broker/src/main/java/org/apache/qpid/server/model/Broker.java   | 4 ++--
 .../broker/src/main/java/org/apache/qpid/server/model/Model.java    | 6 +++---
 .../java/org/apache/qpid/server/model/adapter/BrokerAdapter.java    | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'qpid/java/broker/src')

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Broker.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Broker.java
index 8f64cab2ec..1f901c2f8a 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Broker.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Broker.java
@@ -74,7 +74,7 @@ public interface Broker extends ConfiguredObject
     String STORE_TYPE = "storeType";
     String STORE_VERSION = "storeVersion";
     String STORE_PATH = "storePath";
-    String MANAGEMENT_VERSION = "managementVersion";
+    String MODEL_VERSION = "modelVersion";
 
     String VIRTUALHOST_STORE_TRANSACTION_IDLE_TIMEOUT_CLOSE = "virtualhost.storeTransactionIdleTimeoutClose";
     String VIRTUALHOST_STORE_TRANSACTION_IDLE_TIMEOUT_WARN  = "virtualhost.storeTransactionIdleTimeoutWarn";
@@ -142,7 +142,7 @@ public interface Broker extends ConfiguredObject
                               STORE_TYPE,
                               STORE_VERSION,
                               STORE_PATH,
-                              MANAGEMENT_VERSION,
+                              MODEL_VERSION,
                               VIRTUALHOST_STORE_TRANSACTION_IDLE_TIMEOUT_CLOSE,
                               VIRTUALHOST_STORE_TRANSACTION_IDLE_TIMEOUT_WARN,
                               VIRTUALHOST_STORE_TRANSACTION_OPEN_TIMEOUT_CLOSE,
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Model.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Model.java
index 3244d55fe2..bf4c40815a 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Model.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Model.java
@@ -30,10 +30,10 @@ import java.util.Map;
 public class Model
 {
     /*
-     * API version for the broker management interfaces
+     * API version for the broker model
      */
-    public static final int MANAGEMENT_API_MAJOR_VERSION = 1;
-    public static final int MANAGEMENT_API_MINOR_VERSION = 0;
+    public static final int MODEL_MAJOR_VERSION = 1;
+    public static final int MODEL_MINOR_VERSION = 0;
 
     private static final Model MODEL_INSTANCE = new Model();
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
index 9759718ddd..b6a2bbac71 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
@@ -734,9 +734,9 @@ public class BrokerAdapter extends AbstractAdapter implements Broker, Configurat
             }
             return null;
         }
-        else if (MANAGEMENT_VERSION.equals(name))
+        else if (MODEL_VERSION.equals(name))
         {
-            return Model.MANAGEMENT_API_MAJOR_VERSION + "." + Model.MANAGEMENT_API_MINOR_VERSION;
+            return Model.MODEL_MAJOR_VERSION + "." + Model.MODEL_MINOR_VERSION;
         }
         else if (STORE_VERSION.equals(name))
         {
-- 
cgit v1.2.1