Merging from trunk r1618230:1618433 in the Java tree

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1620344 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 238 insertions, 65 deletions

diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/addPort.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/addPort.html
index 69d49248b8..a0f1d6d440 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/addPort.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/addPort.html
@@ -20,94 +20,267 @@
  -->
 <div class="dijitHidden">
     <div data-dojo-type="dijit.Dialog" data-dojo-props="title:'Port'" id="addPort">
-        <form id="formAddPort" method="post" dojoType="dijit.form.Form">
-            <div style="height:320px; width:420px; overflow: auto">
-            <div class="hidden" id="portEditWarning">NOTE: changes will only take effect after Broker restart.</div>
+        <form id="formAddPort" method="post" data-dojo-type="dijit.form.Form">
+            <div class="hidden infoMessage" id="portEditWarning">NOTE: changes will only take effect after Broker restart.</div>
             <div id="formAddPort:fields">
-                <input type="text" required="true" name="name" id="formAddPort.name" placeholder="Name"
-                    data-dojo-props="label: 'Name*:'" dojoType="dijit.form.ValidationTextBox"
-                    missingMessage="A name must be supplied"/>
 
-                <input type="text" required="true" id="formAddPort.port"
-                    data-dojo-props="label: 'Port Number*:', placeHolder: 'Enter port number'" dojoType="dijit.form.ValidationTextBox"
-                     name="port" missingMessage="A port number must be supplied"/>
-                <select id="formAddPort.type" data-dojo-type="dijit.form.FilteringSelect"
-                    data-dojo-props="name: 'type', value: '',placeHolder: 'Select Port Type', label: 'Port Type*:'">
-                    <option value="AMQP" selected="selected">AMQP</option>
-                    <option value="JMX">JMX</option>
-                    <option value="HTTP">HTTP</option>
-                </select>
+                <div class="clear">
+                    <div class="formLabel-labelCell">
+                        <label for="formAddPort.name">Name*:</label>
+                    </div>
+                    <div class="formLabel-controlCell">
+                        <input id="formAddPort.name" type="text"
+                               data-dojo-type="dijit.form.ValidationTextBox"
+                               data-dojo-props="
+                                name: 'name',
+                                required: 'true',
+                                placeHolder: 'name',
+                                promptMessage: 'Name of port, must be unique',
+                                title: 'Enter name of port'"/>
+                    </div>
+                </div>
+                <div class="clear">
+                    <div class="formLabel-labelCell">
+                        <label for="formAddPort.port">Port Number*:</label>
+                    </div>
+                    <div class="formLabel-controlCell">
+                        <input id="formAddPort.port" type="text"
+                               data-dojo-type="dijit.form.ValidationTextBox"
+                               data-dojo-props="
+                                name: 'port',
+                                required: 'true',
+                                placeHolder: 'port number',
+                                promptMessage: 'Port number to be bound',
+                                title: 'Enter port number'"/>
+                    </div>
+                </div>
+                <div class="clear">
+                    <div class="formLabel-labelCell">
+                        <label for="formAddPort.type">Port Type*:</label>
+                    </div>
+                    <div class="formLabel-controlCell">
+                        <select id="formAddPort.type"
+                                data-dojo-type="dijit.form.FilteringSelect"
+                                data-dojo-props="
+                                    name: 'type',
+                                    label: 'Port Type*:',
+                                    value: '',
+                                    placeHolder: 'port type',
+                                    promptMessage: 'Port type',
+                                    title: 'Enter port type'">
+                            <option value="AMQP" selected="selected">AMQP</option>
+                            <option value="JMX">JMX</option>
+                            <option value="HTTP">HTTP</option>
+                        </select>
+                    </div>
+                </div>
             </div>
             <div id="formAddPort:fieldsAuthenticationProvider">
-                <select id="formAddPort.authenticationProvider" data-dojo-type="dijit.form.FilteringSelect"
-                    data-dojo-props="name:'authenticationProvider',label:'Authentication Provider*:', searchAttr: 'name', required: true, placeHolder: 'Select Provider'">
-                </select>
+                <div class="clear">
+                    <div class="formLabel-labelCell">
+                        <label for="formAddPort.authenticationProvider">Authentication Provider*:</label>
+                    </div>
+                    <div class="formLabel-controlCell">
+                        <select id="formAddPort.authenticationProvider"
+                                data-dojo-type="dijit.form.FilteringSelect"
+                                data-dojo-props="
+                            name: 'authenticationProvider',
+                            searchAttr: 'name',
+                            required: true,
+                            placeHolder: 'provider',
+                            promptMessage: 'Authentication provider to authenticate users connecting to the port',
+                            title: 'Associate the port with an authentication provider'">
+                        </select>
+                    </div>
+                </div>
             </div>
             <div id="formAddPort:fieldsBindingAddress">
