You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2013/04/23 13:40:34 UTC
svn commit: r1470902 - in /qpid/branches/0.22/qpid/java: ./
broker-plugins/management-http/src/main/java/resources/
broker-plugins/management-http/src/main/java/resources/js/qpid/management/
Author: orudyy
Date: Tue Apr 23 11:40:33 2013
New Revision: 1470902
URL: http://svn.apache.org/r1470902
Log:
QPID-4769: Add port tab into java broker web management console
merged from trunk r1470899
Added:
qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
- copied unchanged from r1470899, qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/showPort.html
- copied unchanged from r1470899, qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPort.html
Modified:
qpid/branches/0.22/qpid/java/ (props changed)
qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/addPort.html
qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js
qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js
Propchange: qpid/branches/0.22/qpid/java/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java:r1470899
Modified: qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/addPort.html
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/addPort.html?rev=1470902&r1=1470901&r2=1470902&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/addPort.html (original)
+++ qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/addPort.html Tue Apr 23 11:40:33 2013
@@ -92,7 +92,7 @@
</div>
<div><strong>Trust Stores:</strong></div>
<table id="formAddPort.trustStores" data-dojo-type="dojox.grid.EnhancedGrid"
- data-dojo-props="label:'Trust Stores:',plugins:{indirectSelection: true},rowSelector:'0px' " style="height: 100px">
+ data-dojo-props="label:'Trust Stores:',plugins:{indirectSelection: true},rowSelector:'0px' " style="height: 100px; width:400px">
<thead>
<tr>
<th field="name">Name</th>
Modified: qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js?rev=1470902&r1=1470901&r2=1470902&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js (original)
+++ qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js Tue Apr 23 11:40:33 2013
@@ -549,7 +549,7 @@ define(["dojo/_base/xhr",
var idx = evt.rowIndex,
theItem = this.getItem(idx);
var name = obj.dataStore.getValue(theItem,"name");
- addPort.show(name, that.brokerData.authenticationproviders, that.brokerData.keystores, that.brokerData.truststores);
+ that.controller.show("port", name, brokerObj);
});
}, gridProperties, EnhancedGrid);
Modified: qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js?rev=1470902&r1=1470901&r2=1470902&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js (original)
+++ qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js Tue Apr 23 11:40:33 2013
@@ -180,13 +180,12 @@ define(["dojo/_base/xhr",
registry.byId("formAddPort.keyStore").set("disabled", true);
}
- if (transportSSLPanel.domNode.style.display != transportSSLPanelDisplay)
+ if (transportSSLPanel.domNode.style.display != transportSSLPanelDisplay && transportSSLPanel.domNode.style.display=="block")
{
- transportSSLPanel.resize();
+ registry.byId("formAddPort.trustStores").resize();
}
};
-
xhr.get({url: "addPort.html",
sync: true,
load: function(data) {
@@ -373,8 +372,8 @@ define(["dojo/_base/xhr",
var truststoreWidget = registry.byId("formAddPort.trustStores");
if (truststores)
{
- var layout = [[{name: "Name", field: "name", width: "100%"},
- {name: "Peers only", field: "peersOnly", width: "80px",
+ var layout = [[{name: "Name", field: "name", width: "80%"},
+ {name: "Peers only", field: "peersOnly", width: "20%",
formatter: function(val){
return "<input type='radio' disabled='disabled' "+(val?"checked='checked'": "")+" />"
}
@@ -417,14 +416,15 @@ define(["dojo/_base/xhr",
}
}
truststoreWidget.selection.setSelected(j,selected);
- truststoreWidget.initialValue = port.trustStores;
}
}
+
var transportWidget = registry.byId("formAddPort.transports");
transportWidget.set("value", port.transports ? port.transports[0] : "");
registry.byId("formAddPort.port").set("value", port.port);
var protocols = port.protocols;
var typeWidget = registry.byId("formAddPort.type");
+
var store = typeWidget.store;
store.data.forEach(function(option){
registry.byId("formAddPort.protocols" + option.value).set("disabled", true);
@@ -439,7 +439,7 @@ define(["dojo/_base/xhr",
var defaultProtocolsWidget = registry.byId("formAddPort.protocolsDefault");
var addressWidget = registry.byId("formAddPort.bindingAddress");
addressWidget.set("value", port.bindingAddress);
- amqpProtocolsWidget.set("disabled", false);
+
if (protocols)
{
amqpProtocolsWidget.set("value", protocols)
@@ -472,8 +472,6 @@ define(["dojo/_base/xhr",
registry.byId("formAddPort:fields" + typeWidget.value).domNode.style.display = "block";
typeWidget.set("disabled", true);
- toggleSslWidgets(typeWidget.value, transportWidget.value);
-
keystoreWidget.initialValue = port.keyStore;
truststoreWidget.initialValue = port.trustStores;
transportWidget.initialValue = transportWidget.value;
Modified: qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js?rev=1470902&r1=1470901&r2=1470902&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js (original)
+++ qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js Tue Apr 23 11:40:33 2013
@@ -32,16 +32,17 @@ define(["dojo/dom",
"qpid/management/KeyStore",
"qpid/management/TrustStore",
"qpid/management/AccessControlProvider",
+ "qpid/management/Port",
"dojo/ready",
"dojo/domReady!"],
- function (dom, registry, ContentPane, Broker, VirtualHost, Exchange, Queue, Connection, AuthProvider, GroupProvider, Group, KeyStore, TrustStore, AccessControlProvider, ready) {
+ function (dom, registry, ContentPane, Broker, VirtualHost, Exchange, Queue, Connection, AuthProvider, GroupProvider, Group, KeyStore, TrustStore, AccessControlProvider, Port, ready) {
var controller = {};
var constructors = { broker: Broker, virtualhost: VirtualHost, exchange: Exchange,
queue: Queue, connection: Connection,
authenticationprovider: AuthProvider, groupprovider: GroupProvider,
group: Group, keystore: KeyStore, truststore: TrustStore,
- accesscontrolprovider: AccessControlProvider};
+ accesscontrolprovider: AccessControlProvider, port: Port};
var tabDiv = dom.byId("managedViews");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org