Author: rgodfrey
Date: Sat May 11 21:10:05 2013
New Revision: 1481416
URL: http://svn.apache.org/r1481416
Log:
QPID-4833 : [Java Broker] Display transport (TCP/SSL) and (accepting) port for
each connection in web management console
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showConnection.html
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Connection.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AmqpPortAdapter.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js?rev=1481416&r1=1481415&r2=1481416&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js
Sat May 11 21:10:05 2013
@@ -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
+ });
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js?rev=1481416&r1=1481415&r2=1481416&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
Sat May 11 21:10:05 2013
@@ -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
+ });
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showConnection.html
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showConnection.html?rev=1481416&r1=1481415&r2=1481416&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showConnection.html
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showConnection.html
Sat May 11 21:10:05 2013
@@ -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>
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Connection.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Connection.java?rev=1481416&r1=1481415&r2=1481416&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Connection.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Connection.java
Sat May 11 21:10:05 2013
@@ -78,6 +78,9 @@ public interface Connection extends Conf
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 Conf
REMOTE_ADDRESS,
REMOTE_PROCESS_NAME,
REMOTE_PROCESS_PID,
- SESSION_COUNT_LIMIT));
+ SESSION_COUNT_LIMIT,
+ TRANSPORT,
+ PORT));
//children
Collection<Session> getSessions();
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AmqpPortAdapter.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AmqpPortAdapter.java?rev=1481416&r1=1481415&r2=1481416&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AmqpPortAdapter.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AmqpPortAdapter.java
Sat May 11 21:10:05 2013
@@ -253,4 +253,9 @@ public class AmqpPortAdapter extends Por
return _bindingSocketAddress;
}
};
+
+ public String toString()
+ {
+ return getName();
+ }
}
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java?rev=1481416&r1=1481415&r2=1481416&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java
Sat May 11 21:10:05 2013
@@ -220,6 +220,14 @@ final class ConnectionAdapter extends Ab
{
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);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