-                <input id="formAddPort.bindingAddress" type="text" name="bindingAddress" placeholder="*"
-                       dojoType="dijit.form.TextBox" data-dojo-props="label: 'Binding address:'"/>
+                <div class="clear">
+                    <div class="formLabel-labelCell">
+                        <label for="formAddPort.bindingAddress">Binding address:</label>
+                    </div>
+                    <div class="formLabel-controlCell">
+                        <input id="formAddPort.bindingAddress" type="text"
+                               data-dojo-type="dijit.form.ValidationTextBox"
+                               data-dojo-props="
+                            name: 'bindingAddress',
+                            placeHolder: 'binding address',
+                            promptMessage: 'Restricts the port to listen on the specified address only. The <code>*</code> wildcard signifies all addresses',
+                            title: 'Enter a binding address'"/>
+                    </div>
+                </div>
             </div>
             <div id="formAddPort:fieldsAMQP">
-                <input id="formAddPort.protocolsDefault" type="checkbox" checked="checked"
-                   dojoType="dijit.form.CheckBox" data-dojo-props="label: 'Support default protocols:'"/>
-                <select id="formAddPort.protocolsAMQP" name="protocols" data-dojo-type="dijit.form.MultiSelect" multiple="true"
-                    data-dojo-props="name: 'protocols', value: '', placeHolder: 'Select AMQP versions', label: 'AMQP versions:'"
-                    missingMessage="AMQP protocol(s) must be supplied">
-                    <option value="AMQP_0_8">AMQP 0.8</option>
-                    <option value="AMQP_0_9">AMQP 0.9</option>
-                    <option value="AMQP_0_9_1">AMQP 0.9.1</option>
-                    <option value="AMQP_0_10">AMQP 0.10</option>
-                    <option value="AMQP_1_0">AMQP 1.0</option>
-                </select>
+                <div class="clear">
+                    <div class="formLabel-labelCell">
+                        <label for="formAddPort.protocolsDefault">Support default protocols:</label>
+                    </div>
+                    <div class="formLabel-controlCell">
+                        <input id="formAddPort.protocolsDefault" type="checkbox"
+                               dojoType="dijit.form.CheckBox"
+                               data-dojo-props="checked: true"/>
+                    </div>
+                </div>
+                <div class="clear">
+                    <div class="formLabel-labelCell">
+                        <label for="formAddPort.protocolsAMQP">AMQP protocols:</label>
+                    </div>
+                    <div class="formLabel-controlCell">
+                        <select id="formAddPort.protocolsAMQP"
+                                data-dojo-type="dijit.form.MultiSelect"
+                                data-dojo-props="
+                                    name: 'protocols',
+                                    value: '',
+                                    placeHolder: 'AMQP protocols',
+                                    promptMessage: 'AMQP protocols to be associated with this port',
+                                    title: 'Select AMQP protocols to be associated with this port',
+                                    multiple: true">
+                            <option value="AMQP_0_8">AMQP 0.8</option>
+                            <option value="AMQP_0_9">AMQP 0.9</option>
+                            <option value="AMQP_0_9_1">AMQP 0.9.1</option>
+                            <option value="AMQP_0_10">AMQP 0.10</option>
+                            <option value="AMQP_1_0">AMQP 1.0</option>
+                        </select>
+                    </div>
+                </div>
             </div>
             <div id="formAddPort:fieldsJMX">
-                <select id="formAddPort.protocolsJMX" name="protocols" data-dojo-type="dijit.form.FilteringSelect"
-                    data-dojo-props="name: 'protocols', value: '', label: 'JMX protocol*:'" missingMessage="JMX protocol must be supplied">
-                     <option value="RMI">RMI</option>
-                     <option value="JMX_RMI">JMX RMI</option>
-                 </select>
+                <div class="clear">
+                    <div class="formLabel-labelCell">
+                        <label for="formAddPort.protocolsJMX">JMX protocol*:</label>
+                    </div>
+                    <div class="formLabel-controlCell">
+                        <select id="formAddPort.protocolsJMX"
+                                data-dojo-type="dijit.form.FilteringSelect"
+                                data-dojo-props="
+                                    name: 'protocols',
+                                    value: '',
+                                    promptMessage: 'JMX protocol to be associated with this port',
+                                    title: 'Enter JMX protocol to be associated with this port'">
+                            <option value="RMI">RMI</option>
+                            <option value="JMX_RMI">JMX RMI</option>
+                        </select>
+                    </div>
+                </div>
             </div>
+
             <div id="formAddPort:fieldsHTTP">
-                <select id="formAddPort.protocolsHTTP" name="protocols" data-dojo-type="dijit.form.FilteringSelect"
-                    data-dojo-props="name: 'protocols', value: 'HTTP', label: 'HTTP protocol*:'" missingMessage="HTTP protocol must be supplied">
-                    <option value="HTTP">HTTP</option>
-                </select>
+                <div class="clear">
+                    <div class="formLabel-labelCell">
+                        <label for="formAddPort.protocolsHTTP">HTTP protocols*:</label>
+                    </div>
+                    <div class="formLabel-controlCell">
+                        <select id="formAddPort.protocolsHTTP"
+                                data-dojo-type="dijit.form.FilteringSelect"
+                                data-dojo-props="
+                                    name: 'protocols',
+                                    value: 'HTTP',
+                                    label: 'HTTP protocol*:',
+                                    promptMessage: 'HTTP protocol to be associated with this port',
+                                    title: 'Enter HTTP protocol to be associated with this port'">
+                            <option value="HTTP">HTTP</option>
+                        </select>
+                    </div>
+                </div>
             </div>
