You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ea...@apache.org on 2017/03/01 16:13:46 UTC
qpid-dispatch git commit: DISPATCH-642 Properly recognize Artemis
broker
Repository: qpid-dispatch
Updated Branches:
refs/heads/master 551ec4cda -> 144520e81
DISPATCH-642 Properly recognize Artemis broker
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/144520e8
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/144520e8
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/144520e8
Branch: refs/heads/master
Commit: 144520e818b6d7adff089b65c35100b75fb91811
Parents: 551ec4c
Author: Ernest Allen <ea...@redhat.com>
Authored: Wed Mar 1 11:13:25 2017 -0500
Committer: Ernest Allen <ea...@redhat.com>
Committed: Wed Mar 1 11:13:25 2017 -0500
----------------------------------------------------------------------
console/stand-alone/plugin/css/plugin.css | 7 +++++--
console/stand-alone/plugin/js/qdrService.js | 2 +-
console/stand-alone/plugin/js/qdrTopology.js | 15 ++++++++++-----
3 files changed, 16 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/144520e8/console/stand-alone/plugin/css/plugin.css
----------------------------------------------------------------------
diff --git a/console/stand-alone/plugin/css/plugin.css b/console/stand-alone/plugin/css/plugin.css
index 96c3b89..80c7aed 100644
--- a/console/stand-alone/plugin/css/plugin.css
+++ b/console/stand-alone/plugin/css/plugin.css
@@ -867,6 +867,9 @@ table.log-entry pre {
circle.node.normal.console {
fill: lightcyan;
}
+circle.node.artemis {
+ fill: lightgreen;
+}
text.console, text.on-demand, text.normal {
font-family: FontAwesome;
@@ -879,13 +882,13 @@ text.console, text.on-demand, text.normal {
src: url("brokers.ttf") /* TTF file for CSS3 browsers */
}
-text.artemis.on-demand {
+text.artemis {
font-family: Brokers;
font-size: 20px;
font-weight: bold;
}
-text.qpid-cpp.on-demand {
+text.qpid-cpp {
font-family: Brokers;
font-size: 18px;
font-weight: bold;
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/144520e8/console/stand-alone/plugin/js/qdrService.js
----------------------------------------------------------------------
diff --git a/console/stand-alone/plugin/js/qdrService.js b/console/stand-alone/plugin/js/qdrService.js
index 426d3dc..607d8b5 100644
--- a/console/stand-alone/plugin/js/qdrService.js
+++ b/console/stand-alone/plugin/js/qdrService.js
@@ -280,7 +280,7 @@ console.dump(e)
},
isArtemis: function(d) {
- return d.nodeType === 'on-demand' && !d.properties.product;
+ return d.nodeType === 'route-container' && d.properties.product === 'apache-activemq-artemis';
},
isQpid: function(d) {
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/144520e8/console/stand-alone/plugin/js/qdrTopology.js
----------------------------------------------------------------------
diff --git a/console/stand-alone/plugin/js/qdrTopology.js b/console/stand-alone/plugin/js/qdrTopology.js
index a20228e..9899393 100644
--- a/console/stand-alone/plugin/js/qdrTopology.js
+++ b/console/stand-alone/plugin/js/qdrTopology.js
@@ -507,7 +507,8 @@ QDR.log.debug("attr.description " + attr.description)
var radii = {
'inter-router': 25,
'normal': 15,
- 'on-demand': 15
+ 'on-demand': 15,
+ 'route-container': 15,
};
var radius = 25;
var radiusNormal = 15;
@@ -687,7 +688,7 @@ QDR.log.debug("attr.description " + attr.description)
if (target >= 0) {
getLink(source, target, dir, "", source + "-" + target);
}
- } else if (role == "normal" || role == "on-demand") {
+ } else if (role == "normal" || role == "on-demand" || role === "route-container") {
// not a router, but an external client
var name = QDRService.nameFromId(id) + "." + connection.identity;
@@ -1642,8 +1643,12 @@ QDR.log.debug("attr.description " + attr.description)
clearPopups();
if (!d.normals) {
// circle was a router or a broker
- if (QDRService.isArtemis(d) && Core.ConnectionName === 'Artemis') {
- $location.path('/jmx/attributes?tab=artemis&con=Artemis')
+ if (QDRService.isArtemis(d)) {
+ var artemisPath = '/jmx/attributes?tab=artemis&con=Artemis'
+ if (QDR.isStandalone)
+ window.location = $location.protocol() + '://localhost:8161/hawtio' + artemisPath
+ else
+ $location.path(artemisPath)
}
return;
}
@@ -1781,7 +1786,7 @@ QDR.log.debug("attr.description " + attr.description)
}))
}
if (!svg.selectAll('circle.artemis').empty()) {
- legendNodes.push(aNode("Artemis broker", "", "on-demand", undefined, 6, 0, 0, 0, false, {}))
+ legendNodes.push(aNode("Artemis broker", "", "route-container", undefined, 6, 0, 0, 0, false, {product: 'apache-activemq-artemis'}))
}
lsvg = lsvg.data(legendNodes, function(d) {
return d.key;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org