You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2014/08/02 23:22:13 UTC
svn commit: r1615370 - in
/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources:
addPort.html js/qpid/management/addPort.js
Author: rgodfrey
Date: Sat Aug 2 21:22:13 2014
New Revision: 1615370
URL: http://svn.apache.org/r1615370
Log:
QPID-5956 : [Java Broker] Management UI for add/edit ports should allow multiple selection of both TCP and SSL transports for HTTP and AMQP
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addPort.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addPort.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addPort.html?rev=1615370&r1=1615369&r2=1615370&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addPort.html (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addPort.html Sat Aug 2 21:22:13 2014
@@ -73,9 +73,8 @@
</select>
</div>
<div id="formAddPort:transport" >
- <select id="formAddPort.transports" data-dojo-type="dijit.form.FilteringSelect"
- data-dojo-props="name: 'transports',label: 'Transport:',searchAttr: 'name',required:false,placeHolder: 'TCP', value: '' "
- style="margin: 0;">
+ <select id="formAddPort.transports" name="transports" data-dojo-type="dijit.form.MultiSelect" multiple="true"
+ data-dojo-props="name: 'transports',label: 'Transport:',placeHolder: 'TCP', value: '' ">
<option value="TCP">TCP</option>
<option value="SSL">SSL</option>
</select>
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js?rev=1615370&r1=1615369&r2=1615370&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js Sat Aug 2 21:22:13 2014
@@ -119,7 +119,7 @@ define(["dojo/_base/xhr",
var initialTransport = transportWidget.initialValue;
var currentTransport = transportWidget.value;
- if (currentTransport == "SSL")
+ if (currentTransport == "SSL" || (lang.isArray(currentTransport) && array.indexOf(currentTransport, "SSL")>=0))
{
newPort.needClientAuth = needClientAuth.checked;
newPort.wantClientAuth = wantClientAuth.checked
@@ -154,7 +154,9 @@ define(["dojo/_base/xhr",
{
var clientAuthPanel = dojo.byId("formAddPort:fieldsClientAuth");
var display = clientAuthPanel.style.display;
- if (transportType == "SSL" && (protocolType == "AMQP" || protocolType == "HTTP"))
+
+ if ((transportType == "SSL" || (lang.isArray(transportType) && array.indexOf(transportType, "SSL")>=0))
+ && (protocolType == "AMQP" || protocolType == "HTTP"))
{
clientAuthPanel.style.display = "block";
registry.byId("formAddPort.needClientAuth").set("disabled", false);
@@ -169,7 +171,7 @@ define(["dojo/_base/xhr",
var transportSSLPanel = registry.byId("formAddPort:fieldsTransportSSL");
var transportSSLPanelDisplay = transportSSLPanel.domNode.style.display;
- if (transportType == "SSL")
+ if (transportType == "SSL" || (lang.isArray(transportType) && array.indexOf(transportType, "SSL")>=0))
{
transportSSLPanel.domNode.style.display = "block";
registry.byId("formAddPort.keyStore").set("disabled", false);
@@ -200,6 +202,11 @@ define(["dojo/_base/xhr",
registry.byId("formAddPort.transports").on("change", function(newValue){
var protocolType = registry.byId("formAddPort.type").value;
+ if(lang.isArray(newValue) && newValue.length == 2 && protocolType == "JMX")
+ {
+ registry.byId("formAddPort.transports").set("value", ["SSL"]);
+ newValue = "SSL"
+ }
toggleSslWidgets(protocolType, newValue);
});
@@ -235,13 +242,24 @@ define(["dojo/_base/xhr",
{
if (transportWidget.value != "TCP")
{
- transportWidget.set("value", "TCP");
+ transportWidget.set("value", ["TCP"]);
// changing of transport widget value will cause the call to toggleSslWidgets
toggleSsl = false;
}
disableTransportWidget = true;
+
+ }
+ else if(newValue == "JMX" )
+ {
+ var transports = transportWidget.value;
+ if(lang.isArray(transports) && transports.length == 2)
+ {
+ transportWidget.set("value", ["SSL"]);
+ }
}
+
+
if (toggleSsl)
{
toggleSslWidgets(newValue, transportWidget.value);
@@ -250,6 +268,9 @@ define(["dojo/_base/xhr",
registry.byId("formAddPort.authenticationProvider").set("disabled", isRMI);
registry.byId("formAddPort:fieldsAuthenticationProvider").domNode.style.display = isRMI? "none" : "block";
registry.byId("formAddPort:fieldsBindingAddress").domNode.style.display = newValue == "JMX" ? "none" : "block";
+ registry.byId("formAddPort:transport").domNode.style.display = isRMI ? "none" : "block";
+
+
});
@@ -280,6 +301,7 @@ define(["dojo/_base/xhr",
transportWidget.set("value", "TCP");
}
transportWidget.set("disabled", isRMI);
+ registry.byId("formAddPort:transport").domNode.style.display = isRMI ? "none" : "block";
registry.byId("formAddPort:fieldsAuthenticationProvider").domNode.style.display = isRMI? "none" : "block";
registry.byId("formAddPort.authenticationProvider").set("disabled", isRMI);
});
@@ -407,7 +429,7 @@ define(["dojo/_base/xhr",
}
var transportWidget = registry.byId("formAddPort.transports");
- transportWidget.set("value", port.transports ? port.transports[0] : "");
+ transportWidget.set("value", port.transports);
registry.byId("formAddPort.port").set("value", port.port);
var protocols = port.protocols;
var typeWidget = registry.byId("formAddPort.type");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org