+
             <div id="formAddPort:transport" >
-                 <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>
+                <div class="clear">
+                    <div class="formLabel-labelCell">
+                        <label for="formAddPort.transports">Transport:</label>
+                    </div>
+                    <div class="formLabel-controlCell">
+                        <select id="formAddPort.transports"
+                                data-dojo-type="dijit.form.MultiSelect"
+                                data-dojo-props="
+                                    name: 'transports',
+                                    placeHolder: 'TCP',
+                                    value: '',
+                                    multiple: true,
+                                    promptMessage: 'Transport(s)',
+                                    title: 'Select transports'">
+                            <option value="TCP">TCP</option>
+                            <option value="SSL">SSL</option>
+                        </select>
+                    </div>
+                </div>
+                <div class="clear"/>
             </div>
             <div id="formAddPort:fieldsTransportSSL">
-                <select id="formAddPort.keyStore" data-dojo-type="dijit.form.FilteringSelect"
-                    data-dojo-props="name:'keyStore',label:'Key Store*:', searchAttr: 'name', placeHolder: 'Select keystore', value: '', required: true ">
-                </select>
+                <div class="clear">
+                    <div class="formLabel-labelCell">
+                        <label for="formAddPort.keyStore">Key Store*:</label>
+                    </div>
+                    <div class="formLabel-controlCell">
+                        <select id="formAddPort.keyStore"
+                                data-dojo-type="dijit.form.FilteringSelect"
+                                data-dojo-props="
+                                    name: 'keyStore',
+                                    label: 'Key Store*:',
+                                    searchAttr: 'name',
+                                    placeHolder: 'keystore',
+                                    value: '',
+                                    required: true,
+                            promptMessage: 'Keystore that provides the SSL certificate',
+                            title: 'Select the keystore that provides the SSL certificate'">
+                        </select>
+                    </div>
+                </div>
             </div>
             <div id="formAddPort:fieldsClientAuth">
                 <div id="formAddPort:fieldsClientAuthCheckboxes">
-                 <input id="formAddPort.needClientAuth" type="checkbox" name="needClientAuth"
-                    dojoType="dijit.form.CheckBox" data-dojo-props="label: 'Need SSL Client Certificate:'" />
-                 <input id="formAddPort.wantClientAuth" type="checkbox" name="wantClientAuth"
-                    dojoType="dijit.form.CheckBox" data-dojo-props="label: 'Want SSL Client Certificate:'" />
+                    <div class="clear">
+                        <div class="formLabel-labelCell">
+                            <label for="formAddPort.needClientAuth">Need SSL Client Certificate:</label>
+                        </div>
+                        <div class="formLabel-controlCell">
+                            <input id="formAddPort.needClientAuth" type="checkbox"
+                                   data-dojo-type="dijit.form.CheckBox"
+                                   data-dojo-props="
+                                    name: 'needClientAuth'" />
+                        </div>
+                    </div>
+                    <div class="clear">
+                        <div class="formLabel-labelCell">
+                            <label for="formAddPort.wantClientAuth">Want SSL Client Certificate:</label>
+                        </div>
+                        <div class="formLabel-controlCell">
+                            <input id="formAddPort.wantClientAuth" type="checkbox"
+                                   data-dojo-type="dijit.form.CheckBox"
+                                   data-dojo-props="
+                            name: 'wantClientAuth'" />
+                        </div>
+                    </div>
+                </div>
+                <div class="clear">
+                    <div class="formLabel-labelCell">
+                        Trust Stores:
+                    </div>
+                </div>
+
+                <div class="clear">
+                    <div class="formLabel-controlCell">
+                        <table id="formAddPort.trustStores"
+                               data-dojo-type="dojox.grid.EnhancedGrid"
+                               data-dojo-props="
+                                plugins: {indirectSelection: true},
+                                rowSelector:'0px'"
+                               style="height: 100px; width:400px">
+                            <thead>
+                                <tr>
+                                    <th field="name">Name</th>
+                                    <th field="peersOnly">Peers Only</th>
+                                </tr>
+                            </thead>
+                        </table>
+                    </div>
                 </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; width:400px">
-                        <thead>
-                           <tr>
-                             <th field="name">Name</th>
-                             <th field="peersOnly">Peers Only</th>
-                           </tr>
-                         </thead>
-                </table>
             </div>
             <input type="hidden" id="formAddPort.id" name="id"/>
-            </div>
+            <div class="clear"/>
             <div class="dijitDialogPaneActionBar">
-            <!-- submit buttons -->
-            <input type="submit" value="Save Port" label="Save Port" dojoType="dijit.form.Button" />
+                <!-- submit buttons -->
+                <input type="submit" value="Save Port" label="Save Port" dojoType="dijit.form.Button" />
             </div>
         </form>
     </div>