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/18 20:43:34 UTC
[1/2] activemq-artemis git commit: This closes #1599
Repository: activemq-artemis
Updated Branches:
refs/heads/master cf6318783 -> 89ccee653
This closes #1599
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/89ccee65
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/89ccee65
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/89ccee65
Branch: refs/heads/master
Commit: 89ccee6533634d80fb251d03e44931b22cea9470
Parents: cf63187 176dab3
Author: Justin Bertram <jb...@apache.org>
Authored: Wed Oct 18 15:43:15 2017 -0500
Committer: Justin Bertram <jb...@apache.org>
Committed: Wed Oct 18 15:43:15 2017 -0500
----------------------------------------------------------------------
artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/browse.js | 2 --
.../artemis-plugin/src/main/webapp/plugin/lib/artemis-console.js | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
[2/2] activemq-artemis git commit: ARTEMIS-1470 - fix console move
message
Posted by jb...@apache.org.
ARTEMIS-1470 - fix console move message
https://issues.apache.org/jira/browse/ARTEMIS-1470
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/176dab3a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/176dab3a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/176dab3a
Branch: refs/heads/master
Commit: 176dab3a78b1af72ea35dafb8ebbfc2def43a8c8
Parents: cf63187
Author: Andy Taylor <an...@gmail.com>
Authored: Wed Oct 18 16:41:38 2017 +0100
Committer: Justin Bertram <jb...@apache.org>
Committed: Wed Oct 18 15:43:15 2017 -0500
----------------------------------------------------------------------
artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/browse.js | 2 --
.../artemis-plugin/src/main/webapp/plugin/lib/artemis-console.js | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/176dab3a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/browse.js
----------------------------------------------------------------------
diff --git a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/browse.js b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/browse.js
index 9ced888..7e06b17 100644
--- a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/browse.js
+++ b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/browse.js
@@ -117,12 +117,10 @@ var ARTEMIS = (function(ARTEMIS) {
if (mbean && selection) {
var selectedItems = $scope.gridOptions.selectedItems;
$scope.message = "Moved " + Core.maybePlural(selectedItems.length, "message" + " to " + $scope.queueName);
- var operation = "moveMessageTo(java.lang.String, java.lang.String)";
angular.forEach(selectedItems, function (item, idx) {
var id = item.messageID;
if (id) {
var callback = (idx + 1 < selectedItems.length) ? intermediateResult : moveSuccess;
- jolokia.execute(mbean, operation, id, $scope.queueName, onSuccess(callback));
ARTEMISService.artemisConsole.moveMessage(mbean, jolokia, id, $scope.queueName, onSuccess(callback));
}
});
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/176dab3a/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 948127b..89a88ef 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
@@ -52,7 +52,7 @@ function ArtemisConsole() {
};
this.moveMessage = function (mbean, jolokia, id, queueName, method) {
- jolokia.execute(mbean, "moveMessage(java.lang.String,java.lang.String)", id, queueName, method);
+ jolokia.execute(mbean, "moveMessage(long,java.lang.String)", id, queueName, method);
};
this.retryMessage = function (mbean, jolokia, id, method) {