QPID-6034: [Java Broker] Refactor Port UI to use metadata service rather than hard-coding a list of protocols/transports etc

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

7 files changed, 26 insertions, 24 deletions

diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
index eca3b0c7b1..6937d31b3a 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
@@ -45,9 +45,6 @@ public interface Port<X extends Port<X>> extends ConfiguredObject<X>
 
     // Attributes
 
-    @ManagedAttribute(defaultValue = "*")
-    String getBindingAddress();
-
     @ManagedAttribute( mandatory = true )
     int getPort();
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
index 61790441f9..d1abded988 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
@@ -61,9 +61,6 @@ abstract public class AbstractPort<X extends AbstractPort<X>> extends AbstractCo
     private int _port;
 
     @ManagedAttributeField
-    private String _bindingAddress;
-
-    @ManagedAttributeField
     private KeyStore<?> _keyStore;
 
     @ManagedAttributeField
@@ -172,12 +169,6 @@ abstract public class AbstractPort<X extends AbstractPort<X>> extends AbstractCo
     }
 
     @Override
-    public String getBindingAddress()
-    {
-        return _bindingAddress;
-    }
-
-    @Override
     public int getPort()
     {
         return _port;
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
index b50a289b22..5c74beb5b7 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
@@ -48,6 +48,9 @@ public interface AmqpPort<X extends AmqpPort<X>> extends Port<X>
     @ManagedContextDefault(name = DEFAULT_AMQP_PROTOCOLS)
     String INSTALLED_PROTOCOLS = AmqpPortImpl.getInstalledProtocolsAsString();
 
+    @ManagedAttribute(defaultValue = "*")
+    String getBindingAddress();
+
     @ManagedAttribute( defaultValue = AmqpPort.DEFAULT_AMQP_TCP_NO_DELAY )
     boolean isTcpNoDelay();
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
index 2c958b00d0..9a0ea3548e 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
@@ -71,6 +71,9 @@ public class AmqpPortImpl extends AbstractPortWithAuthProvider<AmqpPortImpl> imp
     @ManagedAttributeField
     private int _receiveBufferSize;
 
+    @ManagedAttributeField
+    private String _bindingAddress;
+
     private final Broker<?> _broker;
     private AcceptingTransport _transport;
 
@@ -81,6 +84,13 @@ public class AmqpPortImpl extends AbstractPortWithAuthProvider<AmqpPortImpl> imp
         _broker = broker;
     }
 
+
+    @Override
+    public String getBindingAddress()
+    {
+        return _bindingAddress;
+    }
+
     @Override
     public boolean isTcpNoDelay()
     {
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPort.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPort.java
index 51d31cb8ab..d8c87fb123 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPort.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPort.java
@@ -36,6 +36,8 @@ public interface HttpPort<X extends HttpPort<X>> extends Port<X>
     String DEFAULT_AMQP_NEED_CLIENT_AUTH = "false";
     String DEFAULT_AMQP_WANT_CLIENT_AUTH = "false";
 
+    @ManagedAttribute(defaultValue = "*")
+    String getBindingAddress();
 
     @ManagedAttribute( defaultValue = DEFAULT_AMQP_NEED_CLIENT_AUTH )
     boolean getNeedClientAuth();
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPortImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPortImpl.java
index 33abee9bde..80e79a68ca 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPortImpl.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPortImpl.java
@@ -25,6 +25,7 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.qpid.server.model.Broker;
+import org.apache.qpid.server.model.ManagedAttributeField;
 import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
 import org.apache.qpid.server.model.Protocol;
 import org.apache.qpid.server.model.State;
@@ -33,6 +34,9 @@ public class HttpPortImpl extends AbstractPortWithAuthProvider<HttpPortImpl> imp
 {
     private PortManager _portManager;
 
+    @ManagedAttributeField
+    private String _bindingAddress;
+
     @ManagedObjectFactoryConstructor
     public HttpPortImpl(final Map<String, Object> attributes,
                         final Broker<?> broker)
@@ -45,6 +49,13 @@ public class HttpPortImpl extends AbstractPortWithAuthProvider<HttpPortImpl> imp
         _portManager = manager;
     }
 
+
+    @Override
+    public String getBindingAddress()
+    {
+        return _bindingAddress;
+    }
+
     @Override
     protected State onActivate()
     {
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/JmxPort.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/JmxPort.java
index 981d81a342..fdfe6f1d5d 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/JmxPort.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/JmxPort.java
@@ -32,21 +32,9 @@ import org.apache.qpid.server.model.Transport;
 @ManagedObject( category = false, type = "JMX")
 public interface JmxPort<X extends JmxPort<X>> extends Port<X>
 {
-
-    String DEFAULT_AMQP_NEED_CLIENT_AUTH = "false";
-    String DEFAULT_AMQP_WANT_CLIENT_AUTH = "false";
-
-
-    @ManagedAttribute( defaultValue = DEFAULT_AMQP_NEED_CLIENT_AUTH )
-    boolean getNeedClientAuth();
-
-    @ManagedAttribute( defaultValue = DEFAULT_AMQP_WANT_CLIENT_AUTH )
-    boolean getWantClientAuth();
-
     @ManagedAttribute( mandatory = true )
     AuthenticationProvider getAuthenticationProvider();
 
-
     @ManagedAttribute( defaultValue = "TCP",
                        validValues = {"[ \"TCP\" ]", "[ \"SSL\" ]"})
     Set<Transport> getTransports();