QPID-5579 : [Java Broker] build attribute meta data the same way for REST API and AMQP Management

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

15 files changed, 67 insertions, 82 deletions

diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
index 08b99a206d..14196310a5 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
@@ -51,28 +51,8 @@ import org.apache.qpid.server.management.plugin.servlet.rest.UserPreferencesServ
 import org.apache.qpid.server.management.plugin.servlet.rest.RestServlet;
 import org.apache.qpid.server.management.plugin.servlet.rest.SaslServlet;
 import org.apache.qpid.server.management.plugin.servlet.rest.StructureServlet;
-import org.apache.qpid.server.model.AccessControlProvider;
-import org.apache.qpid.server.model.AuthenticationProvider;
-import org.apache.qpid.server.model.Binding;
-import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.ConfiguredObject;
-import org.apache.qpid.server.model.Connection;
-import org.apache.qpid.server.model.Exchange;
-import org.apache.qpid.server.model.Group;
-import org.apache.qpid.server.model.GroupMember;
-import org.apache.qpid.server.model.GroupProvider;
-import org.apache.qpid.server.model.KeyStore;
-import org.apache.qpid.server.model.Plugin;
-import org.apache.qpid.server.model.Port;
-import org.apache.qpid.server.model.PreferencesProvider;
-import org.apache.qpid.server.model.Protocol;
+import org.apache.qpid.server.model.*;
 import org.apache.qpid.server.model.Queue;
-import org.apache.qpid.server.model.Session;
-import org.apache.qpid.server.model.State;
-import org.apache.qpid.server.model.Transport;
-import org.apache.qpid.server.model.TrustStore;
-import org.apache.qpid.server.model.User;
-import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.server.model.adapter.AbstractPluginAdapter;
 import org.apache.qpid.server.plugin.PluginFactory;
 import org.apache.qpid.server.util.MapValueConverter;
@@ -88,7 +68,7 @@ import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 
-public class HttpManagement extends AbstractPluginAdapter implements HttpManagementConfiguration
+public class HttpManagement extends AbstractPluginAdapter<HttpManagement> implements HttpManagementConfiguration<HttpManagement>
 {
     private final Logger _logger = Logger.getLogger(HttpManagement.class);
 
@@ -108,17 +88,6 @@ public class HttpManagement extends AbstractPluginAdapter implements HttpManagem
 
     public static final String PLUGIN_TYPE = "MANAGEMENT-HTTP";
 
-    @SuppressWarnings("serial")
-    private static final Collection<String> AVAILABLE_ATTRIBUTES = Collections.unmodifiableSet(new HashSet<String>(Plugin.AVAILABLE_ATTRIBUTES)
-    {{
-        add(HTTP_BASIC_AUTHENTICATION_ENABLED);
-        add(HTTPS_BASIC_AUTHENTICATION_ENABLED);
-        add(HTTP_SASL_AUTHENTICATION_ENABLED);
-        add(HTTPS_SASL_AUTHENTICATION_ENABLED);
-        add(TIME_OUT);
-        add(PluginFactory.PLUGIN_TYPE);
-    }});
-
     private static final String OPERATIONAL_LOGGING_NAME = "Web";
 
 
@@ -206,8 +175,7 @@ public class HttpManagement extends AbstractPluginAdapter implements HttpManagem
         CurrentActor.get().message(ManagementConsoleMessages.STOPPED(OPERATIONAL_LOGGING_NAME));
     }
 
-    /** Added for testing purposes */
-    int getSessionTimeout()
+    public int getSessionTimeout()
     {
         return (Integer)getAttribute(TIME_OUT);
     }
