QPID-4833 : [Java Broker] Display transport (TCP/SSL) and (accepting) port for each connection in web management console

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

6 files changed, 32 insertions, 4 deletions

diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js b/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js
index 91dc52d6cf..5b1ddd0b5b 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js
+++ b/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js
@@ -86,6 +86,8 @@ define(["dojo/_base/xhr",
                            "state",
                            "durable",
                            "principal",
+                           "port",
+                           "transport",
                            "lifetimePolicy",
                            "msgInRate",
                            "bytesInRate",
@@ -125,6 +127,8 @@ define(["dojo/_base/xhr",
               this.state.innerHTML = this.connectionData[ "state" ];
               this.durable.innerHTML = this.connectionData[ "durable" ];
               this.principal.innerHTML = this.connectionData[ "principal" ];
+              this.port.innerHTML = this.connectionData[ "port" ];
+              this.transport.innerHTML = this.connectionData[ "transport" ];
               this.lifetimePolicy.innerHTML = this.connectionData[ "lifetimePolicy" ];
 
            };
@@ -212,4 +216,4 @@ define(["dojo/_base/xhr",
 
 
            return Connection;
-       });
\ No newline at end of file
+       });
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js b/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
index 23c164f052..004abe0039 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
+++ b/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
@@ -208,8 +208,10 @@ define(["dojo/_base/xhr",
                    that.connectionsGrid = new UpdatableStore(that.vhostData.connections,
                                                              findNode("connections"),
                                                              [ { name: "Name",    field: "name",      width: "150px"},
-                                                                 { name: "Sessions", field: "sessionCount", width: "70px"},
                                                                  { name: "User", field: "principal", width: "120px"},
+                                                                 { name: "Port",    field: "port",      width: "70px"},
+                                                                 { name: "Transport",    field: "transport",      width: "70px"},
+                                                                 { name: "Sessions", field: "sessionCount", width: "70px"},
                                                                  { name: "Msgs In", field: "msgInRate",
                                                                      width: "80px"},
                                                                  { name: "Bytes In", field: "bytesInRate",
@@ -385,4 +387,4 @@ define(["dojo/_base/xhr",
 
 
            return VirtualHost;
-       });
\ No newline at end of file
+       });
diff --git a/java/broker-plugins/management-http/src/main/java/resources/showConnection.html b/java/broker-plugins/management-http/src/main/java/resources/showConnection.html
index 82869004a8..4611b77f6c 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/showConnection.html
+++ b/java/broker-plugins/management-http/src/main/java/resources/showConnection.html
@@ -40,6 +40,10 @@
     <br/>
     <span style="">User:</span><span style="position:absolute; left:6em" class="principal"></span>
     <br/>
+    <span style="">Port:</span><span style="position:absolute; left:6em" class="port"></span>
+    <br/>
+    <span style="">Transport:</span><span style="position:absolute; left:6em" class="transport"></span>
+    <br/>
     <br/>
     <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Sessions'">
         <div class="sessions"></div>
diff --git a/java/broker/src/main/java/org/apache/qpid/server/model/Connection.java b/java/broker/src/main/java/org/apache/qpid/server/model/Connection.java
index aaf6007afd..3139850892 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/model/Connection.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/model/Connection.java
@@ -78,6 +78,9 @@ public interface Connection extends ConfiguredObject
     public static final String REMOTE_PROCESS_NAME = "remoteProcessName";
     public static final String REMOTE_PROCESS_PID = "remoteProcessPid";
     public static final String SESSION_COUNT_LIMIT = "sessionCountLimit";
+    public static final String TRANSPORT = "transport";
+    public static final String PORT = "port";
+
 
     public static final Collection<String> AVAILABLE_ATTRIBUTES =
             Collections.unmodifiableCollection(
@@ -98,7 +101,9 @@ public interface Connection extends ConfiguredObject
                                     REMOTE_ADDRESS,
                                     REMOTE_PROCESS_NAME,
                                     REMOTE_PROCESS_PID,
-                                    SESSION_COUNT_LIMIT));
+                                    SESSION_COUNT_LIMIT,
+                                    TRANSPORT,
+                                    PORT));
 
     //children
     Collection<Session> getSessions();
diff --git a/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AmqpPortAdapter.java b/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AmqpPortAdapter.java
index ddfbf51322..02ff98fb0e 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AmqpPortAdapter.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AmqpPortAdapter.java
@@ -253,4 +253,9 @@ public class AmqpPortAdapter extends PortAdapter
             return _bindingSocketAddress;
         }
     };
+
+    public String toString()
+    {
+        return getName();
+    }
 }
diff --git a/java/broker/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java b/java/broker/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java
index 878d4f0034..54a3b634e5 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java
@@ -220,6 +220,14 @@ final class ConnectionAdapter extends AbstractAdapter implements Connection
         {
             return _connection.getSessionCountLimit();
         }
+        else if(name.equals(TRANSPORT))
+        {
+            return String.valueOf(_connection.getTransport());
+        }
+        else if(name.equals(PORT))
+        {
+            return String.valueOf(_connection.getPort());
+        }
         return super.getAttribute(name);
     }