qpid-proton git commit: PROTON-1752: Update library versions after ABI review

2018-02-22 Thread jross 
Repository: qpid-proton
Updated Branches:
  refs/heads/master 5237ea7c6 -> bbc83aaf0


PROTON-1752: Update library versions after ABI review


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/bbc83aaf
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/bbc83aaf
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/bbc83aaf

Branch: refs/heads/master
Commit: bbc83aaf03521db9c4d3da896ca5be7810264643
Parents: 5237ea7
Author: Justin Ross 
Authored: Thu Feb 22 05:31:39 2018 -0800
Committer: Justin Ross 
Committed: Thu Feb 22 05:31:39 2018 -0800

--
 proton-c/versions.cmake | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/bbc83aaf/proton-c/versions.cmake
--
diff --git a/proton-c/versions.cmake b/proton-c/versions.cmake
index 6929805..e086bb4 100644
--- a/proton-c/versions.cmake
+++ b/proton-c/versions.cmake
@@ -1,19 +1,19 @@
 set(PN_LIB_CORE_MAJOR_VERSION 10)
-set(PN_LIB_CORE_MINOR_VERSION 2)
-set(PN_LIB_CORE_PATCH_VERSION 1)
+set(PN_LIB_CORE_MINOR_VERSION 3)
+set(PN_LIB_CORE_PATCH_VERSION 0)
 set(PN_LIB_CORE_VERSION 
"${PN_LIB_CORE_MAJOR_VERSION}.${PN_LIB_CORE_MINOR_VERSION}.${PN_LIB_CORE_PATCH_VERSION}")
 
 set(PN_LIB_PROACTOR_MAJOR_VERSION 1)
 set(PN_LIB_PROACTOR_MINOR_VERSION 2)
-set(PN_LIB_PROACTOR_PATCH_VERSION 0)
+set(PN_LIB_PROACTOR_PATCH_VERSION 1)
 set(PN_LIB_PROACTOR_VERSION 
"${PN_LIB_PROACTOR_MAJOR_VERSION}.${PN_LIB_PROACTOR_MINOR_VERSION}.${PN_LIB_PROACTOR_PATCH_VERSION}")
 
 set(PN_LIB_LEGACY_MAJOR_VERSION 11)
-set(PN_LIB_LEGACY_MINOR_VERSION 2)
+set(PN_LIB_LEGACY_MINOR_VERSION 3)
 set(PN_LIB_LEGACY_PATCH_VERSION 0)
 set(PN_LIB_LEGACY_VERSION 
"${PN_LIB_LEGACY_MAJOR_VERSION}.${PN_LIB_LEGACY_MINOR_VERSION}.${PN_LIB_LEGACY_PATCH_VERSION}")
 
 set(PN_LIB_CPP_MAJOR_VERSION 11)
 set(PN_LIB_CPP_MINOR_VERSION 2)
-set(PN_LIB_CPP_PATCH_VERSION 0)
+set(PN_LIB_CPP_PATCH_VERSION 1)
 set(PN_LIB_CPP_VERSION 
"${PN_LIB_CPP_MAJOR_VERSION}.${PN_LIB_CPP_MINOR_VERSION}.${PN_LIB_CPP_PATCH_VERSION}")


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

qpid-broker-j git commit: QPID-8106: [Broker-J] No longer require a active destination when reuniting queue/exchanges with their alternate binding

2018-02-22 Thread orudyy 
Repository: qpid-broker-j
Updated Branches:
  refs/heads/7.0.x 229b7e549 -> de8098430


QPID-8106: [Broker-J] No longer require a active destination when reuniting 
queue/exchanges with their alternate binding

(cherry picked from commit 1dbdd321351400b466b1a23cb5efb8df55e1ab00)


Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/de809843
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/de809843
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/de809843

Branch: refs/heads/7.0.x
Commit: de8098430974db2cb1fd31c4044dec25eb6fd108
Parents: 229b7e5
Author: Keith Wall 
Authored: Wed Feb 21 17:03:04 2018 +
Committer: Alex Rudyy 
Committed: Thu Feb 22 11:29:55 2018 +

--
 .../java/org/apache/qpid/server/exchange/AbstractExchange.java | 2 +-
 .../src/main/java/org/apache/qpid/server/queue/AbstractQueue.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/de809843/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
 