@@ -224,7 +192,7 @@ public class HttpManagement extends AbstractPluginAdapter implements HttpManagem
         int lastPort = -1;
         for (Port port : ports)
         {
-            if (State.QUIESCED.equals(port.getActualState()))
+            if (State.QUIESCED.equals(port.getState()))
             {
                 continue;
             }
@@ -462,7 +430,7 @@ public class HttpManagement extends AbstractPluginAdapter implements HttpManagem
     @Override
     public Collection<String> getAttributeNames()
     {
-        return Collections.unmodifiableCollection(AVAILABLE_ATTRIBUTES);
+        return Attribute.getAttributeNames(HttpManagement.class);
     }
 
     @Override
@@ -524,4 +492,10 @@ public class HttpManagement extends AbstractPluginAdapter implements HttpManagem
         }
     }
 
+
+    @Override
+    public String getPluginType()
+    {
+        return PLUGIN_TYPE;
+    }
 }
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java
index 7d89daa427..3b159b1e5d 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java
@@ -23,16 +23,26 @@ package org.apache.qpid.server.management.plugin;
 import java.net.SocketAddress;
 
 import org.apache.qpid.server.model.AuthenticationProvider;
+import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.model.ManagedAttribute;
+import org.apache.qpid.server.model.Plugin;
 
-public interface HttpManagementConfiguration
+public interface HttpManagementConfiguration<X extends HttpManagementConfiguration<X>> extends Plugin<X>
 {
+    @ManagedAttribute
     boolean isHttpsSaslAuthenticationEnabled();
 
+    @ManagedAttribute
     boolean isHttpSaslAuthenticationEnabled();
 
+    @ManagedAttribute
     boolean isHttpsBasicAuthenticationEnabled();
 
+    @ManagedAttribute
     boolean isHttpBasicAuthenticationEnabled();
 
+    @ManagedAttribute
+    public int getSessionTimeout();
+
     AuthenticationProvider getAuthenticationProvider(SocketAddress localAddress);
 }
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementUtil.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementUtil.java
index 0efb76a241..ec6b91f829 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementUtil.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementUtil.java
@@ -75,9 +75,9 @@ public class HttpManagementUtil
     private static final String ATTR_SUBJECT = "Qpid.subject";
     private static final String ATTR_LOG_ACTOR = "Qpid.logActor";
 
-    public static Broker getBroker(ServletContext servletContext)
+    public static Broker<?> getBroker(ServletContext servletContext)
     {
-        return (Broker) servletContext.getAttribute(ATTR_BROKER);
+        return (Broker<?>) servletContext.getAttribute(ATTR_BROKER);
     }
 
     public static HttpManagementConfiguration getManagementConfiguration(ServletContext servletContext)
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java
index 1a13733ff5..1133b6e091 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java
@@ -50,7 +50,7 @@ public abstract class AbstractServlet extends HttpServlet
 {
     private static final Logger LOGGER = Logger.getLogger(AbstractServlet.class);
 
-    private Broker _broker;
+    private Broker<?> _broker;
     private HttpManagementConfiguration _managementConfiguration;
 
     protected AbstractServlet()
@@ -240,7 +240,7 @@ public abstract class AbstractServlet extends HttpServlet
         return subject;
     }
 
-    protected Broker getBroker()
+    protected Broker<?> getBroker()
     {
         return _broker;
     }
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java
index 03dd7c66a8..0d5d868af2 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java
@@ -37,7 +37,7 @@ public class ConfiguredObjectToMapConverter
 
     private Model _model = Model.getInstance();
 
