[qpid-broker-j] branch 7.1.x updated: QPID-8314: [Broker-J][WMC] Allow selection of all messages displayed in the message table
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/7.1.x by this push:
new 1723b1d QPID-8314: [Broker-J][WMC] Allow selection of all messages
displayed in the message table
1723b1d is described below
commit 1723b1d93af3fea6f508d5abd1653dc1faa7062e
Author: Alex Rudyy
AuthorDate: Tue Jul 2 18:25:47 2019 +0100
QPID-8314: [Broker-J][WMC] Allow selection of all messages displayed in the
message table
(cherry picked from commit 00bf31f99d8395de7876c9bfaaa45378cd9d67c3)
---
.../src/main/java/resources/css/common.css | 12 +-
.../resources/js/qpid/management/Management.js | 28 +-
.../resources/js/qpid/management/MessageStore.js | 60 +
.../java/resources/js/qpid/management/Queue.js | 285 -
.../js/qpid/management/query/StoreUpdater.js | 17 +-
.../src/main/java/resources/showQueue.html | 4 +-
6 files changed, 267 insertions(+), 139 deletions(-)
diff --git
a/broker-plugins/management-http/src/main/java/resources/css/common.css
b/broker-plugins/management-http/src/main/java/resources/css/common.css
index a12ac7d..4646275 100644
--- a/broker-plugins/management-http/src/main/java/resources/css/common.css
+++ b/broker-plugins/management-http/src/main/java/resources/css/common.css
@@ -114,11 +114,6 @@ h1 {
}
-div .messages {
- width: 100%;
- height: 350px;
-}
-
.formBox {
margin: 10px 5px;
}
@@ -837,3 +832,10 @@ td.advancedSearchField, col.autoWidth {
.logViewer .field-logger { width: 20%;}
.logViewer .field-threadName { width: 10%;}
.logViewer .field-message { width: auto;}
+
+.queueMessages .field-selected { width: 2em; }
+.queueMessages .field-id { width: 15%; }
+.queueMessages .field-messageId { width: 20%; }
+.queueMessages .field-size { width: 20%;}
+.queueMessages .field-state { width: 20%; }
+.queueMessages .field-arrivalTime { width: auto }
diff --git
a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Management.js
b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Management.js
index 0b181f4..777e972 100644
---
a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Management.js
+++
b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Management.js
@@ -108,7 +108,7 @@ define(["dojo/_base/lang",
if (request)
{
-shallowCopy(request, requestOptions, ["url"]);
+shallowCopy(request, requestOptions, ["url",
"returnOriginalPromise"]);
if (requestOptions.data && requestOptions.headers &&
requestOptions.headers["Content-Type"]
&& requestOptions.headers["Content-Type"] ==
"application/json" && typeof requestOptions.data
!= "string")
@@ -137,6 +137,12 @@ define(["dojo/_base/lang",
}
}
}));
+
+if ("returnOriginalPromise" in request &&
request.returnOriginalPromise === true)
+{
+return promise;
+}
+
var errorHandler = this.errorHandler;
// decorate promise in order to use a default error handler when
'then' method is invoked without providing error handler
@@ -253,6 +259,25 @@ define(["dojo/_base/lang",
return this.get(request);
};
+Management.prototype.invoke = function (modelObj, parameters,
requestOptions)
+{
+var url = this.objectToURL(modelObj);
+var request = {url: url};
+
+if (requestOptions)
+{
+lang.mixin(request, requestOptions);
+}
+
+if (parameters)
+{
+request.query = parameters;
+}
+request.returnOriginalPromise = true;
+
+return this.get(request);
+};
+
// summary:
// Creates object as specified in data parameter with given category
and with given parent parentModelObject
// category: String?
@@ -624,6 +649,7 @@ define(["dojo/_base/lang",
query: {}
};
shallowCopy(query, request.query, ["parent", "category"]);
+request.returnOriginalPromise = true;
return this.get(request);
};
diff --git
a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/MessageStore.js
b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/MessageStore.js
new file mode 100644
index 000..74184bc
--- /dev/null
+++
b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/MessageStore.js
@@ -0,0 +1,60 @@
+define([
+'dojo/_base/lang',
+'dojo/_base/declare',
[qpid-broker-j] branch master updated: QPID-8314: [Broker-J][WMC] Allow selection of all messages displayed in the message table
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/master by this push:
new 00bf31f QPID-8314: [Broker-J][WMC] Allow selection of all messages
displayed in the message table
00bf31f is described below
commit 00bf31f99d8395de7876c9bfaaa45378cd9d67c3
Author: Alex Rudyy
AuthorDate: Tue Jul 2 18:25:47 2019 +0100
QPID-8314: [Broker-J][WMC] Allow selection of all messages displayed in the
message table
---
.../src/main/java/resources/css/common.css | 12 +-
.../resources/js/qpid/management/Management.js | 28 +-
.../resources/js/qpid/management/MessageStore.js | 60 +
.../java/resources/js/qpid/management/Queue.js | 285 -
.../js/qpid/management/query/StoreUpdater.js | 17 +-
.../src/main/java/resources/showQueue.html | 4 +-
6 files changed, 267 insertions(+), 139 deletions(-)
diff --git
a/broker-plugins/management-http/src/main/java/resources/css/common.css
b/broker-plugins/management-http/src/main/java/resources/css/common.css
index a12ac7d..4646275 100644
--- a/broker-plugins/management-http/src/main/java/resources/css/common.css
+++ b/broker-plugins/management-http/src/main/java/resources/css/common.css
@@ -114,11 +114,6 @@ h1 {
}
-div .messages {
- width: 100%;
- height: 350px;
-}
-
.formBox {
margin: 10px 5px;
}
@@ -837,3 +832,10 @@ td.advancedSearchField, col.autoWidth {
.logViewer .field-logger { width: 20%;}
.logViewer .field-threadName { width: 10%;}
.logViewer .field-message { width: auto;}
+
+.queueMessages .field-selected { width: 2em; }
+.queueMessages .field-id { width: 15%; }
+.queueMessages .field-messageId { width: 20%; }
+.queueMessages .field-size { width: 20%;}
+.queueMessages .field-state { width: 20%; }
+.queueMessages .field-arrivalTime { width: auto }
diff --git
a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Management.js
b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Management.js
index 0b181f4..777e972 100644
---
a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Management.js
+++
b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Management.js
@@ -108,7 +108,7 @@ define(["dojo/_base/lang",
if (request)
{
-shallowCopy(request, requestOptions, ["url"]);
+shallowCopy(request, requestOptions, ["url",
"returnOriginalPromise"]);
if (requestOptions.data && requestOptions.headers &&
requestOptions.headers["Content-Type"]
&& requestOptions.headers["Content-Type"] ==
"application/json" && typeof requestOptions.data
!= "string")
@@ -137,6 +137,12 @@ define(["dojo/_base/lang",
}
}
}));
+
+if ("returnOriginalPromise" in request &&
request.returnOriginalPromise === true)
+{
+return promise;
+}
+
var errorHandler = this.errorHandler;
// decorate promise in order to use a default error handler when
'then' method is invoked without providing error handler
@@ -253,6 +259,25 @@ define(["dojo/_base/lang",
return this.get(request);
};
+Management.prototype.invoke = function (modelObj, parameters,
requestOptions)
+{
+var url = this.objectToURL(modelObj);
+var request = {url: url};
+
+if (requestOptions)
+{
+lang.mixin(request, requestOptions);
+}
+
+if (parameters)
+{
+request.query = parameters;
+}
+request.returnOriginalPromise = true;
+
+return this.get(request);
+};
+
// summary:
// Creates object as specified in data parameter with given category
and with given parent parentModelObject
// category: String?
@@ -624,6 +649,7 @@ define(["dojo/_base/lang",
query: {}
};
shallowCopy(query, request.query, ["parent", "category"]);
+request.returnOriginalPromise = true;
return this.get(request);
};
diff --git
a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/MessageStore.js
b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/MessageStore.js
new file mode 100644
index 000..74184bc
--- /dev/null
+++
b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/MessageStore.js
@@ -0,0 +1,60 @@
+define([
+'dojo/_base/lang',
+'dojo/_base/declare',
+'dstore/Store',
+'dstore/QueryResults'
+], function (lang, declare,
svn commit: r34729 - /release/qpid/jms/0.42.0/
Author: robbie Date: Tue Jul 2 12:58:45 2019 New Revision: 34729 Log: clean out older release Removed: release/qpid/jms/0.42.0/ - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r34728 - /release/qpid/jms/0.44.0/
Author: robbie Date: Tue Jul 2 12:58:06 2019 New Revision: 34728 Log: add files for qpid-jms 0.44.0 Added: release/qpid/jms/0.44.0/ - copied from r34727, dev/qpid/jms/0.44.0-rc1/ - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
