qpid-site git commit: QPID-7354: Fix a residual 'C++' in the Python release notes
Repository: qpid-site
Updated Branches:
refs/heads/asf-site 88dd2aa4b -> b4e02bd72
QPID-7354: Fix a residual 'C++' in the Python release notes
Project: http://git-wip-us.apache.org/repos/asf/qpid-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-site/commit/b4e02bd7
Tree: http://git-wip-us.apache.org/repos/asf/qpid-site/tree/b4e02bd7
Diff: http://git-wip-us.apache.org/repos/asf/qpid-site/diff/b4e02bd7
Branch: refs/heads/asf-site
Commit: b4e02bd7232004a2b251d892d35956a5918ef256
Parents: 88dd2aa
Author: Justin Ross
Authored: Tue Aug 30 05:34:41 2016 -0700
Committer: Justin Ross
Committed: Tue Aug 30 05:34:41 2016 -0700
--
content/releases/qpid-python-1.35.0/release-notes.html | 11 +--
input/releases/qpid-python-1.35.0/release-notes.md | 7 +++
scripts/gen-python-release-notes | 7 +++
3 files changed, 11 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/qpid-site/blob/b4e02bd7/content/releases/qpid-python-1.35.0/release-notes.html
--
diff --git a/content/releases/qpid-python-1.35.0/release-notes.html
b/content/releases/qpid-python-1.35.0/release-notes.html
index a0a48cc..1f78ebe 100644
--- a/content/releases/qpid-python-1.35.0/release-notes.html
+++ b/content/releases/qpid-python-1.35.0/release-notes.html
@@ -21,7 +21,7 @@
-->
http://www.w3.org/1999/xhtml"; xml:lang="en">
-Qpid C++ 1.35.0 Release Notes - Apache Qpid™
+Qpid Python 1.35.0 Release Notes - Apache Qpid™
@@ -111,14 +111,13 @@
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-HomeReleasesQpid Python
1.35.0Qpid C++ 1.35.0 Release Notes
+HomeReleasesQpid Python
1.35.0Qpid Python 1.35.0 Release Notes
- Qpid C++ 1.35.0 Release Notes
+ Qpid Python 1.35.0 Release
Notes
-Qpid C++ offers a connection-oriented messaging API supporting many
-programming languages and a message broker written in C++ that stores,
-routes, and forwards messages using AMQP.
+Qpid Python includes an AMQP messaging library and a suite of tests
+for AMQP conformance.
For more information about this release, including download links and
documentation, see the release overview.
http://git-wip-us.apache.org/repos/asf/qpid-site/blob/b4e02bd7/input/releases/qpid-python-1.35.0/release-notes.md
--
diff --git a/input/releases/qpid-python-1.35.0/release-notes.md
b/input/releases/qpid-python-1.35.0/release-notes.md
index 4582594..e9e1e3c 100644
--- a/input/releases/qpid-python-1.35.0/release-notes.md
+++ b/input/releases/qpid-python-1.35.0/release-notes.md
@@ -17,11 +17,10 @@
;; under the License.
;;
-# Qpid C++ 1.35.0 Release Notes
+# Qpid Python 1.35.0 Release Notes
-Qpid C++ offers a connection-oriented messaging API supporting many
-programming languages and a message broker written in C++ that stores,
-routes, and forwards messages using AMQP.
+Qpid Python includes an AMQP messaging library and a suite of tests
+for AMQP conformance.
For more information about this release, including download links and
documentation, see the [release overview](index.html).
http://git-wip-us.apache.org/repos/asf/qpid-site/blob/b4e02bd7/scripts/gen-python-release-notes
--
diff --git a/scripts/gen-python-release-notes b/scripts/gen-python-release-notes
index 64eee68..e311450 100755
--- a/scripts/gen-python-release-notes
+++ b/scripts/gen-python-release-notes
@@ -41,11 +41,10 @@ template = \
;; under the License.
;;
-# Qpid C++ {release} Release Notes
+# Qpid Python {release} Release Notes
-Qpid C++ offers a connection-oriented messaging API supporting many
-programming languages and a message broker written in C++ that stores,
-routes, and forwards messages using AMQP.
+Qpid Python includes an AMQP messaging library and a suite of tests
+for AMQP conformance.
For more information about this release, including download links and
documentation, see the [release overview](index.html).
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
qpid-dispatch git commit: DISPATCH-488 Add notification popups to stand-alone console
Repository: qpid-dispatch
Updated Branches:
refs/heads/master 9683f5a7b -> ec71b2edf
DISPATCH-488 Add notification popups to stand-alone console
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/ec71b2ed
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/ec71b2ed
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/ec71b2ed
Branch: refs/heads/master
Commit: ec71b2edfbaff83a382ea8d3fc0d7246fd85c8e3
Parents: 9683f5a
Author: Ernest Allen
Authored: Tue Aug 30 08:36:33 2016 -0400
Committer: Ernest Allen
Committed: Tue Aug 30 08:36:33 2016 -0400
--
console/stand-alone/index.html | 1 +
console/stand-alone/plugin/js/dispatchPlugin.js | 6 ++
console/stand-alone/plugin/js/qdrList.js| 11 ++-
console/stand-alone/plugin/js/qdrOverview.js| 6 +-
4 files changed, 22 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/ec71b2ed/console/stand-alone/index.html
--
diff --git a/console/stand-alone/index.html b/console/stand-alone/index.html
index 36845e7..efb4eff 100644
--- a/console/stand-alone/index.html
+++ b/console/stand-alone/index.html
@@ -89,6 +89,7 @@ under the License.
https://cdn.rawgit.com/angular-ui/ui-slider/master/src/slider.js";>
https://code.jquery.com/ui/1.11.4/jquery-ui.min.js";>
https://cdnjs.cloudflare.com/ajax/libs/ng-grid/2.0.11/ng-grid.min.js";>
+https://cdnjs.cloudflare.com/ajax/libs/notify/0.4.2/notify.min.js";>
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/ec71b2ed/console/stand-alone/plugin/js/dispatchPlugin.js
--
diff --git a/console/stand-alone/plugin/js/dispatchPlugin.js
b/console/stand-alone/plugin/js/dispatchPlugin.js
index e8078e9..db250ac 100644
--- a/console/stand-alone/plugin/js/dispatchPlugin.js
+++ b/console/stand-alone/plugin/js/dispatchPlugin.js
@@ -68,6 +68,12 @@ var QDR = (function(QDR) {
*/
QDR.module = angular.module(QDR.pluginName, ['ngResource', 'ngGrid',
'ui.bootstrap', 'ui.slider'/*, 'minicolors' */]);
+ Core = {
+ notification: function (severity, msg) {
+$.notify(msg, severity);
+}
+ }
+
// set up the routing for this plugin
QDR.module.config(function($routeProvider) {
$routeProvider
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/ec71b2ed/console/stand-alone/plugin/js/qdrList.js
--
diff --git a/console/stand-alone/plugin/js/qdrList.js
b/console/stand-alone/plugin/js/qdrList.js
index 60107b7..ea531cd 100644
--- a/console/stand-alone/plugin/js/qdrList.js
+++ b/console/stand-alone/plugin/js/qdrList.js
@@ -88,7 +88,16 @@ var QDR = (function(QDR) {
$scope.currentMode = mode;
if (mode.id === 'log') {
$scope.logResults = "getting recent log
entries...";
- QDRService.sendMethod($scope.currentNode.id,
$scope.selectedEntity, {}, $scope.currentMode.op, function (nodeName, entity,
response, context) {
+ attrs = {
+ name: $scope.selectedRecordName
+ }
+ QDRService.sendMethod($scope.currentNode.id,
$scope.selectedEntity, attrs, $scope.currentMode.op, function (nodeName,
entity, response, context) {
+ var statusCode =
context.message.application_properties.statusCode;
+ if (statusCode < 200 || statusCode >=
300) {
+ Core.notification('error',
context.message.application_properties.statusDescription);
+
//QDR.log.debug(context.message.application_properties.statusDescription)
+ return;
+ }
$scope.logResults = response.filter(
function (entry) {
return entry[0] ===
$scope.detailsObject.module
}).sort( function (a, b) {
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/ec71b2ed/console/stand-alone/plugin/js/qdrOverview.js
--
diff --git a/console/stand-alone/plugin/js/qdrOverview.js
b/console/stand-alone/plugin/js/qdrOverview.js
index 9c4afad..27976ca 100644
--- a/console/stand-alone/plugin/js/qdrOverview.js
+++ b/console/stand-alone/plugin/js/
qpid-proton git commit: NO-JIRA: bump python fix version number for next release
Repository: qpid-proton
Updated Branches:
refs/heads/0.14.x 5c26c7cd9 -> 8dc30ed07
NO-JIRA: bump python fix version number for next release
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/8dc30ed0
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/8dc30ed0
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/8dc30ed0
Branch: refs/heads/0.14.x
Commit: 8dc30ed0767c1b7050c9fb0864e0e7271f864ca0
Parents: 5c26c7c
Author: Ken Giusti
Authored: Tue Aug 30 08:41:02 2016 -0400
Committer: Ken Giusti
Committed: Tue Aug 30 08:41:02 2016 -0400
--
proton-c/bindings/python/setuputils/bundle.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/8dc30ed0/proton-c/bindings/python/setuputils/bundle.py
--
diff --git a/proton-c/bindings/python/setuputils/bundle.py
b/proton-c/bindings/python/setuputils/bundle.py
index 05c0d06..dfb8658 100644
--- a/proton-c/bindings/python/setuputils/bundle.py
+++ b/proton-c/bindings/python/setuputils/bundle.py
@@ -35,7 +35,7 @@ from . import log
min_qpid_proton = (0, 14, 0)
min_qpid_proton_str = "%i.%i.%i" % min_qpid_proton
-bundled_version = (0, 14, 0)
+bundled_version = (0, 14, 1)
bundled_version_str = "%i.%i.%i" % bundled_version
libqpid_proton = "qpid-proton-%s.tar.gz" % bundled_version_str
libqpid_proton_url = ("http://www.apache.org/dist/qpid/proton/%s/%s"; %
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
qpid-proton git commit: NO-JIRA: Bump python binding version to next major release
Repository: qpid-proton
Updated Branches:
refs/heads/master ba8639fb7 -> 3b66acfd5
NO-JIRA: Bump python binding version to next major release
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/3b66acfd
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/3b66acfd
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/3b66acfd
Branch: refs/heads/master
Commit: 3b66acfd5b3e91fa405f63449985d5e769035bf8
Parents: ba8639f
Author: Ken Giusti
Authored: Tue Aug 30 08:53:06 2016 -0400
Committer: Ken Giusti
Committed: Tue Aug 30 08:53:06 2016 -0400
--
proton-c/bindings/python/setuputils/bundle.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3b66acfd/proton-c/bindings/python/setuputils/bundle.py
--
diff --git a/proton-c/bindings/python/setuputils/bundle.py
b/proton-c/bindings/python/setuputils/bundle.py
index 05c0d06..c85daf1 100644
--- a/proton-c/bindings/python/setuputils/bundle.py
+++ b/proton-c/bindings/python/setuputils/bundle.py
@@ -32,10 +32,10 @@ from . import log
#-
# Constants
#-
-min_qpid_proton = (0, 14, 0)
+min_qpid_proton = (0, 15, 0)
min_qpid_proton_str = "%i.%i.%i" % min_qpid_proton
-bundled_version = (0, 14, 0)
+bundled_version = (0, 15, 0)
bundled_version_str = "%i.%i.%i" % bundled_version
libqpid_proton = "qpid-proton-%s.tar.gz" % bundled_version_str
libqpid_proton_url = ("http://www.apache.org/dist/qpid/proton/%s/%s"; %
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
qpid-dispatch git commit: DISPATCH-489 Don't pass type into GET-LOG method request
Repository: qpid-dispatch
Updated Branches:
refs/heads/master ec71b2edf -> a92102543
DISPATCH-489 Don't pass type into GET-LOG method request
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/a9210254
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/a9210254
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/a9210254
Branch: refs/heads/master
Commit: a921025439450b9b894c70883dc3e22fb609d926
Parents: ec71b2e
Author: Ernest Allen
Authored: Tue Aug 30 09:51:30 2016 -0400
Committer: Ernest Allen
Committed: Tue Aug 30 09:51:30 2016 -0400
--
console/stand-alone/plugin/html/qdrList.html | 32 +--
console/stand-alone/plugin/js/qdrList.js | 11
console/stand-alone/plugin/js/qdrService.js | 8 +++---
3 files changed, 29 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/a9210254/console/stand-alone/plugin/html/qdrList.html
--
diff --git a/console/stand-alone/plugin/html/qdrList.html
b/console/stand-alone/plugin/html/qdrList.html
index 9d1379e..0033675 100644
--- a/console/stand-alone/plugin/html/qdrList.html
+++ b/console/stand-alone/plugin/html/qdrList.html
@@ -69,20 +69,24 @@ under the License.
-
-
-{{entry.time}}
-
-
-Type{{entry.type}}
-
-
-Source{{entry.source}}:{{entry.line}}
-
-
-Message{{entry.message}}
-
-
+
+
+
+{{entry.time}}
+
+
+Type{{entry.type}}
+
+
+Source{{entry.source}}:{{entry.line}}
+
+
+Message{{entry.message}}
+
+
+
+No log entries
for {{selectedRecordName}}
+Fetching logs for
{{selectedRecordName}}
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/a9210254/console/stand-alone/plugin/js/qdrList.js
--
diff --git a/console/stand-alone/plugin/js/qdrList.js
b/console/stand-alone/plugin/js/qdrList.js
index ea531cd..6a9f413 100644
--- a/console/stand-alone/plugin/js/qdrList.js
+++ b/console/stand-alone/plugin/js/qdrList.js
@@ -84,14 +84,15 @@ var QDR = (function(QDR) {
$scope.isModeSelected = function (mode) {
return mode === $scope.currentMode;
}
+ $scope.fetchingLog = false;
$scope.selectMode = function (mode) {
$scope.currentMode = mode;
if (mode.id === 'log') {
- $scope.logResults = "getting recent log
entries...";
- attrs = {
- name: $scope.selectedRecordName
- }
- QDRService.sendMethod($scope.currentNode.id,
$scope.selectedEntity, attrs, $scope.currentMode.op, function (nodeName,
entity, response, context) {
+ $scope.logResults = [];
+ $scope.fetchingLog = true;
+ var entity; // undefined since it is not
supported in the GET-LOG call
+ QDRService.sendMethod($scope.currentNode.id,
entity, {}, $scope.currentMode.op, function (nodeName, entity, response,
context) {
+ $scope.fetchingLog = false;
var statusCode =
context.message.application_properties.statusCode;
if (statusCode < 200 || statusCode >=
300) {
Core.notification('error',
context.message.application_properties.statusDescription);
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/a9210254/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 0293f48..bcfd1ad 100644
--- a/console/stand-alone/plugin/js/qdrService.js
+++ b/console/stand-alone/plugin/js/qdrService.js
@@ -712,9 +712,11 @@ var QDR = (function(QDR) {
var application_properties = {
opera
qpid-jms git commit: QPIDJMS-202 Updates proton-j to latest 0.14.0
Repository: qpid-jms Updated Branches: refs/heads/master 07395e95d -> af831b8b0 QPIDJMS-202 Updates proton-j to latest 0.14.0 Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/af831b8b Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/af831b8b Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/af831b8b Branch: refs/heads/master Commit: af831b8b0d22cfe006767e26d8d9a4c0ad7ffb7d Parents: 07395e9 Author: Timothy Bish Authored: Tue Aug 30 10:00:02 2016 -0400 Committer: Timothy Bish Committed: Tue Aug 30 10:00:02 2016 -0400 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/af831b8b/pom.xml -- diff --git a/pom.xml b/pom.xml index 7a7d695..0ce92b7 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ 1.7 -0.13.1 +0.14.0 4.0.40.Final 1.7.21 1.1.1 - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1758395 - in /qpid/java/trunk: broker-core/src/main/java/org/apache/qpid/server/queue/ broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/
Author: kwall
Date: Tue Aug 30 14:18:35 2016
New Revision: 1758395
URL: http://svn.apache.org/viewvc?rev=1758395&view=rev
Log:
QPID-7408: [Java Broker] Stream compressed message content with a
Content-Encoding HTTP header
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showMessage.html
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java?rev=1758395&r1=1758394&r2=1758395&view=diff
==
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
Tue Aug 30 14:18:35 2016
@@ -2725,6 +2725,12 @@ public abstract class AbstractQueuehttp://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java?rev=1758395&r1=1758394&r2=1758395&view=diff
==
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java
Tue Aug 30 14:18:35 2016
@@ -348,7 +348,11 @@ public abstract class AbstractServlet ex
final String headerName = entry.getKey().value();
try
{
-response.setHeader(headerName,
String.valueOf(entry.getValue().invoke(customRestHeaders)));
+final Object headerValue =
entry.getValue().invoke(customRestHeaders);
+if (headerValue != null)
+{
+response.setHeader(headerName,
String.valueOf(headerValue));
+}
}
catch (Exception e)
{
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showMessage.html
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showMessage.html?rev=1758395&r1=1758394&r2=1758395&view=diff
==
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showMessage.html
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showMessage.html
Tue Aug 30 14:18:35 2016
@@ -64,6 +64,10 @@
+Encoding:
+
+
+
User:
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1758397 - in /qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server: model/ model/adapter/ model/port/ queue/ security/auth/manager/
Author: lquack
Date: Tue Aug 30 14:27:14 2016
New Revision: 1758397
URL: http://svn.apache.org/viewvc?rev=1758397&view=rev
Log:
QPID-7401: [Java Broker] Ensure ACO#getContextValue() is only called after the
model has been resolved
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractContainer.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PlainAuthenticationProvider.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java?rev=1758397&r1=1758396&r2=1758397&view=diff
==
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
Tue Aug 30 14:27:14 2016
@@ -3114,6 +3114,16 @@ public abstract class AbstractConfigured
return null;
}
+/**
+ * Retrieve and interpolate a context variable of the given name and
convert it to the given type.
+ *
+ * Note that this SHOULD not be called before the model has been resolved
(e.g., not in the constructor).
+ * @param the type the interpolated context variable should be
converted to
+ * @param clazz the class object of the type the interpolated context
variable should be converted to
+ * @param propertyName the name of the context variable to retrieve
+ * @return the interpolated context variable converted to an object of the
given type
+ * @throws IllegalArgumentException if the interpolated context variable
cannot be converted to the given type
+ */
@Override
public final T getContextValue(Class clazz, String propertyName)
{
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractContainer.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractContainer.java?rev=1758397&r1=1758396&r2=1758397&view=diff
==
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractContainer.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractContainer.java
Tue Aug 30 14:27:14 2016
@@ -99,14 +99,22 @@ public abstract class AbstractContainer<
_bufferPoolMXBean = bufferPoolMXBean;
if(attributes.get(CONFIDENTIAL_CONFIGURATION_ENCRYPTION_PROVIDER) !=
null )
{
-
-final String encryptionProviderType =
String.valueOf(attributes.get(CONFIDENTIAL_CONFIGURATION_ENCRYPTION_PROVIDER));
-updateEncrypter(encryptionProviderType);
-_confidentialConfigurationEncryptionProvider =
encryptionProviderType;
+_confidentialConfigurationEncryptionProvider =
+
String.valueOf(attributes.get(CONFIDENTIAL_CONFIGURATION_ENCRYPTION_PROVIDER));
}
}
+@Override
+protected void postResolveChildren()
+{
+super.postResolveChildren();
+if (_confidentialConfigurationEncryptionProvider != null)
+{
+updateEncrypter(_confidentialConfigurationEncryptionProvider);
+}
+}
+
@SuppressWarnings("unused")
public static Collection getAvailableConfigurationEncrypters()
{
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java?rev=1758397&r1=1758396&r2=1758397&view=diff
==
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java
Tue Aug 30 14:27:14 2016
@@ -60,11 +60,13 @@ public final class SessionAdapter extend
// Attributes
private final AMQSessionModel _session;
private final Action _deleteModelTask;
+private final AbstractAMQPConnection _amqpConnec
qpid-jms git commit: QPIDJMS-203 Update to Netty 4.0.41.Final
Repository: qpid-jms Updated Branches: refs/heads/master af831b8b0 -> 651ccfe1e QPIDJMS-203 Update to Netty 4.0.41.Final Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/651ccfe1 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/651ccfe1 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/651ccfe1 Branch: refs/heads/master Commit: 651ccfe1eaa9bbbcac48c9eabc0d964fec92f8db Parents: af831b8 Author: Timothy Bish Authored: Tue Aug 30 10:37:21 2016 -0400 Committer: Timothy Bish Committed: Tue Aug 30 10:37:21 2016 -0400 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/651ccfe1/pom.xml -- diff --git a/pom.xml b/pom.xml index 0ce92b7..0fc64ba 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ 0.14.0 -4.0.40.Final +4.0.41.Final 1.7.21 1.1.1 - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
qpid-jms git commit: QPIDJMS-204 Add some extra logging to try and capture what is failing.
Repository: qpid-jms
Updated Branches:
refs/heads/master 651ccfe1e -> 9e9923359
QPIDJMS-204 Add some extra logging to try and capture what is failing.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/9e992335
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/9e992335
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/9e992335
Branch: refs/heads/master
Commit: 9e9923359aa19f98e902a3c9f7b3d69ce469cf60
Parents: 651ccfe
Author: Timothy Bish
Authored: Tue Aug 30 12:39:59 2016 -0400
Committer: Timothy Bish
Committed: Tue Aug 30 12:39:59 2016 -0400
--
.../jms/integration/ProducerIntegrationTest.java | 17 ++---
1 file changed, 10 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9e992335/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ProducerIntegrationTest.java
--
diff --git
a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ProducerIntegrationTest.java
b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ProducerIntegrationTest.java
index 5f11da8..d16c713 100644
---
a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ProducerIntegrationTest.java
+++
b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ProducerIntegrationTest.java
@@ -936,15 +936,18 @@ public class ProducerIntegrationTest extends
QpidJmsTestCase {
public boolean isSatisified() throws Exception {
try {
producer.getDestination();
-} catch (IllegalStateException jmsise) {
-if (jmsise.getCause() != null) {
-String message = jmsise.getCause().getMessage();
-return
message.contains(AmqpError.RESOURCE_DELETED.toString()) &&
- message.contains(BREAD_CRUMB);
-} else {
-return false;
+} catch (Exception ex) {
+if (ex instanceof IllegalStateException &&
ex.getCause() != null) {
+String message = ex.getCause().getMessage();
+if
(message.contains(AmqpError.RESOURCE_DELETED.toString()) &&
+message.contains(BREAD_CRUMB)) {
+return true;
+}
}
+
+LOG.debug("Caught unexpected exception: {}", ex);
}
+
return false;
}
}, 1, 10));
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
qpid-dispatch git commit: DISPATCH-490 Add logs to overview page
Repository: qpid-dispatch
Updated Branches:
refs/heads/master a92102543 -> 39afec9c1
DISPATCH-490 Add logs to overview page
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/39afec9c
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/39afec9c
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/39afec9c
Branch: refs/heads/master
Commit: 39afec9c143fa5662fee4d6035c6c46f43e0e649
Parents: a921025
Author: Ernest Allen
Authored: Tue Aug 30 18:33:13 2016 -0400
Committer: Ernest Allen
Committed: Tue Aug 30 18:33:13 2016 -0400
--
console/stand-alone/plugin/css/plugin.css | 3 +
console/stand-alone/plugin/css/site-base.css| 18 +--
console/stand-alone/plugin/html/qdrList.html| 2 +-
.../stand-alone/plugin/html/qdrOverview.html| 32 -
console/stand-alone/plugin/js/qdrOverview.js| 124 +++
5 files changed, 135 insertions(+), 44 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/39afec9c/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 fa239dd..a88bd50 100644
--- a/console/stand-alone/plugin/css/plugin.css
+++ b/console/stand-alone/plugin/css/plugin.css
@@ -282,6 +282,9 @@ div.qdr-attributes.pane, div.qdr-topology.pane {
position: absolute;
margin-left: 10px;
}
+div.qdr-overview.pane {
+ position: absolute;
+}
div.qdr-topology.pane.left {
width: auto;
}
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/39afec9c/console/stand-alone/plugin/css/site-base.css
--
diff --git a/console/stand-alone/plugin/css/site-base.css
b/console/stand-alone/plugin/css/site-base.css
index 81619a6..1a89758 100644
--- a/console/stand-alone/plugin/css/site-base.css
+++ b/console/stand-alone/plugin/css/site-base.css
@@ -4277,11 +4277,11 @@ ul.dynatree-container {
}
.pane {
- position: absolute;
- bottom: 0;
- top: 100px;
- height: auto;
- width: 300px;
+ position: absolute;
+bottom: 0;
+top: 70px;
+height: auto;
+width: 300px;
}
.pane > .pane-wrapper {
@@ -4641,14 +4641,6 @@ div.treeContainer ul.dynatree-container {
border: 0px;
}
-.pane {
-position: fixed;
-bottom: 0;
-top: 70px;
-height: auto;
-width: 300px;
-}
-
.pane>.pane-wrapper {
position: relative;
height: 100%;
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/39afec9c/console/stand-alone/plugin/html/qdrList.html
--
diff --git a/console/stand-alone/plugin/html/qdrList.html
b/console/stand-alone/plugin/html/qdrList.html
index 0033675..e6f0d3c 100644
--- a/console/stand-alone/plugin/html/qdrList.html
+++ b/console/stand-alone/plugin/html/qdrList.html
@@ -34,7 +34,7 @@ under the License.
Delete {{selectedRecordName}}
-There are no {{selectedEntity}}s
+There are no {{selectedEntity | safePlural}}
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/39afec9c/console/stand-alone/plugin/html/qdrOverview.html
--
diff --git a/console/stand-alone/plugin/html/qdrOverview.html
b/console/stand-alone/plugin/html/qdrOverview.html
index a2430f0..fb10f31 100644
--- a/console/stand-alone/plugin/html/qdrOverview.html
+++ b/console/stand-alone/plugin/html/qdrOverview.html
@@ -87,10 +87,10 @@ under the License.
-Connections
-
-
-
+Connections
+
+
+
@@ -122,12 +122,32 @@ under the License.
-Logs
+Recent log entries
+
+
+
-Log {{log.data.title}}
+{{log.data.title}}
+
+
+
+Router {{entry.nodeId}}
+
+
+{{entry.time}}
+
+
+