-    public Map<String, Object> convertObjectToMap(final ConfiguredObject confObject,
+    public Map<String, Object> convertObjectToMap(final ConfiguredObject<?> confObject,
                                                   Class<? extends  ConfiguredObject> clazz,
                                                   int depth)
     {
@@ -62,7 +62,7 @@ public class ConfiguredObjectToMapConverter
     }
 
     private void incorporateAttributesIntoMap(
-            final ConfiguredObject confObject, Map<String, Object> object)
+            final ConfiguredObject<?> confObject, Map<String, Object> object)
     {
         for(String name : confObject.getAttributeNames())
         {
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/HelperServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/HelperServlet.java
index 80ce338d0a..db635e31ce 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/HelperServlet.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/HelperServlet.java
@@ -58,7 +58,7 @@ public class HelperServlet extends AbstractServlet
                 new ListAuthenticationProviderAttributes(),
                 new ListBrokerAttribute(Broker.SUPPORTED_VIRTUALHOST_STORE_TYPES, "ListMessageStoreTypes"),
                 new ListBrokerAttribute(Broker.SUPPORTED_VIRTUALHOST_TYPES, "ListVirtualHostTypes"),
-                new ListBrokerAttribute(Broker.SUPPORTED_PREFERENCES_PROVIDERS_TYPES, "ListPreferencesProvidersTypes"),
+                new ListBrokerAttribute(Broker.SUPPORTED_PREFERENCES_PROVIDER_TYPES, "ListPreferencesProvidersTypes"),
                 new ListBrokerAttribute(Broker.PRODUCT_VERSION, "version"),
                 new ListGroupProviderAttributes(),
                 new ListAccessControlProviderAttributes(),
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageContentServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageContentServlet.java
index 0329379713..d6d52f86ba 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageContentServlet.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageContentServlet.java
@@ -77,7 +77,7 @@ public class MessageContentServlet extends AbstractServlet
         String vhostName = pathInfoElements[0];
         String queueName = pathInfoElements[1];
 
-        VirtualHost vhost = null;
+        VirtualHost<?> vhost = null;
 
         for(VirtualHost vh : getBroker().getVirtualHosts())
         {
@@ -91,7 +91,7 @@ public class MessageContentServlet extends AbstractServlet
         return getQueueFromVirtualHost(queueName, vhost);
     }
 
-    private Queue getQueueFromVirtualHost(String queueName, VirtualHost vhost)
+    private Queue getQueueFromVirtualHost(String queueName, VirtualHost<?> vhost)
     {
         Queue queue = null;
 
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java
index 3eafa7c294..fa7fb06077 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java
@@ -122,7 +122,7 @@ public class MessageServlet extends AbstractServlet
         mapper.writeValue(writer, messages);
     }
 
-    private Queue getQueueFromRequest(HttpServletRequest request)
+    private Queue<?> getQueueFromRequest(HttpServletRequest request)
     {
         // TODO - validation that there is a vhost and queue and only those in the path
 
@@ -134,9 +134,9 @@ public class MessageServlet extends AbstractServlet
         String vhostName = pathInfoElements[0];
         String queueName = pathInfoElements[1];
 
-        VirtualHost vhost = null;
+        VirtualHost<?> vhost = null;
 
-        for(VirtualHost vh : getBroker().getVirtualHosts())
+        for(VirtualHost<?> vh : getBroker().getVirtualHosts())
         {
             if(vh.getName().equals(vhostName))
             {
@@ -148,7 +148,7 @@ public class MessageServlet extends AbstractServlet
         return getQueueFromVirtualHost(queueName, vhost);
     }
 
-    private Queue getQueueFromVirtualHost(String queueName, VirtualHost vhost)
+    private Queue getQueueFromVirtualHost(String queueName, VirtualHost<?> vhost)
     {
         Queue queue = null;
 
@@ -410,7 +410,7 @@ public class MessageServlet extends AbstractServlet
 
         try
         {
-            final Queue sourceQueue = getQueueFromRequest(request);
+            final Queue<?> sourceQueue = getQueueFromRequest(request);
 
             ObjectMapper mapper = new ObjectMapper();
 
@@ -420,7 +420,7 @@ public class MessageServlet extends AbstractServlet
             String destQueueName = (String) providedObject.get("destinationQueue");
             Boolean move = (Boolean) providedObject.get("move");
 
-            final VirtualHost vhost = sourceQueue.getParent(VirtualHost.class);
+            final VirtualHost<?> vhost = sourceQueue.getParent(VirtualHost.class);
 
             boolean isMoveTransaction = move != null && Boolean.valueOf(move);
 
@@ -459,9 +459,9 @@ public class MessageServlet extends AbstractServlet
     protected void doDeleteWithSubjectAndActor(HttpServletRequest request, HttpServletResponse response)
     {
 
-        final Queue sourceQueue = getQueueFromRequest(request);
+        final Queue<?> sourceQueue = getQueueFromRequest(request);
 
-        final VirtualHost vhost = sourceQueue.getParent(VirtualHost.class);
+        final VirtualHost<?> vhost = sourceQueue.getParent(VirtualHost.class);
 
 
         final List<Long> messageIds = new ArrayList<Long>();
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
index e6bc46aa77..005358faf4 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
@@ -112,7 +112,7 @@ public class RestServlet extends AbstractServlet
         }
     }
 
-    protected Collection<ConfiguredObject> getObjects(HttpServletRequest request)
+    protected Collection<ConfiguredObject<?>> getObjects(HttpServletRequest request)
     {
         String[] pathInfoElements = getPathInfoElements(request);
         List<String> names = new ArrayList<String>();
@@ -128,8 +128,9 @@ public class RestServlet extends AbstractServlet
             names.addAll(Arrays.asList(pathInfoElements));
         }
 
-        Collection<ConfiguredObject> parents = Collections.singleton((ConfiguredObject) getBroker());
-        Collection<ConfiguredObject> children = new ArrayList<ConfiguredObject>();
+        Collection<ConfiguredObject<?>> parents = new ArrayList<ConfiguredObject<?>>();
+        parents.add(getBroker());
+        Collection<ConfiguredObject<?>> children = new ArrayList<ConfiguredObject<?>>();
 
         Map<Class<? extends ConfiguredObject>, String> filters =
                 new HashMap<Class<? extends ConfiguredObject>, String>();
@@ -139,14 +140,14 @@ public class RestServlet extends AbstractServlet
             if(i == 0 || Model.getInstance().getChildTypes(_hierarchy[i - 1]).contains(_hierarchy[i]))
             {
 
-                for(ConfiguredObject parent : parents)
+                for(ConfiguredObject<?> parent : parents)
                 {
                     if(names.size() > i
                             && names.get(i) != null
                             && !names.get(i).equals("*")
                             && names.get(i).trim().length() != 0)
                     {
-                        for(ConfiguredObject child : parent.getChildren(_hierarchy[i]))
+                        for(ConfiguredObject<?> child : parent.getChildren(_hierarchy[i]))
                         {
                             if(child.getName().equals(names.get(i)))
                             {
@@ -156,7 +157,7 @@ public class RestServlet extends AbstractServlet
                     }
                     else
                     {
-                        children.addAll(parent.getChildren(_hierarchy[i]));
+                        children.addAll((Collection<? extends ConfiguredObject<?>>) parent.getChildren(_hierarchy[i]));
                     }
                 }
             }
@@ -173,13 +174,13 @@ public class RestServlet extends AbstractServlet
             }
 
             parents = children;
-            children = new ArrayList<ConfiguredObject>();
+            children = new ArrayList<ConfiguredObject<?>>();
         }
 
         if(!filters.isEmpty())
         {
-            Collection<ConfiguredObject> potentials = parents;
-            parents = new ArrayList<ConfiguredObject>();
+            Collection<ConfiguredObject<?>> potentials = parents;
+            parents = new ArrayList<ConfiguredObject<?>>();
 
             for(ConfiguredObject o : potentials)
             {
@@ -215,7 +216,7 @@ public class RestServlet extends AbstractServlet
         return filter(parents, request);
     }
 
-    private Collection<ConfiguredObject> filter(Collection<ConfiguredObject> objects, HttpServletRequest request)
+    private Collection<ConfiguredObject<?>> filter(Collection<ConfiguredObject<?>> objects, HttpServletRequest request)
     {
 
 
@@ -234,9 +235,9 @@ public class RestServlet extends AbstractServlet
             return objects;
         }
 
-        Collection<ConfiguredObject> filteredObj = new ArrayList<ConfiguredObject>(objects);
+        Collection<ConfiguredObject<?>> filteredObj = new ArrayList<ConfiguredObject<?>>(objects);
 
-        Iterator<ConfiguredObject> iter = filteredObj.iterator();
+        Iterator<ConfiguredObject<?>> iter = filteredObj.iterator();
 
         while(iter.hasNext())
         {
@@ -293,7 +294,7 @@ public class RestServlet extends AbstractServlet
 
         setCachingHeadersOnResponse(response);
 
-        Collection<ConfiguredObject> allObjects = getObjects(request);
+        Collection<ConfiguredObject<?>> allObjects = getObjects(request);
 
         // TODO - sort special params, everything else should act as a filter
         int depth = getDepthParameterFromRequest(request);
@@ -392,9 +393,9 @@ public class RestServlet extends AbstractServlet
                     {
                         if(Model.getInstance().getChildTypes(_hierarchy[j]).contains(_hierarchy[i]))
                         {
-                            for(ConfiguredObject parent : objects[j])
+                            for(ConfiguredObject<?> parent : objects[j])
                             {
-                                for(ConfiguredObject object : parent.getChildren(_hierarchy[i]))
+                                for(ConfiguredObject<?> object : parent.getChildren(_hierarchy[i]))
                                 {
                                     if(object.getName().equals(names.get(i)))
                                     {
@@ -523,10 +524,10 @@ public class RestServlet extends AbstractServlet
         setCachingHeadersOnResponse(response);
         try
         {
-            Collection<ConfiguredObject> allObjects = getObjects(request);
+            Collection<ConfiguredObject<?>> allObjects = getObjects(request);
             for(ConfiguredObject o : allObjects)
             {
-                o.setDesiredState(o.getActualState(), State.DELETED);
+                o.setDesiredState(o.getState(), State.DELETED);
             }
 
             response.setStatus(HttpServletResponse.SC_OK);
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 aebaa39564..41f43bdeaa 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
@@ -606,7 +606,7 @@ define(["dojo/_base/xhr",
                                new UpdatableStore(that.brokerData.keystores, query(".broker-key-stores")[0],
                                                [ { name: "Name",    field: "name",      width: "20%"},
                                                  { name: "Path", field: "path", width: "40%"},
-                                                 { name: "Type", field: "type", width: "5%"},
+                                                 { name: "Type", field: "keyStoreType", width: "5%"},
                                                  { name: "Key Manager Algorithm", field: "keyManagerFactoryAlgorithm", width: "20%"},
                                                  { name: "Alias", field: "certificateAlias", width: "15%"}
                                                ], function(obj) {
@@ -623,7 +623,7 @@ define(["dojo/_base/xhr",
                                new UpdatableStore(that.brokerData.truststores, query(".broker-trust-stores")[0],
                                                [ { name: "Name",    field: "name",      width: "20%"},
                                                  { name: "Path", field: "path", width: "40%"},
-                                                 { name: "Type", field: "type", width: "5%"},
+                                                 { name: "Type", field: "trustStoreType", width: "5%"},
                                                  { name: "Trust Manager Algorithm", field: "trustManagerFactoryAlgorithm", width: "25%"},
                                                  { name: "Peers only", field: "peersOnly", width: "10%",
                                                    formatter: function(val){
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js
index 36930be85a..4820e42ccf 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js
@@ -101,7 +101,7 @@ define(["dojo/dom",
 
                storeNodes(["name",
                            "path",
-                           "type",
+                           "keyStoreType",
                            "keyManagerFactoryAlgorithm",
                            "certificateAlias",
                            "peersOnly"
@@ -121,7 +121,7 @@ define(["dojo/dom",
            {
               this.name.innerHTML = entities.encode(String(this.keyStoreData[ "name" ]));
               this.path.innerHTML = entities.encode(String(this.keyStoreData[ "path" ]));
-              this.type.innerHTML = entities.encode(String(this.keyStoreData[ "type" ]));
+              this.keyStoreType.innerHTML = entities.encode(String(this.keyStoreData[ "keyStoreType" ]));
               this.keyManagerFactoryAlgorithm.innerHTML = entities.encode(String(this.keyStoreData[ "keyManagerFactoryAlgorithm" ]));
               this.certificateAlias.innerHTML = this.keyStoreData[ "certificateAlias" ] ? entities.encode(String( this.keyStoreData[ "certificateAlias" ])) : "";
            };
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
index e3d880ce24..1d3c462d1e 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
@@ -101,7 +101,7 @@ define(["dojo/dom",
 
                storeNodes(["name",
                            "path",
-                           "type",
+                           "trustStoreType",
                            "trustManagerFactoryAlgorithm",
                            "certificateAlias",
                            "peersOnly"
@@ -121,7 +121,7 @@ define(["dojo/dom",
            {
               this.name.innerHTML = entities.encode(String(this.keyStoreData[ "name" ]));
               this.path.innerHTML = entities.encode(String(this.keyStoreData[ "path" ]));
-              this.type.innerHTML = entities.encode(String(this.keyStoreData[ "type" ]));
+              this.trustStoreType.innerHTML = entities.encode(String(this.keyStoreData[ "trustStoreType" ]));
               this.trustManagerFactoryAlgorithm.innerHTML = entities.encode(String(this.keyStoreData[ "trustManagerFactoryAlgorithm" ]));
               this.peersOnly.innerHTML = "<input type='checkbox' disabled='disabled' "+(this.keyStoreData[ "peersOnly" ] ? "checked='checked'": "")+" />" ;
            };
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addKeystore.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addKeystore.js
index 4fdcffb7f1..ae54d19750 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addKeystore.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addKeystore.js
@@ -129,10 +129,10 @@ define(["dojo/_base/lang",
                 }
                 optionalFieldContainer.addChild(new dijit.form.ValidationTextBox({
                   required: false,
-                  value: keystore.type,
+                  value: isKeystore ? keystore.keyStoreType : keystore.trustStoreType,
                   label: "Key store type:",
                   placeHolder: "Use default",
-                  name: "type"}));
+                  name: isKeystore ? "keyStoreType" : "trustStoreType"}));
                 var panel = new dijit.TitlePane({title: "Optional Attributes", content: optionalFieldContainer.domNode, open: false});
                 return panel;
               }
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showKeyStore.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showKeyStore.html
index 5caee836d3..41b877c058 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showKeyStore.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showKeyStore.html
@@ -25,7 +25,7 @@
        <div class="nameValue" style="float:left;"></div><br/>
 
        <div class="formLabel-labelCell" style="float:left; width: 250px;">Type:</div>
-       <div class="typeValue" style="float:left;"></div><br/>
+       <div class="keyStoreTypeValue" style="float:left;"></div><br/>
 
        <div class="formLabel-labelCell" style="float:left; width: 250px;">Key Manager Factory Algorithm:</div>
        <div class="keyManagerFactoryAlgorithmValue" style="float:left;"></div><br/>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showTrustStore.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showTrustStore.html
index 6f9146fdfe..09f5e2037a 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showTrustStore.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showTrustStore.html
@@ -25,7 +25,7 @@
        <div class="nameValue" style="float:left;"></div><br/>
 
        <div class="formLabel-labelCell" style="float:left; width: 250px;">Type:</div>
-       <div class="typeValue" style="float:left;"></div><br/>
+       <div class="trustStoreTypeValue" style="float:left;"></div><br/>
 
        <div class="formLabel-labelCell" style="float:left; width: 250px;">Trust Manager Factory Algorithm:</div>
        <div class="trustManagerFactoryAlgorithmValue" style="float:left;"></div><br/>