You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2014/12/28 20:26:56 UTC
svn commit: r1648245 - in /qpid/trunk/qpid/java:
broker-core/src/main/java/org/apache/qpid/server/model/
broker-core/src/main/java/org/apache/qpid/server/model/adapter/
broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plug...
Author: kwall
Date: Sun Dec 28 19:26:55 2014
New Revision: 1648245
URL: http://svn.apache.org/r1648245
Log:
QPID-6290: [Java Broker] Management UI - refactor add VHN/VH to remove type based conditional logic
* Also removed now defunct Broker attributes #supportedVirtualHostNodeTypes and #supportedVirtualHostTypes
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
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/model/adapter/BrokerAdapter.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/HelperServlet.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/metadata.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestTest.java
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java?rev=1648245&r1=1648244&r2=1648245&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java Sun Dec 28 19:26:55 2014
@@ -40,8 +40,6 @@ public interface Broker<X extends Broker
String PLATFORM = "platform";
String PROCESS_PID = "processPid";
String PRODUCT_VERSION = "productVersion";
- String SUPPORTED_VIRTUALHOST_TYPES = "supportedVirtualHostTypes";
- String SUPPORTED_VIRTUALHOSTNODE_TYPES = "supportedVirtualHostNodeTypes";
String SUPPORTED_AUTHENTICATION_PROVIDERS = "supportedAuthenticationProviders";
String SUPPORTED_PREFERENCES_PROVIDER_TYPES = "supportedPreferencesProviderTypes";
String DEFAULT_VIRTUAL_HOST = "defaultVirtualHost";
@@ -110,8 +108,6 @@ public interface Broker<X extends Broker
@DerivedAttribute
String getProductVersion();
- @DerivedAttribute
- Collection<String> getSupportedVirtualHostNodeTypes();
@DerivedAttribute
Collection<String> getSupportedAuthenticationProviders();
@@ -119,9 +115,6 @@ public interface Broker<X extends Broker
@DerivedAttribute
Collection<String> getSupportedPreferencesProviderTypes();
- @DerivedAttribute
- Collection<String> getSupportedVirtualHostTypes();
-
@ManagedAttribute
String getDefaultVirtualHost();
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=1648245&r1=1648244&r2=1648245&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 Sun Dec 28 19:26:55 2014
@@ -42,6 +42,7 @@ 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; remove Broker#supportedVirtualHostNodeTypes and #supportedVirtualHostTypes
*/
public static final int MODEL_MAJOR_VERSION = 2;
public static final int MODEL_MINOR_VERSION = 1;
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java?rev=1648245&r1=1648244&r2=1648245&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java Sun Dec 28 19:26:55 2014
@@ -327,18 +327,6 @@ public class BrokerAdapter extends Abstr
}
@Override
- public Collection<String> getSupportedVirtualHostNodeTypes()
- {
- return getObjectFactory().getSupportedTypes(VirtualHostNode.class);
- }
-
- @Override
- public Collection<String> getSupportedVirtualHostTypes()
- {
- return getObjectFactory().getSupportedTypes(VirtualHost.class);
- }
-
- @Override
public Collection<String> getSupportedAuthenticationProviders()
{
return getObjectFactory().getSupportedTypes(AuthenticationProvider.class);
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/HelperServlet.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/HelperServlet.java?rev=1648245&r1=1648244&r2=1648245&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/HelperServlet.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/HelperServlet.java Sun Dec 28 19:26:55 2014
@@ -54,8 +54,6 @@ public class HelperServlet extends Abstr
_mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true);
Action[] supportedActions = {
- new ListBrokerAttribute(Broker.SUPPORTED_VIRTUALHOSTNODE_TYPES, "ListVirtualHostNodeTypes"),
- new ListBrokerAttribute(Broker.SUPPORTED_VIRTUALHOST_TYPES, "ListVirtualHostTypes"),
new ListBrokerAttribute(Broker.SUPPORTED_PREFERENCES_PROVIDER_TYPES, "ListPreferencesProvidersTypes"),
new ListBrokerAttribute(Broker.PRODUCT_VERSION, "version"),
new ListGroupProviderAttributes(),
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/metadata.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/metadata.js?rev=1648245&r1=1648244&r2=1648245&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/metadata.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/metadata.js Sun Dec 28 19:26:55 2014
@@ -69,7 +69,13 @@ define(["dojo/_base/xhr",
implementsManagedInterface: function (category, type, managedInterfaceName)
{
return this.getMetaData(category, type).managedInterfaces.indexOf(managedInterfaceName) >= 0;
+ },
+ validChildTypes: function (category, type, childCategory)
+ {
+ var metaData = this.getMetaData(category, type);
+ return metaData ? metaData.validChildTypes[childCategory] : [];
}
+
};
metadata._init();
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js?rev=1648245&r1=1648244&r2=1648245&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js Sun Dec 28 19:26:55 2014
@@ -90,24 +90,15 @@ define(["dojo/_base/xhr",
this.virtualHostType.set("disabled", true);
- this.supportedVirtualHostNodeTypes = metadata.getTypesForCategory("VirtualHostNode");
- this.supportedVirtualHostNodeTypes.sort();
- this.supportedVirtualHostTypes = metadata.getTypesForCategory("VirtualHost");
- this.supportedVirtualHostTypes.sort();
-
- //VH Type BDB_HA_REPLICA is not user creatable. This is only needed until we have model meta data available.
- this.supportedVirtualHostTypes = array.filter(this.supportedVirtualHostTypes, function(item){
- return item != "BDB_HA_REPLICA" && item != "BDB_HA";
- });
+ var supportedVirtualHostNodeTypes = metadata.getTypesForCategory("VirtualHostNode");
+ supportedVirtualHostNodeTypes.sort();
- var virtualHostNodeTypeStore = util.makeTypeStore(this.supportedVirtualHostNodeTypes);
+ var virtualHostNodeTypeStore = util.makeTypeStore(supportedVirtualHostNodeTypes);
this.virtualHostNodeType.set("store", virtualHostNodeTypeStore);
this.virtualHostNodeType.set("disabled", false);
this.virtualHostNodeType.on("change", function(type){that._vhnTypeChanged(type, that.virtualHostNodeTypeFieldsContainer, "qpid/management/virtualhostnode/");});
- this.virtualHostTypeStore = util.makeTypeStore(this.supportedVirtualHostTypes);
- this.virtualHostType.set("store", this.virtualHostTypeStore);
- this.virtualHostType.set("disabled", false);
+ this.virtualHostType.set("disabled", true);
this.virtualHostType.on("change", function(type){that._vhTypeChanged(type, that.virtualHostTypeFieldsContainer, "qpid/management/virtualhost/");});
if (this.reader)
@@ -191,8 +182,21 @@ define(["dojo/_base/xhr",
},
_vhnTypeChanged: function (type, typeFieldsContainer, urlStem)
{
- this._processDropDownsForBdbHa(type);
- this._processDropDownsForJson(type);
+ var validChildTypes = metadata.validChildTypes("VirtualHostNode", type, "VirtualHost");
+ validChildTypes.sort();
+
+ var virtualHostTypeStore = util.makeTypeStore( validChildTypes );
+
+ this.virtualHostType.set("store", virtualHostTypeStore);
+ this.virtualHostType.set("disabled", validChildTypes.length <= 1);
+ if (validChildTypes.length == 1)
+ {
+ this.virtualHostType.set("value", validChildTypes[0]);
+ }
+ else
+ {
+ this.virtualHostType.reset();
+ }
var vhnTypeSelected = !(type == '');
this.virtualHostNodeUploadFields.style.display = vhnTypeSelected ? "block" : "none";
@@ -272,50 +276,6 @@ define(["dojo/_base/xhr",
this.addButton.set("disabled", false);
this.virtualHostNodeSelectedFileStatusContainer.className = "loadedIcon";
},
- _processDropDownsForBdbHa: function (type)
- {
- if (type == "BDB_HA")
- {
- this.virtualHostType.set("disabled", true);
- if (!this.virtualHostTypeStore.get("BDB_HA"))
- {
- this.virtualHostTypeStore.add({id: "BDB_HA", name: "BDB_HA"});
- }
- this.virtualHostType.set("value", "BDB_HA");
- }
- else
- {
- if (this.virtualHostTypeStore.get("BDB_HA"))
- {
- this.virtualHostTypeStore.remove("BDB_HA");
- }
- this.virtualHostType.set("value", "");
-
- this.virtualHostType.set("disabled", false);
- }
- },
- _processDropDownsForJson: function (type)
- {
- if (type == "JSON")
- {
- if (this.virtualHostType.value == "ProvidedStore")
- {
- this.virtualHostType.set("value", "");
- }
-
- if (this.virtualHostTypeStore.get("ProvidedStore"))
- {
- this.virtualHostTypeStore.remove("ProvidedStore");
- }
- }
- else
- {
- if (!this.virtualHostTypeStore.get("ProvidedStore"))
- {
- this.virtualHostTypeStore.add({id: "ProvidedStore", name: "ProvidedStore"});
- }
- }
- },
_cancel: function(e)
{
if (this.reader)
Modified: qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestTest.java?rev=1648245&r1=1648244&r2=1648245&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestTest.java Sun Dec 28 19:26:55 2014
@@ -235,9 +235,6 @@ public class BrokerRestTest extends Qpid
assertNotNull("Unexpected value of attribute ports", brokerDetails.get(BROKER_PORTS_ATTRIBUTE));
assertNotNull("Unexpected value of attribute authenticationproviders", brokerDetails.get(BROKER_AUTHENTICATIONPROVIDERS_ATTRIBUTE));
- assertNotNull("Unexpected value of attribute supportedVirtualHostTypes", brokerDetails.get(Broker.SUPPORTED_VIRTUALHOST_TYPES));
- assertNotNull("Unexpected value of attribute supportedVirtualHostNodeTypes", brokerDetails.get(Broker.SUPPORTED_VIRTUALHOSTNODE_TYPES));
-
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org