b/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
index 6227384..6e2c723 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
@@ -528,7 +528,7 @@ public abstract class AbstractExchange>
 {
 if(_alternateBinding != null)
 {
-_alternateBindingDestination = 
_virtualHost.getAttainedMessageDestination(_alternateBinding.getDestination(), 
false);
+_alternateBindingDestination = 
getOpenedMessageDestination(_alternateBinding.getDestination());
 if (_alternateBindingDestination != null)
 {
 _alternateBindingDestination.addReference(this);

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/de809843/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java 
b/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
index 09ec51c..84007cf 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
@@ -683,7 +683,7 @@ public abstract class AbstractQueue>
 {
 if(_alternateBinding != null)
 {
-_alternateBindingDestination = 
_virtualHost.getAttainedMessageDestination(_alternateBinding.getDestination(), 
false);
+_alternateBindingDestination = 
getOpenedMessageDestination(_alternateBinding.getDestination());
 if (_alternateBindingDestination != null)
 {
 _alternateBindingDestination.addReference(this);


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

qpid-jms git commit: QPIDJMS-2: testing bot, ignore

2018-02-22 Thread robbie 
Repository: qpid-jms
Updated Branches:
  refs/heads/master bae5af7a4 -> 50c011136


QPIDJMS-2: testing bot, ignore


Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/50c01113
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/50c01113
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/50c01113

Branch: refs/heads/master
Commit: 50c0111360fc4cdfa7b42cbd3c11239c4157c0cc
Parents: bae5af7
Author: Robbie Gemmell 
Authored: Thu Feb 22 12:15:38 2018 +
Committer: Robbie Gemmell 
Committed: Thu Feb 22 12:15:38 2018 +

--
 README.md | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/50c01113/README.md
--
diff --git a/README.md b/README.md
index f79c57a..2077ec7 100644
--- a/README.md
+++ b/README.md
@@ -41,3 +41,4 @@ There is some basic documentation in the qpid-jms-docs module.
 After building the modules, src and binary distribution assemblies can be 
found at:
 
 apache-qpid-jms/target
+


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

qpid-broker-j git commit: QPID-8101: [Broker-J] [WMC] Add ability to close more than one connection at once

2018-02-22 Thread orudyy 
Repository: qpid-broker-j
Updated Branches:
  refs/heads/7.0.x de8098430 -> 969f7a3c6


QPID-8101: [Broker-J] [WMC] Add ability to close more than one connection at 
once

(cherry picked from commit fbca8f16e36d84fc0fc3291ca9937b31ed8a73a4)


Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/969f7a3c
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/969f7a3c
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/969f7a3c

Branch: refs/heads/7.0.x
Commit: 969f7a3c64556a5adbdf74b6564358a51ebe3009
Parents: de80984
Author: Keith Wall 
Authored: Tue Feb 20 12:33:29 2018 +
Committer: Alex Rudyy 
Committed: Thu Feb 22 12:15:07 2018 +

--
 .../src/main/java/resources/css/common.css  |  3 +-
 .../resources/js/qpid/management/VirtualHost.js | 52 +---
 .../main/java/resources/showVirtualHost.html|  1 +
 3 files changed, 38 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/969f7a3c/broker-plugins/management-http/src/main/java/resources/css/common.css
--
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 bc92699..cac53f6 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
@@ -522,7 +522,8 @@ td.advancedSearchField, col.autoWidth {
 
 .claro.qpid .dgrid-header .dgrid-cell { font-weight: normal; }
 
-.virtualHostConnections .field-name { width: 20%; }
+.virtualHostConnections .field-selected { width: 2em; }
+.virtualHostConnections .field-name { width: auto; }
 .virtualHostConnections .field-principal { width: 10% }
 .virtualHostConnections .field-port { width: 10% }
 .virtualHostConnections .field-transport { width: 10% }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/969f7a3c/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
--
diff --git 
a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
 
b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
index 11fc134..dd7a2fc 100644
--- 
a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
+++ 
b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
@@ -89,7 +89,9 @@ define(["dojo/parser",
 var deleteQueueButton = query(".deleteQueueButton", 
containerNode)[0];
 registry.byNode(deleteQueueButton).on("click", function 
(evt)
 {
-
that._deleteSelectedItems(that.vhostUpdater.queuesGrid, "queue", "queue");
+that._deleteSelectedItems(that.vhostUpdater.queuesGrid,
+  {type: "queue", parent: 
this.modelObj},
+  "delete", "queue");
 });
 
 var addExchangeButton = query(".addExchangeButton", 
containerNode)[0];
@@ -101,7 +103,17 @@ define(["dojo/parser",
 var deleteExchangeButton = query(".deleteExchangeButton", 
containerNode)[0];
 registry.byNode(deleteExchangeButton).on("click", function 
(evt)
 {
-
that._deleteSelectedItems(that.vhostUpdater.exchangesGrid, "exchange", 
"exchange");
+
that._deleteSelectedItems(that.vhostUpdater.exchangesGrid,
+ {type: "exchange", parent: 
that.modelObj},
+ "delete", "exchange");
+});
+
+var closeConnectionButton = 
query(".closeConnectionButton", containerNode)[0];
+registry.byNode(closeConnectionButton).on("click", 
function (evt)
+{
+
that._deleteSelectedItems(that.vhostUpdater.connectionsGrid,
+  {type: "connection"},
+  "close", "connection");
 });
 
 var addLoggerButtonNode = query(".addVirtualHostLogger", 
contentPane.containerNode)[0];
@@ -115,7 +127,9 @@ define(["dojo/parser",
 var deleteLoggerButton = 
registry.byNode(deleteLoggerButtonNode);
 deleteLoggerButton.on("click", function (evt)
 {
-

qpid-proton-j git commit: [maven-release-plugin] prepare for next development iteration

2018-02-22 Thread robbie 
Repository: qpid-proton-j
Updated Branches:
  refs/heads/master 3af4d553a -> 45bdc03dc


[maven-release-plugin] prepare for next development iteration


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/commit/45bdc03d
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/tree/45bdc03d
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/diff/45bdc03d

Branch: refs/heads/master
Commit: 45bdc03dc4640936e17331532238bd070a3134e9
Parents: 3af4d55
Author: Robbie Gemmell 
Authored: Thu Feb 22 17:57:10 2018 +
Committer: Robbie Gemmell 
Committed: Thu Feb 22 17:57:10 2018 +

--
 apache-qpid-proton-j/pom.xml  | 2 +-
 examples/engine/pom.xml   | 2 +-
 examples/reactor/pom.xml  | 2 +-
 pom.xml   | 4 ++--
 proton-j/pom.xml  | 2 +-
 tests/performance-jmh/pom.xml | 2 +-
 tests/pom.xml | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/45bdc03d/apache-qpid-proton-j/pom.xml
--
diff --git a/apache-qpid-proton-j/pom.xml b/apache-qpid-proton-j/pom.xml
index 097d92b..9a3048c 100644
--- a/apache-qpid-proton-j/pom.xml
+++ b/apache-qpid-proton-j/pom.xml
@@ -18,7 +18,7 @@
   
 org.apache.qpid
 proton-j-parent
-0.26.0
+0.27.0-SNAPSHOT
 ../pom.xml
   
   4.0.0

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/45bdc03d/examples/engine/pom.xml
--
diff --git a/examples/engine/pom.xml b/examples/engine/pom.xml
index c963bed..b06cb78 100644
--- a/examples/engine/pom.xml
+++ b/examples/engine/pom.xml
@@ -19,7 +19,7 @@
   
 org.apache.qpid
 proton-j-parent
-0.26.0
+0.27.0-SNAPSHOT
 ../../pom.xml
   
   4.0.0

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/45bdc03d/examples/reactor/pom.xml
--
diff --git a/examples/reactor/pom.xml b/examples/reactor/pom.xml
index b385eef..9560b5c 100644
--- a/examples/reactor/pom.xml
+++ b/examples/reactor/pom.xml
@@ -19,7 +19,7 @@
   
 org.apache.qpid
 proton-j-parent
-0.26.0
+0.27.0-SNAPSHOT
 ../../pom.xml
   
   4.0.0

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/45bdc03d/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 77aff88..ba6869b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 
   org.apache.qpid
   proton-j-parent
-  0.26.0
+  0.27.0-SNAPSHOT
   pom
 
   Proton-J Parent
@@ -171,7 +171,7 @@
 
scm:git:http://git-wip-us.apache.org/repos/asf/qpid-proton-j.git
 
scm:git:https://git-wip-us.apache.org/repos/asf/qpid-proton-j.git
 https://git-wip-us.apache.org/repos/asf?p=qpid-proton-j.git
-0.26.0
+HEAD
   
   
 https://issues.apache.org/jira/browse/PROTON

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/45bdc03d/proton-j/pom.xml
--
diff --git a/proton-j/pom.xml b/proton-j/pom.xml
index 5806bd7..245362a 100644
--- a/proton-j/pom.xml
+++ b/proton-j/pom.xml
@@ -19,7 +19,7 @@
   
 org.apache.qpid
 proton-j-parent
-0.26.0
+0.27.0-SNAPSHOT
   
   4.0.0
 

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/45bdc03d/tests/performance-jmh/pom.xml
--
diff --git a/tests/performance-jmh/pom.xml b/tests/performance-jmh/pom.xml
index 4f28c8e..d9f3c74 100644
--- a/tests/performance-jmh/pom.xml
+++ b/tests/performance-jmh/pom.xml
@@ -19,7 +19,7 @@
 
 org.apache.qpid
 proton-j-parent
-0.26.0
+0.27.0-SNAPSHOT
 ../../pom.xml
 
 4.0.0

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/45bdc03d/tests/pom.xml
--
diff --git a/tests/pom.xml b/tests/pom.xml
index 5874dc1..52f1ec6 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -23,7 +23,7 @@
   
 org.apache.qpid
 proton-j-parent
-0.26.0
+0.27.0-SNAPSHOT
   
 
   proton-tests


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

qpid-dispatch git commit: DISPATCH-931: update dockerfiles with new dependency and fix syntax error. This closes #260

2018-02-22 Thread gmurthy 
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master 17679d964 -> f0b2e52ea


DISPATCH-931: update dockerfiles with new dependency and fix syntax error. This 
closes #260


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/f0b2e52e
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/f0b2e52e
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/f0b2e52e

Branch: refs/heads/master
Commit: f0b2e52eafeb8a46397acf8fb5bc2f48342b88ba
Parents: 17679d9
Author: Kenneth Giusti 
Authored: Thu Feb 22 10:34:04 2018 -0500
Committer: Ganesh Murthy 
Committed: Thu Feb 22 12:00:26 2018 -0500

--
 dockerfiles/Dockerfile-fedora |  2 +-
 dockerfiles/Dockerfile-ubuntu | 14 +-
 2 files changed, 10 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/f0b2e52e/dockerfiles/Dockerfile-fedora
--
diff --git a/dockerfiles/Dockerfile-fedora b/dockerfiles/Dockerfile-fedora
index 179ea13..2f23e75 100644
--- a/dockerfiles/Dockerfile-fedora
+++ b/dockerfiles/Dockerfile-fedora
@@ -30,7 +30,7 @@ FROM fedora:latest
 MAINTAINER "d...@qpid.apache.org"
 
 # Install all the required packages. Some in this list were picked off from 
proton's INSTALL.md 
(https://github.com/apache/qpid-proton/blob/master/INSTALL.md) and the rest are 
from dispatch (https://github.com/apache/qpid-dispatch/blob/master/README)
-RUN dnf -y install gcc cmake libuuid-devel openssl-devel cyrus-sasl-devel 
cyrus-sasl-plain cyrus-sasl-gssapi cyrus-sasl-md5 swig python-devel 
java-1.8.0-openjdk-devel git make doxygen valgrind emacs libuv libuv-devel 
libwebsockets-devel
+RUN dnf -y install gcc cmake libuuid-devel openssl-devel cyrus-sasl-devel 
cyrus-sasl-plain cyrus-sasl-gssapi cyrus-sasl-md5 swig python-devel 
java-1.8.0-openjdk-devel git make doxygen valgrind emacs libuv libuv-devel 
libwebsockets-devel python-unittest2 && dnf clean all -y
 
 # Create a main directory and clone the qpid-proton repo from github
 RUN mkdir /main && cd /main && git clone 
https://git-wip-us.apache.org/repos/asf/qpid-proton.git  && cd 
/main/qpid-proton && mkdir /main/qpid-proton/build

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/f0b2e52e/dockerfiles/Dockerfile-ubuntu
--
diff --git a/dockerfiles/Dockerfile-ubuntu b/dockerfiles/Dockerfile-ubuntu
index 9cc8b9b..efe0ff9 100644
--- a/dockerfiles/Dockerfile-ubuntu
+++ b/dockerfiles/Dockerfile-ubuntu
@@ -25,8 +25,9 @@ FROM ubuntu:latest
 MAINTAINER "d...@qpid.apache.org"
 
 # Install all the required packages. Some in this list were picked off from 
proton's INSTALL.md 
(https://github.com/apache/qpid-proton/blob/master/INSTALL.md) and the rest are 
from dispatch (https://github.com/apache/qpid-dispatch/blob/master/README)
-RUN apt-get update
-RUN apt-get -y install automake libtool cmake libsasl2-dev libssl-dev python 
python-dev libuv1-dev sasl2-bin swig maven git
+RUN apt-get update && \
+apt-get install -y automake libtool cmake libsasl2-dev libssl-dev python 
python-dev libuv1-dev sasl2-bin swig maven git python-unittest2 && \
+apt-get -y clean
 
 RUN git clone https://git-wip-us.apache.org/repos/asf/qpid-dispatch.git && cd 
/qpid-dispatch && git submodule add -b v2.1-stable 
https://github.com/warmcat/libwebsockets && git submodule add 
https://git-wip-us.apache.org/repos/asf/qpid-proton.git && git submodule update 
--init
 
@@ -40,13 +41,16 @@ RUN mkdir qpid-proton/build && cd qpid-proton/build && 
cmake .. -DSYSINSTALL_BIN
 
 WORKDIR /qpid-dispatch
 
-RUN /bin/bash -c "mkdir build && cd build && cmake .. 
-DCMAKE_INSTALL_PREFIX=/usr -DUSE_VALGRIND=NO && cmake --build . --target 
install && cd /qpid-dispatch/build && ctest -VV"
+RUN mkdir build && cd build && cmake .. -DCMAKE_INSTALL_PREFIX=/usr 
-DUSE_VALGRIND=NO && cmake --build . --target install
 
--# Add site-packages to the PYTHONPATH environment variable. This is because 
Ubuntu does not list the site-packages folder in the sys.path
+# Add site-packages to the PYTHONPATH environment variable. This is because 
Ubuntu does not list the site-packages folder in the sys.path
 ENV PYTHONPATH=/usr/lib/python2.7/site-packages
 
+# Uncomment the following line if you would like to run all the dispatch unit 
tests and system tests. 
+#RUN cd /qpid-dispatch/build && ctest -VV
+
 WORKDIR /qpid-dispatch
 
 # Start the dispatch router
 CMD ["qdrouterd"]
-#CMD ["/bin/bash"]
\ No newline at end of file
+#CMD ["/bin/bash"]


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail:

qpid-proton-j git commit: PROTON-1767 Allow for the sasl buffer to use a duplicate

2018-02-22 Thread tabish 
Repository: qpid-proton-j
Updated Branches:
  refs/heads/master e7aae9469 -> ca492f66a


PROTON-1767 Allow for the sasl buffer to use a duplicate

Adds support in the SaslImpl for also exposing a duplicate buffer
instead of a read-only variant.

Project: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/commit/ca492f66
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/tree/ca492f66
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/diff/ca492f66

Branch: refs/heads/master
Commit: ca492f66ab9653afcdd1d0904b359e27a362859d
Parents: e7aae94
Author: Timothy Bish 
Authored: Thu Feb 22 11:57:10 2018 -0500
Committer: Timothy Bish 
Committed: Thu Feb 22 11:57:10 2018 -0500

--
 .../java/org/apache/qpid/proton/engine/impl/SaslImpl.java| 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/ca492f66/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java
--
diff --git 
a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java 
b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java
index acbf5ea..9125625 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java
@@ -551,7 +551,13 @@ public class SaslImpl implements Sasl, 
SaslFrameBody.SaslFrameBodyHandler,
 {
 _underlyingInput = input;
 _underlyingOutput = output;
-_head = _outputBuffer.asReadOnlyBuffer();
+
+if (_transport.isUseReadOnlyOutputBuffer()) {
+_head = _outputBuffer.asReadOnlyBuffer();
+} else {
+_head = _outputBuffer.duplicate();
+}
+
 _head.limit(0);
 }
 


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

qpid-broker-j git commit: QPID-8104: [Broker-J] [Query] Support the use of aliases in order by clauses

2018-02-22 Thread kwall 
Repository: qpid-broker-j
Updated Branches:
  refs/heads/master 0fe98f847 -> 9704e609d


QPID-8104: [Broker-J] [Query] Support the use of aliases in order by clauses


Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/9704e609
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/9704e609
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/9704e609

Branch: refs/heads/master
Commit: 9704e609db36102d40d074a866799d0fe3930ffa
Parents: 0fe98f8
Author: Keith Wall 
Authored: Wed Feb 21 22:19:56 2018 +
Committer: Keith Wall 
Committed: Thu Feb 22 15:20:01 2018 +

--
 .../qpid/server/filter/NamedExpression.java | 26 ++
 .../qpid/server/filter/OrderByExpression.java   | 10 +++
 .../grammar/ConfiguredObjectFilterParser.jj |  1 +
 .../ConfiguredObjectExpressionFactory.java  |  1 +
 .../query/ConfiguredObjectFilterParser.java |  1 +
 .../servlet/query/ConfiguredObjectQuery.java| 41 --
 .../plugin/servlet/query/NamedExpression.java   | 28 ---
 .../query/ConfiguredObjectQueryTest.java| 85 +++-
 8 files changed, 136 insertions(+), 57 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/9704e609/broker-core/src/main/java/org/apache/qpid/server/filter/NamedExpression.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/filter/NamedExpression.java 
b/broker-core/src/main/java/org/apache/qpid/server/filter/NamedExpression.java
new file mode 100644
index 000..9970f89
--- /dev/null
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/filter/NamedExpression.java
@@ -0,0 +1,26 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.server.filter;
+
+public interface NamedExpression extends Expression
+{
+String getName();
+}

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/9704e609/broker-core/src/main/java/org/apache/qpid/server/filter/OrderByExpression.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/filter/OrderByExpression.java
 
b/broker-core/src/main/java/org/apache/qpid/server/filter/OrderByExpression.java
index 87d45d1..20120dc 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/filter/OrderByExpression.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/filter/OrderByExpression.java
@@ -58,4 +58,14 @@ public class OrderByExpression implements Expression
 {
 return 
((Number)((ConstantExpression)_expression).getValue()).intValue();
 }
+
+public boolean isNamed()
+{
+return (_expression instanceof NamedExpression);
+}
+
+public String getName()
+{
+return ((NamedExpression) _expression).getName();
+}
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/9704e609/broker-plugins/management-http/src/main/grammar/ConfiguredObjectFilterParser.jj
--
diff --git 
a/broker-plugins/management-http/src/main/grammar/ConfiguredObjectFilterParser.jj
 
b/broker-plugins/management-http/src/main/grammar/ConfiguredObjectFilterParser.jj
index be1aafb..d8e7536 100644
--- 
a/broker-plugins/management-http/src/main/grammar/ConfiguredObjectFilterParser.jj
+++ 
b/broker-plugins/management-http/src/main/grammar/ConfiguredObjectFilterParser.jj
@@ -77,6 +77,7 @@ import org.apache.qpid.filter.Expression;
 import org.apache.qpid.filter.OrderByExpression;
 import org.apache.qpid.filter.LogicExpression;
 import org.apache.qpid.filter.UnaryExpression;
+import org.apache.qpid.filter.NamedExpression;
 
 import org.apache.qpid.server.model.ConfiguredObject;

qpid-proton-j git commit: [maven-release-plugin] prepare release 0.26.0

2018-02-22 Thread robbie 
Repository: qpid-proton-j
Updated Branches:
  refs/heads/master ca492f66a -> 3af4d553a


[maven-release-plugin] prepare release 0.26.0


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/commit/3af4d553
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/tree/3af4d553
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/diff/3af4d553

Branch: refs/heads/master
Commit: 3af4d553ab8f039668831a209b5801a7e66e4ae3
Parents: ca492f6
Author: Robbie Gemmell 
Authored: Thu Feb 22 17:56:02 2018 +
Committer: Robbie Gemmell 
Committed: Thu Feb 22 17:56:02 2018 +

--
 apache-qpid-proton-j/pom.xml  | 2 +-
 examples/engine/pom.xml   | 2 +-
 examples/reactor/pom.xml  | 2 +-
 pom.xml   | 4 ++--
 proton-j/pom.xml  | 2 +-
 tests/performance-jmh/pom.xml | 2 +-
 tests/pom.xml | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/3af4d553/apache-qpid-proton-j/pom.xml
--
diff --git a/apache-qpid-proton-j/pom.xml b/apache-qpid-proton-j/pom.xml
index ffecdf5..097d92b 100644
--- a/apache-qpid-proton-j/pom.xml
+++ b/apache-qpid-proton-j/pom.xml
@@ -18,7 +18,7 @@
   
 org.apache.qpid
 proton-j-parent
-0.26.0-SNAPSHOT
+0.26.0
 ../pom.xml
   
   4.0.0

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/3af4d553/examples/engine/pom.xml
--
diff --git a/examples/engine/pom.xml b/examples/engine/pom.xml
index a5dd228..c963bed 100644
--- a/examples/engine/pom.xml
+++ b/examples/engine/pom.xml
@@ -19,7 +19,7 @@
   
 org.apache.qpid
 proton-j-parent
-0.26.0-SNAPSHOT
+0.26.0
 ../../pom.xml
   
   4.0.0

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/3af4d553/examples/reactor/pom.xml
--
diff --git a/examples/reactor/pom.xml b/examples/reactor/pom.xml
index d742b28..b385eef 100644
--- a/examples/reactor/pom.xml
+++ b/examples/reactor/pom.xml
@@ -19,7 +19,7 @@
   
 org.apache.qpid
 proton-j-parent
-0.26.0-SNAPSHOT
+0.26.0
 ../../pom.xml
   
   4.0.0

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/3af4d553/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 6e6b390..77aff88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 
   org.apache.qpid
   proton-j-parent
-  0.26.0-SNAPSHOT
+  0.26.0
   pom
 
   Proton-J Parent
@@ -171,7 +171,7 @@
 
scm:git:http://git-wip-us.apache.org/repos/asf/qpid-proton-j.git
 
scm:git:https://git-wip-us.apache.org/repos/asf/qpid-proton-j.git
 https://git-wip-us.apache.org/repos/asf?p=qpid-proton-j.git
-HEAD
+0.26.0
   
   
 https://issues.apache.org/jira/browse/PROTON

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/3af4d553/proton-j/pom.xml
--
diff --git a/proton-j/pom.xml b/proton-j/pom.xml
index 5d88e90..5806bd7 100644
--- a/proton-j/pom.xml
+++ b/proton-j/pom.xml
@@ -19,7 +19,7 @@
   
 org.apache.qpid
 proton-j-parent
-0.26.0-SNAPSHOT
+0.26.0
   
   4.0.0
 

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/3af4d553/tests/performance-jmh/pom.xml
--
diff --git a/tests/performance-jmh/pom.xml b/tests/performance-jmh/pom.xml
index 9a3515f..4f28c8e 100644
--- a/tests/performance-jmh/pom.xml
+++ b/tests/performance-jmh/pom.xml
@@ -19,7 +19,7 @@
 
 org.apache.qpid
 proton-j-parent
-0.26.0-SNAPSHOT
+0.26.0
 ../../pom.xml
 
 4.0.0

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/3af4d553/tests/pom.xml
--
diff --git a/tests/pom.xml b/tests/pom.xml
index 623d88d..5874dc1 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -23,7 +23,7 @@
   
 org.apache.qpid
 proton-j-parent
-0.26.0-SNAPSHOT
+0.26.0
   
 
   proton-tests


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

[qpid-proton-j] Git Push Summary

2018-02-22 Thread robbie 
Repository: qpid-proton-j
Updated Tags:  refs/tags/0.26.0 [created] 8111ca2a2

-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

svn commit: r25221 - in /dev/qpid/proton-j: 0.22.0-rc1/ 0.23.0-rc1/ 0.24.0-rc1/

2018-02-22 Thread robbie 
Author: robbie
Date: Thu Feb 22 18:15:42 2018
New Revision: 25221

Log:
clean out older bits

Removed:
dev/qpid/proton-j/0.22.0-rc1/
dev/qpid/proton-j/0.23.0-rc1/
dev/qpid/proton-j/0.24.0-rc1/


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

svn commit: r25223 - /dev/qpid/proton-j/0.26.0-rc1/

2018-02-22 Thread robbie 
Author: robbie
Date: Thu Feb 22 18:31:23 2018
New Revision: 25223

Log:
add files for qpid-proton-j 0.26.0 (RC1)

Added:
dev/qpid/proton-j/0.26.0-rc1/
dev/qpid/proton-j/0.26.0-rc1/apache-qpid-proton-j-0.26.0-bin.tar.gz   (with 
props)
dev/qpid/proton-j/0.26.0-rc1/apache-qpid-proton-j-0.26.0-bin.tar.gz.asc   
(with props)
dev/qpid/proton-j/0.26.0-rc1/apache-qpid-proton-j-0.26.0-bin.tar.gz.md5
dev/qpid/proton-j/0.26.0-rc1/apache-qpid-proton-j-0.26.0-bin.tar.gz.sha512
dev/qpid/proton-j/0.26.0-rc1/apache-qpid-proton-j-0.26.0-src.tar.gz   (with 
props)
dev/qpid/proton-j/0.26.0-rc1/apache-qpid-proton-j-0.26.0-src.tar.gz.asc   
(with props)
dev/qpid/proton-j/0.26.0-rc1/apache-qpid-proton-j-0.26.0-src.tar.gz.md5
dev/qpid/proton-j/0.26.0-rc1/apache-qpid-proton-j-0.26.0-src.tar.gz.sha512

Added: dev/qpid/proton-j/0.26.0-rc1/apache-qpid-proton-j-0.26.0-bin.tar.gz
==
Binary file - no diff available.

Propchange: dev/qpid/proton-j/0.26.0-rc1/apache-qpid-proton-j-0.26.0-bin.tar.gz
--
svn:mime-type = application/x-gzip

Added: dev/qpid/proton-j/0.26.0-rc1/apache-qpid-proton-j-0.26.0-bin.tar.gz.asc
==
Binary file - no diff available.

Propchange: 
dev/qpid/proton-j/0.26.0-rc1/apache-qpid-proton-j-0.26.0-bin.tar.gz.asc
--
svn:mime-type = application/pgp-signature

Added: dev/qpid/proton-j/0.26.0-rc1/apache-qpid-proton-j-0.26.0-bin.tar.gz.md5
==
--- dev/qpid/proton-j/0.26.0-rc1/apache-qpid-proton-j-0.26.0-bin.tar.gz.md5 
(added)
+++ dev/qpid/proton-j/0.26.0-rc1/apache-qpid-proton-j-0.26.0-bin.tar.gz.md5 Thu 
Feb 22 18:31:23 2018
@@ -0,0 +1 @@
+c9241bdbe062b7cd1248ec72c7950fb0  apache-qpid-proton-j-0.26.0-bin.tar.gz

Added: 
dev/qpid/proton-j/0.26.0-rc1/apache-qpid-proton-j-0.26.0-bin.tar.gz.sha512
==
--- dev/qpid/proton-j/0.26.0-rc1/apache-qpid-proton-j-0.26.0-bin.tar.gz.sha512 
(added)
+++ dev/qpid/proton-j/0.26.0-rc1/apache-qpid-proton-j-0.26.0-bin.tar.gz.sha512 
Thu Feb 22 18:31:23 2018
@@ -0,0 +1 @@
+e60c36f7cec490488601ff16844b8e9dd7561ce58d5caddb0ac14bd5f876b0455128e20239458c2e74bc15003a6881718ac0df62a4bfe5e83a915eb66e2ff28d
  apache-qpid-proton-j-0.26.0-bin.tar.gz

Added: dev/qpid/proton-j/0.26.0-rc1/apache-qpid-proton-j-0.26.0-src.tar.gz
==
Binary file - no diff available.

Propchange: dev/qpid/proton-j/0.26.0-rc1/apache-qpid-proton-j-0.26.0-src.tar.gz
--
svn:mime-type = application/x-gzip

Added: dev/qpid/proton-j/0.26.0-rc1/apache-qpid-proton-j-0.26.0-src.tar.gz.asc
==
Binary file - no diff available.

Propchange: 
dev/qpid/proton-j/0.26.0-rc1/apache-qpid-proton-j-0.26.0-src.tar.gz.asc
--
svn:mime-type = application/pgp-signature

Added: dev/qpid/proton-j/0.26.0-rc1/apache-qpid-proton-j-0.26.0-src.tar.gz.md5
==
--- dev/qpid/proton-j/0.26.0-rc1/apache-qpid-proton-j-0.26.0-src.tar.gz.md5 
(added)
+++ dev/qpid/proton-j/0.26.0-rc1/apache-qpid-proton-j-0.26.0-src.tar.gz.md5 Thu 
Feb 22 18:31:23 2018
@@ -0,0 +1 @@
+fcfaae2dee91a3fad1a937ceb029b9b8  apache-qpid-proton-j-0.26.0-src.tar.gz

Added: 
dev/qpid/proton-j/0.26.0-rc1/apache-qpid-proton-j-0.26.0-src.tar.gz.sha512
==
--- dev/qpid/proton-j/0.26.0-rc1/apache-qpid-proton-j-0.26.0-src.tar.gz.sha512 
(added)
+++ dev/qpid/proton-j/0.26.0-rc1/apache-qpid-proton-j-0.26.0-src.tar.gz.sha512 
Thu Feb 22 18:31:23 2018
@@ -0,0 +1 @@
+51212502d6eb285ac44389314bdf70960efb3f07fb93fcb2699ef9040743cbaf4e3de4568a5de8a11496e01b5c8d7fa50e908a336c766a302a2c6d2d53a98664
  apache-qpid-proton-j-0.26.0-src.tar.gz



-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

[1/2] qpid-dispatch git commit: NO-JIRA: remove spurious printlines

2018-02-22 Thread gsim 
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master f0b2e52ea -> db5af96ca


NO-JIRA: remove spurious printlines


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/80c0443f
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/80c0443f
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/80c0443f

Branch: refs/heads/master
Commit: 80c0443f4a66543c87c3aa0412b0afaadbb41108
Parents: f0b2e52
Author: Gordon Sim 
Authored: Thu Feb 22 20:49:58 2018 +
Committer: Gordon Sim 
Committed: Thu Feb 22 20:53:46 2018 +

--
 src/remote_sasl.c | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/80c0443f/src/remote_sasl.c
--
diff --git a/src/remote_sasl.c b/src/remote_sasl.c
index d9631a4..cda58c6 100644
--- a/src/remote_sasl.c
+++ b/src/remote_sasl.c
@@ -633,8 +633,6 @@ void 
qdr_handle_authentication_service_connection_event(pn_event_t *e)
 allocate_buffer(&(context->permissions.targets));
 allocate_buffer(&(context->permissions.sources));
 parse_properties(properties, collect_permissions, (void*) 
&(context->permissions));
-printf("allowed sources %s\n", context->permissions.sources.start);
-printf("allowed targets %s\n", context->permissions.targets.start);
 }
 const pn_bytes_t authid = extract_authenticated_identity(properties);
 if (authid.start && authid.size) {


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

[3/4] qpid-proton git commit: PROTON-1734: Doc changes only

2018-02-22 Thread astitcher 
PROTON-1734: Doc changes only


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/093355f6
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/093355f6
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/093355f6

Branch: refs/heads/master
Commit: 093355f604d0b3503f6627cb2f28022af0ef851b
Parents: bbc83aa
Author: Alan Conway 
Authored: Mon Jan 8 12:10:05 2018 -0500
Committer: Andrew Stitcher 
Committed: Thu Feb 22 10:40:15 2018 -0500

--
 proton-c/bindings/cpp/include/proton/container.hpp |  3 +--
 proton-c/include/proton/proactor.h | 15 ---
 2 files changed, 9 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/093355f6/proton-c/bindings/cpp/include/proton/container.hpp
--
diff --git a/proton-c/bindings/cpp/include/proton/container.hpp 
b/proton-c/bindings/cpp/include/proton/container.hpp
index 9733f78..c6a876c 100644
--- a/proton-c/bindings/cpp/include/proton/container.hpp
+++ b/proton-c/bindings/cpp/include/proton/container.hpp
@@ -190,8 +190,7 @@ class PN_CPP_CLASS_EXTERN container {
 ///
 /// When the process is complete, `run()` returns in all threads.
 ///
-/// **Thread safety** - It is safe to call this method across
-/// threads.
+/// **Thread safety** - It is safe to call this method in any thread.
 PN_CPP_EXTERN void stop();
 
 /// Open a connection and sender for `addr_url`.

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/093355f6/proton-c/include/proton/proactor.h
--
diff --git a/proton-c/include/proton/proactor.h 
b/proton-c/include/proton/proactor.h
index 3e47d99..be20ff1 100644
--- a/proton-c/include/proton/proactor.h
+++ b/proton-c/include/proton/proactor.h
@@ -161,13 +161,14 @@ PNP_EXTERN void pn_proactor_listen(pn_proactor_t 
*proactor, pn_listener_t *liste
  * @ref PN_LISTENER_CLOSE, @ref PN_TRANSPORT_CLOSED and other @ref 
proactor_events are
  * generated as usual.
  *
- * If no new listeners or connections are created, then a @ref
- * PN_PROACTOR_INACTIVE event will be generated when all connections and
- * listeners are disconnected and no timeout is pending - see
- * pn_proactor_set_timeout() pn_proactor_cancel_timeout()
- *
- * Note the proactor remains active, connections and listeners created after a 
call to
- * pn_proactor_disconnect() are not affected by it.
+ * A @ref PN_PROACTOR_INACTIVE event will be generated when all connections and
+ * listeners are disconnected and no timeout is pending. The event will also be
+ * generated if there are no listeners, connections or timeout when
+ * pn_proactor_disconnect() is called.
+ *
+ * Creating new connections and listeners after this call and before the
+ * PN_PROACTOR_INACTIVE event may prevent the proactor from becoming inactive.
+ * After the PN_PROACTOR_INACTIVE event, the proactor can be used normally.
  *
  * @note Thread-safe
  *


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

[4/4] qpid-proton git commit: PROTON-1734: Fix Win32 iocp implementation

2018-02-22 Thread astitcher 
PROTON-1734: Fix Win32 iocp implementation


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/2b51dcf5
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/2b51dcf5
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/2b51dcf5

Branch: refs/heads/master
Commit: 2b51dcf56334f68603a3c47538fc45e7e534acc8
Parents: 0df65cc
Author: Andrew Stitcher 
Authored: Thu Feb 22 14:58:12 2018 -0500
Committer: Andrew Stitcher 
Committed: Thu Feb 22 15:00:51 2018 -0500

--
 proton-c/src/proactor/win_iocp.c | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/2b51dcf5/proton-c/src/proactor/win_iocp.c
--
diff --git a/proton-c/src/proactor/win_iocp.c b/proton-c/src/proactor/win_iocp.c
index 71f9b0d..fe09876 100644
--- a/proton-c/src/proactor/win_iocp.c
+++ b/proton-c/src/proactor/win_iocp.c
@@ -3343,8 +3343,11 @@ void pn_proactor_disconnect(pn_proactor_t *p, 
pn_condition_t *cond) {
   }
   // no lock
 
-  if (!disconnecting_pcontexts)
+  if (!disconnecting_pcontexts) {
+csguard p_guard(>context.cslock);
+wake_if_inactive(p);
 return;
+  }
 
   // Second pass: different locking, close the pcontexts, free them if 
!disconnect_ops
   for (ctx = disconnecting_pcontexts; ctx; ctx = ctx ? ctx->next : NULL) {


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

[2/4] qpid-proton git commit: PROTON-1734: Fix the semantics of pn_proactor_disconnect() - Make sure that an PN_PROACTOR_INACTIVE event is always generated even if the proactor was inactive before. Th

2018-02-22 Thread astitcher 
PROTON-1734: Fix the semantics of pn_proactor_disconnect()
- Make sure that an PN_PROACTOR_INACTIVE event is always generated
  even if the proactor was inactive before. This ensures that we
  can use disconnect effectively even before making connections


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/5d47e615
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/5d47e615
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/5d47e615

Branch: refs/heads/master
Commit: 5d47e615a8ba322a65fd41735c0c6adb36828bed
Parents: 093355f
Author: Andrew Stitcher 
Authored: Thu Feb 22 01:58:55 2018 -0500
Committer: Andrew Stitcher 
Committed: Thu Feb 22 10:40:15 2018 -0500

--
 proton-c/bindings/cpp/src/proactor_container_impl.cpp | 14 +-
 proton-c/bindings/cpp/src/proactor_container_impl.hpp |  1 +
 proton-c/src/proactor/epoll.c |  8 ++--
 proton-c/src/proactor/libuv.c | 10 +++---
 4 files changed, 27 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/5d47e615/proton-c/bindings/cpp/src/proactor_container_impl.cpp
--
diff --git a/proton-c/bindings/cpp/src/proactor_container_impl.cpp 
b/proton-c/bindings/cpp/src/proactor_container_impl.cpp
index 988521c..15eff0a 100644
--- a/proton-c/bindings/cpp/src/proactor_container_impl.cpp
+++ b/proton-c/bindings/cpp/src/proactor_container_impl.cpp
@@ -143,7 +143,7 @@ class work_queue::impl* 
container::impl::make_work_queue(container& c) {
 
 container::impl::impl(container& c, const std::string& id, messaging_handler* 
mh)
 : threads_(0), container_(c), proactor_(pn_proactor()), handler_(mh), 
id_(id),
-  auto_stop_(true), stopping_(false)
+  reconnecting_(0), auto_stop_(true), stopping_(false)
 {}
 
 container::impl::~impl() {
@@ -217,6 +217,15 @@ void container::impl::start_connection(const url& url, 
pn_connection_t *pnc) {
 }
 
 void container::impl::reconnect(pn_connection_t* pnc) {
+--reconnecting_;
+
+if (stopping_ && reconnecting_==0) {
+pn_connection_free(pnc);
+//TODO: We've lost the error - we should really propagate it here
+pn_proactor_disconnect(proactor_, NULL);
+return;
+}
+
 connection_context& cc = connection_context::get(pnc);
 reconnect_context& rc = *cc.reconnect_context_.get();
 const reconnect_options::impl& roi = *rc.reconnect_options_->impl_;
@@ -318,6 +327,7 @@ bool container::impl::setup_reconnect(pn_connection_t* pnc) 
{
 // Schedule reconnect - can do this on container work queue as no one can 
have the connection
 // now anyway
 schedule(delay, make_work(::impl::reconnect, this, pnc));
+++reconnecting_;
 
 return true;
 }
@@ -727,6 +737,8 @@ void container::impl::stop(const proton::error_condition& 
err) {
 if (stopping_) return;  // Already stopping
 auto_stop_ = true;
 stopping_ = true;
+// Have to wait until actual reconnect to stop or we leak the 
connection
+if (reconnecting_>0) return;
 }
 pn_condition_t* error_condition = pn_condition();
 set_error_condition(err, error_condition);

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/5d47e615/proton-c/bindings/cpp/src/proactor_container_impl.hpp
--
diff --git a/proton-c/bindings/cpp/src/proactor_container_impl.hpp 
b/proton-c/bindings/cpp/src/proactor_container_impl.hpp
index 06dbcb5..43b695f 100644
--- a/proton-c/bindings/cpp/src/proactor_container_impl.hpp
+++ b/proton-c/bindings/cpp/src/proactor_container_impl.hpp
@@ -147,6 +147,7 @@ class container::impl {
 proton::receiver_options receiver_options_;
 error_condition disconnect_error_;
 
+unsigned reconnecting_;
 bool auto_stop_;
 bool stopping_;
 friend class connector;

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/5d47e615/proton-c/src/proactor/epoll.c
--
diff --git a/proton-c/src/proactor/epoll.c b/proton-c/src/proactor/epoll.c
index 5f8c495..4ad2506 100644
--- a/proton-c/src/proactor/epoll.c
+++ b/proton-c/src/proactor/epoll.c
@@ -2103,6 +2103,8 @@ pn_proactor_t *pn_connection_proactor(pn_connection_t* c) 
{
 }
 
 void pn_proactor_disconnect(pn_proactor_t *p, pn_condition_t *cond) {
+  bool notify = false;
+
   lock(>context.mutex);
   // Move the whole contexts list into a disconnecting state
   pcontext_t *disconnecting_pcontexts = p->contexts;
@@ -2115,12 +2117,14 @@ void pn_proactor_disconnect(pn_proactor_t *p, 
pn_condition_t *cond) {
 p->disconnects_pending++;
 ctx =

[1/4] qpid-proton git commit: PROTON-1734: [C++ binding] Extra tests to check that you can stop container - This tests that pn_proactor_disconnect() can always be used even when the container/proactor

2018-02-22 Thread astitcher 
Repository: qpid-proton
Updated Branches:
  refs/heads/master bbc83aaf0 -> 2b51dcf56


PROTON-1734: [C++ binding] Extra tests to check that you can stop container
- This tests that pn_proactor_disconnect() can always be used even when
  the container/proactor is inactive.


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/0df65cc3
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/0df65cc3
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/0df65cc3

Branch: refs/heads/master
Commit: 0df65cc3ced56e46044981b09e7bf25a84de69ee
Parents: 5d47e61
Author: Andrew Stitcher 
Authored: Thu Feb 22 02:02:16 2018 -0500
Committer: Andrew Stitcher 
Committed: Thu Feb 22 10:40:15 2018 -0500

--
 proton-c/bindings/cpp/CMakeLists.txt |  2 +-
 proton-c/bindings/cpp/src/container_test.cpp | 95 ++-
 2 files changed, 94 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/0df65cc3/proton-c/bindings/cpp/CMakeLists.txt
--
diff --git a/proton-c/bindings/cpp/CMakeLists.txt 
b/proton-c/bindings/cpp/CMakeLists.txt
index b32b3f8..6555c4c 100644
--- a/proton-c/bindings/cpp/CMakeLists.txt
+++ b/proton-c/bindings/cpp/CMakeLists.txt
@@ -220,7 +220,7 @@ install (FILES
 
 macro(add_cpp_test test)
   add_executable (${test} src/${test}.cpp)
-  target_link_libraries (${test} qpid-proton-cpp)
+  target_link_libraries (${test} qpid-proton-cpp ${PLATFORM_LIBS})
   if (CMAKE_SYSTEM_NAME STREQUAL Windows)
 add_test (NAME cpp-${test}
   COMMAND ${env_py}

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/0df65cc3/proton-c/bindings/cpp/src/container_test.cpp
--
diff --git a/proton-c/bindings/cpp/src/container_test.cpp 
b/proton-c/bindings/cpp/src/container_test.cpp
index 00c8481..030e03d 100644
--- a/proton-c/bindings/cpp/src/container_test.cpp
+++ b/proton-c/bindings/cpp/src/container_test.cpp
@@ -34,6 +34,12 @@
 #include 
 #include 
 
+#if PN_CPP_SUPPORTS_THREADS
+# include 
+# include 
+# include 
+#endif
+
 namespace {
 
 std::string make_url(std::string host, int port) {
@@ -230,7 +236,7 @@ struct hang_tester : public proton::messaging_handler {
 
 void on_container_start(proton::container& c) PN_CPP_OVERRIDE {
 listener = c.listen("//:0");
-c.schedule(proton::duration(250), make_work(_tester::connect, 
this, ));
+c.schedule(proton::duration(250), 
proton::make_work(_tester::connect, this, ));
 }
 
 void on_connection_open(proton::connection& c) PN_CPP_OVERRIDE {
@@ -260,10 +266,89 @@ public:
 
 int test_container_immediate_stop() {
 immediate_stop_tester t;
-proton::container(t).run();  // will hang
+proton::container(t).run();  // Should return after on_container_start
+return 0;
+}
+
+int test_container_pre_stop() {
+proton::container c;
+c.stop();
+c.run();// Should return immediately
+return 0;
+}
+
+
+struct schedule_tester : public proton::messaging_handler {
+void stop(proton::container* c) { c->stop(); }
+
+void on_container_start(proton::container& c) PN_CPP_OVERRIDE {
+c.schedule(proton::duration(250), 
proton::make_work(_tester::stop, this, ));
+}
+};
+
+int test_container_schedule_stop() {
+schedule_tester tester;
+proton::container c(tester);
+c.auto_stop(false);
+c.run();
 return 0;
 }
 
+
+#if PN_CPP_SUPPORTS_THREADS // Tests that require thread support
+
+class test_mt_handler : public proton::messaging_handler {
+  public:
+std::mutex lock_;
+std::condition_variable cond_;
+std::string str_;
+
+void set(const std::string& s) {
+std::lock_guard l(lock_);
+str_ = s;
+cond_.notify_one();
+}
+
+std::string wait() {
+std::unique_lock l(lock_);
+while (str_.empty()) cond_.wait(l);
+std::string s = str_;
+str_.clear();
+return s;
+}
+
+void on_container_start(proton::container &) PN_CPP_OVERRIDE { 
set("start"); }
+void on_connection_open(proton::connection &) PN_CPP_OVERRIDE { 
set("open"); }
+};
+
+int test_container_mt_stop_empty() {
+test_mt_handler th;
+proton::container c(th);
+c.auto_stop( false );
+auto t = std::thread([&]() { c.run(); });
+ASSERT_EQUAL("start", th.wait());
+c.stop();
+t.join();
+return 0;
+}
+
+int test_container_mt_stop() {
+test_mt_handler th;
+proton::container c(th);
+c.auto_stop(false);
+auto t = std::thread([&]() { c.run(); });
+test_listen_handler lh;
+c.listen("//:0", lh);   //  Also opens a connection
+ASSERT_EQUAL("start",

qpid-broker-j git commit: QPID-8102: [Broker-J] Add UI for virtual host node auto-creation policies

2018-02-22 Thread orudyy 
Repository: qpid-broker-j
Updated Branches:
  refs/heads/master 1dbdd3213 -> 056da53ca


QPID-8102: [Broker-J] Add UI for virtual host node auto-creation policies


Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/056da53c
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/056da53c
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/056da53c

Branch: refs/heads/master
Commit: 056da53cac94f8c2e312baf8f19be39b91ef901b
Parents: 1dbdd32
Author: Alex Rudyy 
Authored: Sun Feb 18 23:24:42 2018 +
Committer: Alex Rudyy 
Committed: Thu Feb 22 14:14:34 2018 +

--
 .../src/main/java/resources/css/common.css  |  21 ++
 .../main/java/resources/editVirtualHost.html|  20 +-
 .../resources/js/qpid/management/VirtualHost.js | 114 +-
 .../js/qpid/management/editVirtualHost.js   | 184 +-
 .../virtualhost/NodeAutoCreationPolicyForm.js   | 355 +++
 .../main/java/resources/showVirtualHost.html|   6 +
 .../virtualhost/NodeAutoCreationPolicyForm.html | 129 +++
 7 files changed, 822 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/056da53c/broker-plugins/management-http/src/main/java/resources/css/common.css
--
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 cac53f6..e4b2511 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
@@ -789,3 +789,24 @@ td.advancedSearchField, col.autoWidth {
 {
 margin-bottom: 10px !important;
 }
+
+#editVirtualHostDialog
+{
+width: 550px;
+}
+.nodeAutoCreationPolicies .field-selected { width: 2em; }
+.nodeAutoCreationPolicies .field-nodeType { width: 10%; }
+.nodeAutoCreationPolicies .field-pattern { width: 10%; }
+.nodeAutoCreationPolicies .field-createdOnPublish { width: 10%; }
+.nodeAutoCreationPolicies .field-createdOnConsume { width: 10% }
+.nodeAutoCreationPolicies .field-attributes { width: auto }
+
+.nodeAutoCreationPolicyAttributes { height: 100px;}
+.keyValuePair {
+overflow: auto;
+}
+
+.sequentialPanel
+{
+margin-bottom: 0.2em !important;
+}

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/056da53c/broker-plugins/management-http/src/main/java/resources/editVirtualHost.html
--
diff --git 
a/broker-plugins/management-http/src/main/java/resources/editVirtualHost.html 
b/broker-plugins/management-http/src/main/java/resources/editVirtualHost.html
index 74ca047..042e05b 100644
--- 
a/broker-plugins/management-http/src/main/java/resources/editVirtualHost.html
+++ 
b/broker-plugins/management-http/src/main/java/resources/editVirtualHost.html
@@ -107,10 +107,6 @@
  promptMessage="Number of threads used to 
perform housekeeping"/>
   
   
-  
-  
-  
-
 
 Number of connection threads:
 
@@ -135,6 +131,22 @@
   promptMessage: 'Period with which statistics are 
reported to the log.'" />
 
 
+  
+  
+  
+  
+
++
+
+-
+
+  
   
 
   

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/056da53c/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
--
diff --git 
a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
 
b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
index dd7a2fc..6df7870 100644
--- 
a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
+++ 
b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
@@ -33,8 +33,18 @@ define(["dojo/parser",
 "qpid/management/query/QueryGrid",
 "qpid/management/editVirtualHost",
 "qpid/common/StatisticsWidget",
-"dgrid/Selector",
 "dojo/text!showVirtualHost.html",
+"dijit/Dialog",
+"dgrid/Grid",
+"dgrid/Selector",
+"dgrid/Keyboard",
+"dgrid/Selection",
+"dgrid/extensions/Pagination",
+"dgrid/extensions/ColumnResizer",
+

qpid-broker-j git commit: QPID-8102: [Broker-J][WMC] Do not reset Virtual Host Edit dialog on show

2018-02-22 Thread orudyy 
Repository: qpid-broker-j
Updated Branches:
  refs/heads/master 056da53ca -> 0fe98f847


QPID-8102: [Broker-J][WMC] Do not reset Virtual Host Edit dialog on show


Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/0fe98f84
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/0fe98f84
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/0fe98f84

Branch: refs/heads/master
Commit: 0fe98f847484367256fda8df65deb85317cec128
Parents: 056da53
Author: Alex Rudyy 
Authored: Thu Feb 22 14:44:14 2018 +
Committer: Alex Rudyy 
Committed: Thu Feb 22 14:44:14 2018 +

--
 .../src/main/java/resources/js/qpid/management/editVirtualHost.js   | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/0fe98f84/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js
--
diff --git 
a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js
 
b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js
index f59ae31..01dc072 100644
--- 
a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js
+++ 
b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js
@@ -261,7 +261,6 @@ define(["dojox/html/entities",
 this._initNodeAutoCreationPolicies(data);
 this.dialog.startup();
 this.dialog.show();
-this.dialog.reset();
 if (!this.resizeEventRegistered)
 {
 this.resizeEventRegistered = true;


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org