You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2017/10/24 20:09:53 UTC
[1/2] activemq-artemis git commit: ARTEMIS-1480 web console 'purge
queue' is broken
Repository: activemq-artemis
Updated Branches:
refs/heads/master 0e0693d11 -> a4f699431
ARTEMIS-1480 web console 'purge queue' is broken
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/c9975817
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/c9975817
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/c9975817
Branch: refs/heads/master
Commit: c9975817cbd4d80eb26784fc2bfc58c61c129e80
Parents: 0e0693d
Author: Shailendra Kumar Singh <sh...@gmail.com>
Authored: Wed Oct 25 01:17:15 2017 +0530
Committer: Justin Bertram <jb...@apache.org>
Committed: Tue Oct 24 15:08:46 2017 -0500
----------------------------------------------------------------------
artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/queue.js | 4 ++--
.../artemis-plugin/src/main/webapp/plugin/lib/artemis-console.js | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c9975817/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/queue.js
----------------------------------------------------------------------
diff --git a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/queue.js b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/queue.js
index 1cfb2de..d4c8b42 100644
--- a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/queue.js
+++ b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/queue.js
@@ -119,14 +119,14 @@ var ARTEMIS = (function(ARTEMIS) {
$scope.purgeDestination = function () {
var selection = workspace.selection;
var entries = selection.entries;
- var mbean = getBrokerMBean(jolokia);
+ var mbean = selection.objectName;
if (mbean) {
if (selection && jolokia && entries) {
var name = entries["Destination"] || entries["destinationName"] || selection.title;
name = name.unescapeHTML();
var operation = "purge()";
$scope.message = "Purged queue " + name;
- ARTEMISService.artemisConsole.purgeQueue(mbean, jolokia, name, onSuccess(deleteSuccess));
+ ARTEMISService.artemisConsole.purgeQueue(mbean, jolokia, onSuccess(deleteSuccess));
}
}
};
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c9975817/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/lib/artemis-console.js
----------------------------------------------------------------------
diff --git a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/lib/artemis-console.js b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/lib/artemis-console.js
index 89a88ef..4ef90d5 100644
--- a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/lib/artemis-console.js
+++ b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/lib/artemis-console.js
@@ -38,8 +38,8 @@ function ArtemisConsole() {
jolokia.execute(mbean, "destroyQueue(java.lang.String)", name, method);
};
- this.purgeQueue = function (mbean, jolokia, name, method) {
- //todo
+ this.purgeQueue = function (mbean, jolokia, method) {
+ jolokia.execute(mbean, "removeAllMessages()", method);
};
this.browse = function (mbean, jolokia, method) {
[2/2] activemq-artemis git commit: This closes #1609
Posted by jb...@apache.org.
This closes #1609
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/a4f69943
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/a4f69943
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/a4f69943
Branch: refs/heads/master
Commit: a4f699431a9b262c2102bbf0057868464aa6bd78
Parents: 0e0693d c997581
Author: Justin Bertram <jb...@apache.org>
Authored: Tue Oct 24 15:09:30 2017 -0500
Committer: Justin Bertram <jb...@apache.org>
Committed: Tue Oct 24 15:09:30 2017 -0500
----------------------------------------------------------------------
artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/queue.js | 4 ++--
.../artemis-plugin/src/main/webapp/plugin/lib/artemis-console.js | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------