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 2016/06/17 15:52:57 UTC
qpid-dispatch git commit: DISPATCH-393: For new router config -
Remove Container section, use host instead of addr
Repository: qpid-dispatch
Updated Branches:
refs/heads/master 2cfb8e79f -> c7ff8612f
DISPATCH-393: For new router config - Remove Container section, use host instead of addr
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/c7ff8612
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/c7ff8612
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/c7ff8612
Branch: refs/heads/master
Commit: c7ff8612f89e8df950d0d62f3a9b63fec7fd6343
Parents: 2cfb8e7
Author: Ernest Allen <ea...@redhat.com>
Authored: Fri Jun 17 11:52:42 2016 -0400
Committer: Ernest Allen <ea...@redhat.com>
Committed: Fri Jun 17 11:52:42 2016 -0400
----------------------------------------------------------------------
.../src/main/webapp/plugin/js/dispatchPlugin.js | 3 ++
.../src/main/webapp/plugin/js/qdrTopology.js | 29 ++++++++------------
2 files changed, 14 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/c7ff8612/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js
----------------------------------------------------------------------
diff --git a/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js b/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js
index 99f6c47..77ab7d5 100644
--- a/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js
+++ b/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js
@@ -248,6 +248,9 @@ $.getScript('https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.14/d3.min.js', functi
$.getScript('https://cdn.rawgit.com/jaz303/tipsy/master/src/javascripts/jquery.tipsy.js', function() {});
// tooltips on the topology page
$.getScript('https://cdn.rawgit.com/briancray/tooltipsy/master/tooltipsy.min.js', function() {});
+// download string as file
+$.getScript('https://cdnjs.cloudflare.com/ajax/libs/FileSaver.js/2014-11-29/FileSaver.min.js', function() {});
+
// tell the hawtio plugin loader about our plugin so it can be
// bootstrapped with the rest of angular
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/c7ff8612/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
----------------------------------------------------------------------
diff --git a/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js b/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
index e612df4..6542832 100644
--- a/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
+++ b/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
@@ -1448,7 +1448,7 @@ var QDR = (function (QDR) {
QDR.module.controller("QDR.NodeDialogController", function($scope, QDRService, dialog, newname) {
var schema = QDRService.schema;
- var myEntities = ['container', 'router', 'log', 'listener' ];
+ var myEntities = ['router', 'log', 'listener' ];
var typeMap = {integer: 'number', string: 'text', path: 'text', boolean: 'boolean'};
var newLinks = $('path.temp').toArray(); // jquery array of new links for the added router
var nodeInfo = QDRService.topology.nodeInfo();
@@ -1596,7 +1596,7 @@ var QDR = (function (QDR) {
ediv.attributes.filter(function (attr) { return attr.name == 'port'})[0].value = ++maxPort;
// connectors from other routers need to connect to this addr:port
myPort = maxPort;
- myAddr = ediv.attributes.filter(function (attr) { return attr.name == 'addr'})[0].value
+ myAddr = ediv.attributes.filter(function (attr) { return attr.name == 'host'})[0].value
// override the role. 'normal' is the default, but we want inter-router
ediv.attributes.filter(function( attr ) { return attr.name == 'role'})[0].selected = 'inter-router';
@@ -1622,8 +1622,8 @@ var QDR = (function (QDR) {
var res = listener.results[i];
var role = QDRService.valFor(attrs, res, 'role');
if (role == 'inter-router') {
- ediv.attributes.filter(function( attr ) { return attr.name == 'addr'})[0].value =
- QDRService.valFor(attrs, res, 'addr')
+ ediv.attributes.filter(function( attr ) { return attr.name == 'host'})[0].value =
+ QDRService.valFor(attrs, res, 'host')
ediv.attributes.filter(function( attr ) { return attr.name == 'port'})[0].value =
QDRService.valFor(attrs, res, 'port')
break;
@@ -1632,7 +1632,7 @@ var QDR = (function (QDR) {
if (link.__data__.right) {
// connectors from other nodes need to connect to the new router's listener addr:port
ediv.attributes.filter(function (attr) { return attr.name == 'port'})[0].value = myPort;
- ediv.attributes.filter(function (attr) { return attr.name == 'addr'})[0].value = myAddr;
+ ediv.attributes.filter(function (attr) { return attr.name == 'host'})[0].value = myAddr;
separatedEntities.push(ediv)
}
@@ -1659,7 +1659,7 @@ var QDR = (function (QDR) {
$scope.attributeType = '';
$scope.attributeRequired = '';
$scope.attributeUnique = '';
- $scope.active = 'container'
+ $scope.active = 'router'
$scope.fieldsetDivs = "/fieldsetDivs.html"
$scope.setActive = function (tabName) {
$scope.active = tabName
@@ -1804,22 +1804,15 @@ QDR.module.controller("QDR.DownloadDialogController", function($scope, QDRServic
// handle the download button click
$scope.download = function () {
- var blob = new Blob([$scope.output], { type: 'text/plain' });
- var downloadLink = angular.element('<a></a>');
- downloadLink.attr('href', ($window.URL || $window.webkitURL).createObjectURL(blob));
- downloadLink.attr('download', $scope.newRouterName);
- downloadLink[0].click();
+ var output = $scope.output + "\n\n"
+ var blob = new Blob([output], { type: 'text/plain;charset=utf-16' });
+ saveAs(blob, $scope.newRouterName);
}
$scope.downloadPart = function (part) {
var linkName = part.link.__data__.source.name + 'additional.conf';
- var blob = new Blob([part.output], { type: 'text/plain' });
- var downloadLink = angular.element('<a></a>');
- downloadLink.attr('href', ($window.URL || $window.webkitURL).createObjectURL(blob));
- downloadLink.attr('download', linkName);
- downloadLink[0].click();
-
- QDR.log.debug(part);
+ var blob = new Blob([part.output], { type: 'text/plain;charset=utf-16' });
+ saveAs(blob, linkName);
}
$scope.done = function () {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org