From 7091f0c0dec8a5c44177b96eb0017b3d944f008f Mon Sep 17 00:00:00 2001
From: Robert Godfrey <rgodfrey@apache.org>
Date: Sat, 11 May 2013 21:10:05 +0000
Subject: 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@1481416 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/java/org/apache/qpid/server/model/Connection.java    | 7 ++++++-
 .../org/apache/qpid/server/model/adapter/AmqpPortAdapter.java     | 5 +++++
 .../org/apache/qpid/server/model/adapter/ConnectionAdapter.java   | 8 ++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

(limited to 'qpid/java/broker/src')

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Connection.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Connection.java
index aaf6007afd..3139850892 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Connection.java
+++ b/qpid/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/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AmqpPortAdapter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AmqpPortAdapter.java
index ddfbf51322..02ff98fb0e 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AmqpPortAdapter.java
+++ b/qpid/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/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java
index 878d4f0034..54a3b634e5 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java
+++ b/qpid/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);
     }
 
-- 
cgit v1.2.1