Author: robbie
Date: Sun Mar 31 21:47:30 2013
New Revision: 1463062
URL: http://svn.apache.org/r1463062
Log:
QPID-4390, QPID-4681: change attribute name to "modelVersion" to better
refelect its purpose
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Broker.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Model.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Broker.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Broker.java?rev=1463062&r1=1463061&r2=1463062&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Broker.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Broker.java
Sun Mar 31 21:47:30 2013
@@ -74,7 +74,7 @@ public interface Broker extends Configur
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 Configur
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,
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Model.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Model.java?rev=1463062&r1=1463061&r2=1463062&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Model.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Model.java
Sun Mar 31 21:47:30 2013
@@ -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();
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java?rev=1463062&r1=1463061&r2=1463062&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
Sun Mar 31 21:47:30 2013
@@ -734,9 +734,9 @@ public class BrokerAdapter extends Abstr
}
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))
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
