QPID-4802: In management mode set state to ERRORED for failing to activate authentication providers, group providers and acl providers in order to allow editing of attributes preventing normal startup

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

9 files changed, 40 insertions, 21 deletions

diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js
index fd8a3ecb0e..9d9343623b 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js
@@ -100,6 +100,7 @@ define(["dojo/_base/xhr",
                this.controller = controller;
                this.name = query(".name", node)[0];
                this.type = query(".type", node)[0];
+               this.state = query(".state", node)[0];
                this.query = "rest/accesscontrolprovider/"+encodeURIComponent(groupProviderObj.name);
 
                var that = this;
@@ -125,6 +126,7 @@ define(["dojo/_base/xhr",
            {
                this.name.innerHTML = this.accessControlProviderData[ "name" ];
                this.type.innerHTML = this.accessControlProviderData[ "type" ];
+               this.state.innerHTML = this.accessControlProviderData[ "state" ];
            };
 
            return AccessControlProvider;
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
index b7c0554158..4778671bda 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
@@ -115,11 +115,9 @@ define(["dojo/_base/xhr",
                this.controller = controller;
                this.name = query(".name", node)[0];
                this.type = query(".type", node)[0];
+               this.state = query(".state", node)[0];
                this.authenticationProvider = authenticationProvider;
-               /*this.state = dom.byId("state");
-               this.durable = dom.byId("durable");
-               this.lifetimePolicy = dom.byId("lifetimePolicy");
-               */
+
                this.query = "rest/authenticationprovider/" + encodeURIComponent(authProviderObj.name);
 
                var that = this;
@@ -155,10 +153,7 @@ define(["dojo/_base/xhr",
                this.authenticationProvider.name = this.authProviderData[ "name" ]
                this.name.innerHTML = this.authProviderData[ "name" ];
                this.type.innerHTML = this.authProviderData[ "type" ];
-    /*           this.state.innerHTML = this.brokerData[ "state" ];
-               this.durable.innerHTML = this.brokerData[ "durable" ];
-               this.lifetimePolicy.innerHTML = this.brokerData[ "lifetimePolicy" ];
-*/
+               this.state.innerHTML = this.authProviderData[ "state" ];
            };
 
            AuthProviderUpdater.prototype.update = function()
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
index 230f148d4c..9074c1b43c 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
@@ -576,14 +576,15 @@ define(["dojo/_base/xhr",
 
                              that.authenticationProvidersGrid =
                                  new UpdatableStore(that.brokerData.authenticationproviders, query(".broker-authentication-providers")[0],
-                                                 [ { name: "Name",    field: "name",      width: "100%"},
-                                                     { name: "Type", field: "type", width: "300px"},
-                                                     { name: "User Management", field: "type", width: "200px",
+                                                 [ { name: "Name",    field: "name",      width: "30%"},
+                                                   { name: "State",    field: "state",      width: "20%"},
+                                                     { name: "Type", field: "type", width: "20%"},
+                                                     { name: "User Management", field: "type", width: "20%",
                                                              formatter: function(val){
                                                                  return "<input type='radio' disabled='disabled' "+(util.isProviderManagingUsers(val)?"checked='checked'": "")+" />";
                                                              }
                                                      },
-                                                     { name: "Default", field: "name", width: "100px",
+                                                     { name: "Default", field: "name", width: "10%",
                                                          formatter: function(val){
                                                              return "<input type='radio' disabled='disabled' "+(val == that.brokerData.defaultAuthenticationProvider ? "checked='checked'": "")+" />";
                                                          }
@@ -637,8 +638,9 @@ define(["dojo/_base/xhr",
                                                }, gridProperties, EnhancedGrid);
                              that.groupProvidersGrid =
                                new UpdatableStore(that.brokerData.groupproviders, query(".broker-group-providers")[0],
-                                               [ { name: "Name",    field: "name",      width: "50%"},
-                                                 { name: "Type", field: "type", width: "50%"}
+                                               [ { name: "Name",    field: "name",      width: "40%"},
+                                                 { name: "State", field: "state", width: "30%"},
+                                                 { name: "Type", field: "type", width: "30%"}
                                                ], function(obj) {
                                                        connect.connect(obj.grid, "onRowDblClick", obj.grid,
                                                        function(evt){
@@ -651,8 +653,9 @@ define(["dojo/_base/xhr",
                              var aclData = that.brokerData.accesscontrolproviders ? that.brokerData.accesscontrolproviders :[];
                              that.accessControlProvidersGrid =
                                new UpdatableStore(aclData, query(".broker-access-control-providers")[0],
-                                               [ { name: "Name",    field: "name",      width: "60%"},
-                                                 { name: "Type", field: "type", width: "40%"}
+                                               [ { name: "Name",  field: "name",  width: "40%"},
+                                                 { name: "State", field: "state", width: "30%"},
+                                                 { name: "Type",  field: "type", width: "30%"}
                                                ], function(obj) {
                                                        connect.connect(obj.grid, "onRowDblClick", obj.grid,
                                                        function(evt){
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js
index 98e01773ef..9dde224982 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js
@@ -106,6 +106,7 @@ define(["dojo/_base/xhr",
                this.controller = controller;
                this.name = query(".name", node)[0];
                this.type = query(".type", node)[0];
+               this.state = query(".state", node)[0];
                this.query = "rest/groupprovider/"+encodeURIComponent(groupProviderObj.name);
                this.typeUI ={"GroupFile": "FileGroupManager"};
                var that = this;
@@ -134,6 +135,7 @@ define(["dojo/_base/xhr",
            {
                this.name.innerHTML = this.groupProviderData[ "name" ];
                this.type.innerHTML = this.groupProviderData[ "type" ];
+               this.state.innerHTML = this.groupProviderData[ "state" ];
            };
 
            GroupProviderUpdater.prototype.update = function()
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
index d1ba4043c2..5d6ce6727b 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
@@ -128,6 +128,7 @@ define(["dojo/dom",
                }
 
                storeNodes(["nameValue",
+                           "stateValue",
                            "portValue",
                            "authenticationProviderValue",
                            "protocolsValue",
@@ -169,6 +170,7 @@ define(["dojo/dom",
                }
 
               this.nameValue.innerHTML = this.keyStoreData[ "name" ];
+              this.stateValue.innerHTML = this.keyStoreData[ "state" ];
               this.portValue.innerHTML = this.keyStoreData[ "port" ];
               this.authenticationProviderValue.innerHTML = this.keyStoreData[ "authenticationProvider" ] ? this.keyStoreData[ "authenticationProvider" ] : "";
               this.protocolsValue.innerHTML = printArray( "protocols", this.keyStoreData);
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showAccessControlProvider.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showAccessControlProvider.html
index 399425a7de..d017683225 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showAccessControlProvider.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showAccessControlProvider.html
@@ -23,6 +23,8 @@
     <br/>
     <span style="">Type:</span><span class="type" style="position:absolute; left:6em"></span>
     <br/>
+    <span style="">State:</span><span class="state" style="position:absolute; left:6em"></span>
+    <br/>
     <div class="providerDetails"></div>
     <div class="dijitDialogPaneActionBar">
         <input class="deleteAccessControlProviderButton" type="button" value="Delete Access Control provider" label="Delete Access Control Provider" dojoType="dijit.form.Button" />
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html
index bea5db2829..5e876fdc1f 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html
@@ -23,6 +23,8 @@
     <br/>
     <span style="">Type:</span><span class="type" style="position:absolute; left:6em"></span>
     <br/>
+    <span style="">State:</span><span class="state" style="position:absolute; left:6em"></span>
+    <br/>
     <button data-dojo-type="dijit.form.Button" class="editAuthenticationProviderButton">Edit</button>
     <button data-dojo-type="dijit.form.Button" class="deleteAuthenticationProviderButton">Delete</button>
 </div>
\ No newline at end of file
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showGroupProvider.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showGroupProvider.html
index 332c7f5eaa..5ab5573b40 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showGroupProvider.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showGroupProvider.html
@@ -23,6 +23,8 @@
     <br/>
     <span style="">Type:</span><span class="type" style="position:absolute; left:6em"></span>
     <br/>
+    <span style="">State:</span><span class="state" style="position:absolute; left:6em"></span>
+    <br/>
     <div class="providerDetails"></div>
     <div class="dijitDialogPaneActionBar">
         <input class="deleteGroupProviderButton" type="button" value="Delete Group provider" label="Delete Group Provider" dojoType="dijit.form.Button" />
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showPort.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showPort.html
index f297f2d751..4f460b85c1 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showPort.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showPort.html
@@ -18,14 +18,23 @@
  - under the License.
  -
  -->
-<div class="port">
+<div>
     <div class="portContainer">
 
-       <div class="formLabel-labelCell" style="float:left; width: 250px;">Name:</div>
-       <div class="nameValue" style="float:left;"></div><br/>
+       <div class="name" style="clear:both">
+           <div class="formLabel-labelCell" style="float:left; width: 250px;">Name:</div>
+           <div class="nameValue" style="float:left;"></div><br/>
+       </div>
+
+       <div class="state" style="clear:both">
+           <div class="formLabel-labelCell" style="float:left; width: 250px;">State:</div>
+           <div class="stateValue" style="float:left;"></div><br/>
+       </div>
 
-       <div class="formLabel-labelCell" style="float:left; width: 250px;">Port Number:</div>
-       <div class="portValue" style="float:left;"></div><br/>
+       <div class="port" style="clear:both">
+           <div class="formLabel-labelCell" style="float:left; width: 250px;">Port Number:</div>
+           <div class="portValue" style="float:left;"></div><br/>
+       </div>
 
        <div class="authenticationProvider" style="clear:both">
            <div class="formLabel-labelCell" style="float:left; width: 250px;">Authentication Provider:</div>