qpid-proton git commit: NO-JIRA: Better explanation of the purpose of example ProtonConfig.cmake and ProtonCppConfig.cmake files.

2016-03-21 Thread astitcher 
Repository: qpid-proton
Updated Branches:
  refs/heads/master f2ae27d7e -> 54b297f3d


NO-JIRA: Better explanation of the purpose of example ProtonConfig.cmake
and ProtonCppConfig.cmake files.


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

Branch: refs/heads/master
Commit: 54b297f3d8ed882e79e486c2e4923c7c7cb2a1f6
Parents: f2ae27d
Author: Andrew Stitcher 
Authored: Tue Mar 22 01:13:21 2016 -0400
Committer: Andrew Stitcher 
Committed: Tue Mar 22 01:13:21 2016 -0400

--
 examples/ProtonConfig.cmake| 10 ++
 examples/ProtonCppConfig.cmake | 10 ++
 2 files changed, 20 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/54b297f3/examples/ProtonConfig.cmake
--
diff --git a/examples/ProtonConfig.cmake b/examples/ProtonConfig.cmake
index 0269c77..e910082 100644
--- a/examples/ProtonConfig.cmake
+++ b/examples/ProtonConfig.cmake
@@ -17,6 +17,16 @@
 # under the License.
 #
 
+# Note that this file is used *only* when building the examples within
+# the proton source tree not when the examples are installed separately
+# from it (for example in an OS distribution package).
+#
+# So if you find this file installed on your system something went wrong
+# with the packaging and/or package installation.
+#
+# For a packaged installation the equivalent file is created by the source
+# tree build and installed in the appropriate place for cmake on that system.
+
 set (Proton_VERSION   ${PN_VERSION})
 set (Proton_INCLUDE_DIRS  ${CMAKE_SOURCE_DIR}/proton-c/include)
 set (Proton_LIBRARIES qpid-proton)

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/54b297f3/examples/ProtonCppConfig.cmake
--
diff --git a/examples/ProtonCppConfig.cmake b/examples/ProtonCppConfig.cmake
index d3a7813..e23d134 100644
--- a/examples/ProtonCppConfig.cmake
+++ b/examples/ProtonCppConfig.cmake
@@ -17,6 +17,16 @@
 # under the License.
 #
 
+# Note that this file is used *only* when building the examples within
+# the proton source tree not when the examples are installed separately
+# from it (for example in an OS distribution package).
+#
+# So if you find this file installed on your system something went wrong
+# with the packaging and/or package installation.
+#
+# For a packaged installation the equivalent file is created by the source
+# tree build and installed in the appropriate place for cmake on that system.
+
 set (ProtonCpp_VERSION   ${PN_VERSION})
 set (ProtonCpp_INCLUDE_DIRS  ${CMAKE_SOURCE_DIR}/proton-c/include 
${CMAKE_SOURCE_DIR}/proton-c/bindings/cpp/include)
 set (ProtonCpp_LIBRARIES qpid-proton-cpp)


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

qpid-proton git commit: PROTON-1138: handler options become link or connection options (https://reviews.apache.org/r/44927)

2016-03-21 Thread cliffjansen 
Repository: qpid-proton
Updated Branches:
  refs/heads/master 9e2649ac4 -> f2ae27d7e


PROTON-1138: handler options become link or connection options 
(https://reviews.apache.org/r/44927)


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

Branch: refs/heads/master
Commit: f2ae27d7e7a09c016a89be59e93d5796e01cc725
Parents: 9e2649a
Author: Clifford Jansen 
Authored: Mon Mar 21 17:15:24 2016 -0700
Committer: Clifford Jansen 
Committed: Mon Mar 21 17:15:24 2016 -0700

--
 .../cpp/include/proton/connection_options.hpp   |  4 +-
 .../bindings/cpp/include/proton/container.hpp   |  1 +
 .../bindings/cpp/include/proton/handler.hpp | 23 +-
 proton-c/bindings/cpp/include/proton/link.hpp   |  1 +
 .../cpp/include/proton/link_options.hpp | 17 +++-
 .../bindings/cpp/src/connection_options.cpp | 36 -
 proton-c/bindings/cpp/src/container.cpp |  2 +
 proton-c/bindings/cpp/src/container_impl.cpp| 19 +++--
 proton-c/bindings/cpp/src/container_impl.hpp|  1 +
 proton-c/bindings/cpp/src/contexts.cpp  | 12 +++
 proton-c/bindings/cpp/src/contexts.hpp  |  9 +++
 proton-c/bindings/cpp/src/handler.cpp   |  4 +-
 proton-c/bindings/cpp/src/link_options.cpp  | 35 +---
 proton-c/bindings/cpp/src/messaging_adapter.cpp | 85 
 proton-c/bindings/cpp/src/messaging_adapter.hpp | 12 +--
 proton-c/bindings/cpp/src/proton_event.hpp  |  1 +
 tests/tools/apps/cpp/reactor_send.cpp   |  5 +-
 17 files changed, 134 insertions(+), 133 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/f2ae27d7/proton-c/bindings/cpp/include/proton/connection_options.hpp
--
diff --git a/proton-c/bindings/cpp/include/proton/connection_options.hpp 
b/proton-c/bindings/cpp/include/proton/connection_options.hpp
index 71e12f1..1a22b73 100644
--- a/proton-c/bindings/cpp/include/proton/connection_options.hpp
+++ b/proton-c/bindings/cpp/include/proton/connection_options.hpp
@@ -76,9 +76,6 @@ class connection_options {
 
 // XXX add C++11 move operations
 
-/// Override with options from other.
-PN_CPP_EXTERN void override(const connection_options& other);
-
 /// Set a handler for the connection.
 PN_CPP_EXTERN connection_options& handler(class handler *);
 
@@ -145,6 +142,7 @@ class connection_options {
 static pn_connection_t *pn_connection(connection &);
 class ssl_client_options _client_options();
 class ssl_server_options _server_options();
+PN_CPP_EXTERN void update(const connection_options& other);
 
 class impl;
 internal::pn_unique_ptr impl_;

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/f2ae27d7/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 0af1963..7e0f0ee 100644
--- a/proton-c/bindings/cpp/include/proton/container.hpp
+++ b/proton-c/bindings/cpp/include/proton/container.hpp
@@ -134,6 +134,7 @@ class container {
 
 friend class connector;
 friend class link;
+friend class messaging_adapter;
 /// @endcond
 };
 

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/f2ae27d7/proton-c/bindings/cpp/include/proton/handler.hpp
--
diff --git a/proton-c/bindings/cpp/include/proton/handler.hpp 
b/proton-c/bindings/cpp/include/proton/handler.hpp
index 3bc0023..6ea11d4 100644
--- a/proton-c/bindings/cpp/include/proton/handler.hpp
+++ b/proton-c/bindings/cpp/include/proton/handler.hpp
@@ -41,28 +41,7 @@ class
 PN_CPP_CLASS_EXTERN handler
 {
   public:
-/// @cond INTERNAL
-/// XXX move configuration to connection or container
-
-/// Create a handler.
-///
-/// @param prefetch set flow control to automatically pre-fetch
-/// this many messages
-///
-/// @param auto_accept automatically accept received messages
-/// after on_message()
-///
-/// @param auto_settle automatically settle on receipt of delivery
-/// for sent messages
-///
-/// @param peer_close_is_error treat orderly remote connection
-/// close as error
-PN_CPP_EXTERN handler(int prefetch=10, bool auto_accept=true,
-  bool auto_settle=true,
-  bool peer_close_is_error=false);
-
-/// @endcond
-
+PN_CPP_EXTERN handler();
 PN_CPP_EXTERN virtual ~handler();

qpid-proton git commit: NO-JIRA: Bump to next snapshot version

2016-03-21 Thread jross 
Repository: qpid-proton
Updated Branches:
  refs/heads/0.12.x 286a363a7 -> 3df466fb3


NO-JIRA: Bump to next snapshot version


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

Branch: refs/heads/0.12.x
Commit: 3df466fb3ac2e1b6fa8370739e802e765d96d0dc
Parents: 286a363
Author: Justin Ross 
Authored: Mon Mar 21 16:46:39 2016 -0700
Committer: Justin Ross 
Committed: Mon Mar 21 16:47:14 2016 -0700

--
 contrib/proton-hawtdispatch/pom.xml | 2 +-
 contrib/proton-jms/pom.xml  | 2 +-
 examples/engine/java/pom.xml| 2 +-
 examples/java/messenger/pom.xml | 2 +-
 examples/java/reactor/pom.xml   | 2 +-
 pom.xml | 2 +-
 proton-j/pom.xml| 2 +-
 tests/pom.xml   | 2 +-
 version.txt | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3df466fb/contrib/proton-hawtdispatch/pom.xml
--
diff --git a/contrib/proton-hawtdispatch/pom.xml 
b/contrib/proton-hawtdispatch/pom.xml
index 452a7f2..7d1714b 100644
--- a/contrib/proton-hawtdispatch/pom.xml
+++ b/contrib/proton-hawtdispatch/pom.xml
@@ -19,7 +19,7 @@
   
 org.apache.qpid
 proton-project
-0.12.1
+0.12.2-SNAPSHOT
 ../..
   
   4.0.0

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3df466fb/contrib/proton-jms/pom.xml
--
diff --git a/contrib/proton-jms/pom.xml b/contrib/proton-jms/pom.xml
index 501d74a..f43002c 100644
--- a/contrib/proton-jms/pom.xml
+++ b/contrib/proton-jms/pom.xml
@@ -19,7 +19,7 @@
   
 org.apache.qpid
 proton-project
-0.12.1
+0.12.2-SNAPSHOT
 ../..
   
   4.0.0

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3df466fb/examples/engine/java/pom.xml
--
diff --git a/examples/engine/java/pom.xml b/examples/engine/java/pom.xml
index 85a411b..17174b1 100644
--- a/examples/engine/java/pom.xml
+++ b/examples/engine/java/pom.xml
@@ -19,7 +19,7 @@
   
 org.apache.qpid
 proton-project
-0.12.1
+0.12.2-SNAPSHOT
 ../../../pom.xml
   
   4.0.0

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3df466fb/examples/java/messenger/pom.xml
--
diff --git a/examples/java/messenger/pom.xml b/examples/java/messenger/pom.xml
index 3849e6f..5152162 100644
--- a/examples/java/messenger/pom.xml
+++ b/examples/java/messenger/pom.xml
@@ -19,7 +19,7 @@
   
 org.apache.qpid
 proton-project
-0.12.1
+0.12.2-SNAPSHOT
 ../../..
   
   4.0.0

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3df466fb/examples/java/reactor/pom.xml
--
diff --git a/examples/java/reactor/pom.xml b/examples/java/reactor/pom.xml
index 836b759..72b1751 100644
--- a/examples/java/reactor/pom.xml
+++ b/examples/java/reactor/pom.xml
@@ -19,7 +19,7 @@
   
 org.apache.qpid
 proton-project
-0.12.1
+0.12.2-SNAPSHOT
 ../../..
   
   4.0.0

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3df466fb/pom.xml
--
diff --git a/pom.xml b/pom.xml
index b072a3f..0848f29 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 
   org.apache.qpid
   proton-project
-  0.12.1
+  0.12.2-SNAPSHOT
   pom
 
   

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3df466fb/proton-j/pom.xml
--
diff --git a/proton-j/pom.xml b/proton-j/pom.xml
index d1b4350..5e4b51a 100644
--- a/proton-j/pom.xml
+++ b/proton-j/pom.xml
@@ -19,7 +19,7 @@
   
 org.apache.qpid
 proton-project
-0.12.1
+0.12.2-SNAPSHOT
   
   4.0.0
 

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3df466fb/tests/pom.xml
--
diff --git a/tests/pom.xml b/tests/pom.xml
index 7e92d6f..2a3c501 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -27,7 +27,7 @@
   
 org.apache.qpid
 proton-project
-0.12.1
+0.12.2-SNAPSHOT
   
 
   The Proton python system tests execute against the Java or C 
implementation, using Maven (via this pom) and CMake/CTest respectively.

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3df466fb/version.txt
--
diff

svn commit: r12808 - in /release/qpid/proton: 0.12.1/ 0.12.1/qpid-proton-0.12.1.tar.gz 0.12.1/qpid-proton-0.12.1.tar.gz.asc 0.12.1/qpid-proton-0.12.1.tar.gz.md5 0.12.1/qpid-proton-0.12.1.tar.gz.sha1 l

2016-03-21 Thread jross 
Author: jross
Date: Mon Mar 21 23:44:26 2016
New Revision: 12808

Log:
Add 0.12.1 release artifacts

Added:
release/qpid/proton/0.12.1/
release/qpid/proton/0.12.1/qpid-proton-0.12.1.tar.gz   (with props)
release/qpid/proton/0.12.1/qpid-proton-0.12.1.tar.gz.asc   (with props)
release/qpid/proton/0.12.1/qpid-proton-0.12.1.tar.gz.md5
release/qpid/proton/0.12.1/qpid-proton-0.12.1.tar.gz.sha1
Modified:
release/qpid/proton/latest

Added: release/qpid/proton/0.12.1/qpid-proton-0.12.1.tar.gz
==
Binary file - no diff available.

Propchange: release/qpid/proton/0.12.1/qpid-proton-0.12.1.tar.gz
--
svn:mime-type = application/x-gzip

Added: release/qpid/proton/0.12.1/qpid-proton-0.12.1.tar.gz.asc
==
Binary file - no diff available.

Propchange: release/qpid/proton/0.12.1/qpid-proton-0.12.1.tar.gz.asc
--
svn:mime-type = application/pgp-signature

Added: release/qpid/proton/0.12.1/qpid-proton-0.12.1.tar.gz.md5
==
--- release/qpid/proton/0.12.1/qpid-proton-0.12.1.tar.gz.md5 (added)
+++ release/qpid/proton/0.12.1/qpid-proton-0.12.1.tar.gz.md5 Mon Mar 21 
23:44:26 2016
@@ -0,0 +1 @@
+8f046d11c88c3e485c26be35cced3e98  qpid-proton-0.12.1.tar.gz

Added: release/qpid/proton/0.12.1/qpid-proton-0.12.1.tar.gz.sha1
==
--- release/qpid/proton/0.12.1/qpid-proton-0.12.1.tar.gz.sha1 (added)
+++ release/qpid/proton/0.12.1/qpid-proton-0.12.1.tar.gz.sha1 Mon Mar 21 
23:44:26 2016
@@ -0,0 +1 @@
+65117ed63a0afaabc01bcf46a7c794a9448939bf  qpid-proton-0.12.1.tar.gz

Modified: release/qpid/proton/latest
==
--- release/qpid/proton/latest (original)
+++ release/qpid/proton/latest Mon Mar 21 23:44:26 2016
@@ -1 +1 @@
-link 0.12.0
\ No newline at end of file
+link 0.12.1
\ No newline at end of file



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

[qpid-proton] Git Push Summary

2016-03-21 Thread jross 
Repository: qpid-proton
Updated Tags:  refs/tags/0.12.1 [created] 24f966f68

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

qpid-dispatch git commit: Added policy support code for link name matching.

2016-03-21 Thread chug 
Repository: qpid-dispatch
Updated Branches:
  refs/heads/crolke-DISPATCH-188-1 25af9cd7a -> 1aea48edc


Added policy support code for link name matching.


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

Branch: refs/heads/crolke-DISPATCH-188-1
Commit: 1aea48edcfffa35cb47c67babc294594087ace64
Parents: 25af9cd
Author: Chuck Rolke 
Authored: Mon Mar 21 17:33:50 2016 -0400
Committer: Chuck Rolke 
Committed: Mon Mar 21 17:33:50 2016 -0400

--
 src/policy.c   | 142 +++-
 src/policy_internal.h  | 100 +++
 tests/CMakeLists.txt   |   1 +
 tests/policy_test.c|  89 +++
 tests/run_unit_tests.c |   2 +
 5 files changed, 306 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/1aea48ed/src/policy.c
--
diff --git a/src/policy.c b/src/policy.c
index 075e89b..0cb96b3 100644
--- a/src/policy.c
+++ b/src/policy.c
@@ -20,36 +20,21 @@
 #include 
 #include "qpid/dispatch/python_embedded.h"
 #include "policy.h"
+#include "policy_internal.h"
 #include 
 #include 
 #include "dispatch_private.h"
 #include "connection_manager_private.h"
 #include "qpid/dispatch/container.h"
 #include "qpid/dispatch/server.h"
-#include "qpid/dispatch/message.h"
-#include 
 #include 
 #include 
 #include 
 #include 
 #include 
 #include 
-#include "qpid/dispatch/ctools.h"
-#include "qpid/dispatch/hash.h"
-#include "qpid/dispatch/threading.h"
-#include "qpid/dispatch/iterator.h"
-#include "qpid/dispatch/log.h"
 
 
-/**
- * Private Function Prototypes
- */
-void qd_policy_private_deny_amqp_connection(pn_connection_t *conn, const char 
*cond_name, const char *cond_descr);
-void qd_policy_deny_amqp_session(pn_session_t *ssn, qd_connection_t *qd_conn);
-void _qd_policy_deny_amqp_link(pn_link_t *link, qd_connection_t *qd_conn, char 
* s_or_r);
-void _qd_policy_deny_amqp_sender_link(pn_link_t *pn_link, qd_connection_t 
*qd_conn);
-void _qd_policy_deny_amqp_receiver_link(pn_link_t *pn_link, qd_connection_t 
*qd_conn);
-
 //
 // TODO: when policy dev is more complete lower the log level
 //
@@ -389,13 +374,9 @@ bool qd_policy_open_lookup_user(
 return res;
 }
 
-/** Set the error condition and close the connection.
- * Over the wire this will send an open frame followed
- * immediately by a close frame with the error condition.
- * @param[in] conn proton connection being closed
- * @param[in] cond_name condition name
- * @param[in] cond_descr condition description
- **/ 
+
+//
+//
 void qd_policy_private_deny_amqp_connection(pn_connection_t *conn, const char 
*cond_name, const char *cond_descr)
 {
 pn_condition_t * cond = pn_connection_condition(conn);
@@ -405,11 +386,8 @@ void 
qd_policy_private_deny_amqp_connection(pn_connection_t *conn, const char *c
 }
 
 
-/** Internal function to deny an amqp session
- * The session is closed with a condition and the denial is counted.
- * @param[in,out] ssn proton session
- * @param[in,out] qd_conn dispatch connection
- */
+//
+//
 void qd_policy_deny_amqp_session(pn_session_t *ssn, qd_connection_t *qd_conn)
 {
 pn_condition_t * cond = pn_session_condition(ssn);
@@ -503,6 +481,114 @@ void _qd_policy_deny_amqp_receiver_link(pn_link_t 
*pn_link, qd_connection_t *qd_
 
 //
 //
+#define MIN(a,b) (((a)<(b))?(a):(b))
+
+char * _qd_policy_link_user_name_subst(const char *uname, const char 
*proposed, char *obuf, int osize)
+{
+if (strlen(uname) == 0)
+return NULL;
+
+const char *duser = "${user}";
+char *retptr = obuf;
+const char *wiptr = proposed;
+const char *findptr = strstr(proposed, uname);
+if (findptr == NULL) {
+return NULL;
+}
+
+// Copy leading before match
+int segsize = findptr - wiptr;
+int copysize = MIN(osize, segsize);
+if (copysize)
+strncpy(obuf, wiptr, copysize);
+wiptr += copysize;
+osize -= copysize;
+obuf  += copysize;
+
+// Copy the substitution string
+segsize = strlen(duser);
+copysize = MIN(osize, segsize);
+if (copysize)
+strncpy(obuf, duser, copysize);
+wiptr += strlen(uname);
+osize -= copysize;
+obuf  += copysize;
+
+// Copy trailing after match
+strncpy(obuf, wiptr, osize);
+return retptr;
+}
+
+
+//
+//
+// Size of 'easy' temporary copy of allowed input string
+#define QPALN_SIZE 1024
+// Size of user-name-substituted proposed string.
+#define QPALN_USERBUFSIZE 300
+// C in the CSV string
+#define QPALN_COMMA_SEP ","
+// Wildcard

[qpid-interop-test] Git Push Summary

2016-03-21 Thread kpvdr 
Repository: qpid-interop-test
Updated Branches:
  refs/heads/cpp-api-changes [deleted] c1e7146ff

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

[3/5] qpid-interop-test git commit: QPIDIT-22: Updated AMQP and types test to latest Proton C++ API.

2016-03-21 Thread kpvdr 
QPIDIT-22: Updated AMQP and types test to latest Proton C++ API.


Project: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/commit/901635ad
Tree: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/tree/901635ad
Diff: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/diff/901635ad

Branch: refs/heads/master
Commit: 901635ad72f222ad11892dbc3163150afbca2349
Parents: ab9f27a
Author: Kim van der Riet 
Authored: Thu Mar 17 12:59:19 2016 -0400
Committer: Kim van der Riet 
Committed: Thu Mar 17 12:59:19 2016 -0400

--
 .../qpid-proton-cpp/src/qpidit/QpidItErrors.cpp |   5 +-
 .../qpid-proton-cpp/src/qpidit/QpidItErrors.hpp |   2 +-
 .../src/qpidit/shim/AmqpReceiver.cpp|  12 +-
 .../src/qpidit/shim/AmqpSender.cpp  |  10 +-
 .../src/qpidit/shim/JmsReceiver.cpp |  36 +++---
 .../src/qpidit/shim/JmsReceiver.hpp |   2 +-
 .../src/qpidit/shim/JmsSender.cpp   |  76 ++--
 .../src/qpidit/shim/JmsSender.hpp   |   4 +-
 .../qpid-interop-test/jms/jms_message_tests.py  | 119 +++
 9 files changed, 193 insertions(+), 73 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/901635ad/shims/qpid-proton-cpp/src/qpidit/QpidItErrors.cpp
--
diff --git a/shims/qpid-proton-cpp/src/qpidit/QpidItErrors.cpp 
b/shims/qpid-proton-cpp/src/qpidit/QpidItErrors.cpp
index 9287fdc..0545263 100644
--- a/shims/qpid-proton-cpp/src/qpidit/QpidItErrors.cpp
+++ b/shims/qpid-proton-cpp/src/qpidit/QpidItErrors.cpp
@@ -22,6 +22,7 @@
 #include "qpidit/QpidItErrors.hpp"
 
 #include 
+#include 
 
 namespace qpidit
 {
@@ -64,8 +65,8 @@ namespace qpidit
 
 // --- IncorrectMessageBodyLengthError ---
 
-IncorrectMessageBodyLengthError::IncorrectMessageBodyLengthError(int 
expected, int found) :
-std::runtime_error(MSG("Incorrect body length found in 
message body: expected: " << expected
+IncorrectMessageBodyLengthError::IncorrectMessageBodyLengthError(const 
std::string& context, int expected, int found) :
+std::runtime_error(MSG(context << ": Incorrect body length 
found in message body: expected: " << expected
 << "; found " << found))
 {}
 

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/901635ad/shims/qpid-proton-cpp/src/qpidit/QpidItErrors.hpp
--
diff --git a/shims/qpid-proton-cpp/src/qpidit/QpidItErrors.hpp 
b/shims/qpid-proton-cpp/src/qpidit/QpidItErrors.hpp
index 2beaecb..3632af6 100644
--- a/shims/qpid-proton-cpp/src/qpidit/QpidItErrors.hpp
+++ b/shims/qpid-proton-cpp/src/qpidit/QpidItErrors.hpp
@@ -74,7 +74,7 @@ namespace qpidit
 class IncorrectMessageBodyLengthError: public std::runtime_error
 {
 public:
-IncorrectMessageBodyLengthError(int expected, int found);
+IncorrectMessageBodyLengthError(const std::string& context, int 
expected, int found);
 virtual ~IncorrectMessageBodyLengthError() throw();
 };
 

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/901635ad/shims/qpid-proton-cpp/src/qpidit/shim/AmqpReceiver.cpp
--
diff --git a/shims/qpid-proton-cpp/src/qpidit/shim/AmqpReceiver.cpp 
b/shims/qpid-proton-cpp/src/qpidit/shim/AmqpReceiver.cpp
index 25985fa..66795f3 100644
--- a/shims/qpid-proton-cpp/src/qpidit/shim/AmqpReceiver.cpp
+++ b/shims/qpid-proton-cpp/src/qpidit/shim/AmqpReceiver.cpp
@@ -23,8 +23,8 @@
 
 #include 
 #include 
+#include 
 #include "proton/container.hpp"
-#include "proton/decimal.hpp"
 #include "proton/event.hpp"
 #include "qpidit/QpidItErrors.hpp"
 
@@ -126,13 +126,13 @@ namespace qpidit
 _receivedValueList.append(oss.str());
 } else if (_amqpType.compare("binary") == 0) {
 checkMessageType(msg, proton::BINARY);
-
_receivedValueList.append(msg.body().get());
+
_receivedValueList.append(std::string(msg.body().get()));
 } else if (_amqpType.compare("string") == 0) {
 checkMessageType(msg, proton::STRING);
-
_receivedValueList.append(msg.body().get());
+_receivedValueList.append(msg.body().get());
 } else if (_amqpType.compare("symbol") == 0) {
 checkMessageType(msg, proton::SYMBOL);
-
_receivedValueList.append(msg.body().get());
+
_receivedValueList.append(msg.body().get());
 } else if (_amqpType.compare("list") == 0) {

[2/5] qpid-interop-test git commit: NO_JIRA: Minor updates to README and QUICKSTART

2016-03-21 Thread kpvdr 
NO_JIRA: Minor updates to README and QUICKSTART


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

Branch: refs/heads/master
Commit: ab9f27a5353f2c0a3b7e02144d34a9331fe21820
Parents: ab84b0e
Author: Kim van der Riet 
Authored: Tue Mar 15 10:54:15 2016 -0400
Committer: Kim van der Riet 
Committed: Tue Mar 15 10:54:15 2016 -0400

--
 QUICKSTART | 29 ++---
 README | 10 +-
 2 files changed, 15 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/ab9f27a5/QUICKSTART
--
diff --git a/QUICKSTART b/QUICKSTART
index e95628e..196d392 100644
--- a/QUICKSTART
+++ b/QUICKSTART
@@ -10,26 +10,23 @@ QUICKSTART GUIDE
 -
 git clone https://git-wip-us.apache.org/repos/asf/qpid-interop-test.git
 
-2. Patch Proton and build
--
-Proton needs to be patched with a change that adds support for the missing 
AMQP types in the current
-python implementation. This patch will be proposed as a patch to Proton 
itself, and if accepted,
-this part of the procedure will go away. Until then, the patch is located in 
the etc directory as
-proton-python-amqp-types.patch. Copy this to the qpid-proton directory, then:
-
-cd qpid-proton
-patch -p1 proton-python-amqp-types.patch
-cd build/
+2. Get Qpid Proton
+--
+git clone https://git-wip-us.apache.org/repos/asf/qpid-proton.git
+cd qpid-proton
+mkdir build
+cd build
+cmake ..
 make
+# installing is optional, if you want to install, then the following line:
 sudo make install
 cd ..
-mvn -DskipTests package
 mvn -DskipTests install
 
 3. Build Qpid JMS
 -
-cd qpid-jms
-mvn -DskipTests package
+git clone https://git-wip-us.apache.org/repos/asf/qpid-jms.git
+cd qpid-jms
 mvn -DskipTests install
 
 
@@ -58,12 +55,6 @@ export QPID_INTEROP_TEST_HOME=https://issues.apache.org/jira/browse/QPID-6328 for more info on 
this.
 
 From top level directory:
 ./src/py/qpid-interop-test/jms/jms_message_tests.py

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/ab9f27a5/README
--
diff --git a/README b/README
index 8fc1d3c..366a287 100644
--- a/README
+++ b/README
@@ -20,7 +20,7 @@ QUICKSTART. Detailed documentation for adding tests and using 
them are
 Issues
 --
 Issues are tracked in the Apache JIRA at
-https://issues.apache.org/jira/browse/QPIDIT/?selectedTab=com.atlassian.jira.jira-projects-plugin:summary-panel
+https://issues.apache.org/jira/browse/QPIDIT
 
 Support
 ---
@@ -36,7 +36,7 @@ directory. The very short version of this is as follows:
 
 The first is a sender which reads the following from the command-line:
 
-...
+   ...
 
 and is responsible for sending messages containing the test values each in a
 single message in the appropriate AMQP type format.
@@ -44,12 +44,12 @@ single message in the appropriate AMQP type format.
 The second client program is a receiver, and must read the following from the
 command-line
 
-  
+  
 
 and is responsible for receiving  messages from the broker and
 printing the bodies of the received messages appropriately decoded for type
-. The printed output will contain the amqp type on the first line
-and each received message body on subsequent lines, one message per line.
+. The printed output will be a JSON string containing the identical
+structure to that sent to the send shim, but containing the received values.
 
 2. Add a subclass for this client in
 src/py/qpid-interop-test/types/simple_type_test.py


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

[5/5] qpid-interop-test git commit: NO_JIRA: Update to QUICKSTART file

2016-03-21 Thread kpvdr 
NO_JIRA: Update to QUICKSTART file


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

Branch: refs/heads/master
Commit: c1e7146ff44d661d043a3f3b89d5b0997e465b82
Parents: 4f9b9ac
Author: Kim van der Riet 
Authored: Thu Mar 17 13:11:46 2016 -0400
Committer: Kim van der Riet 
Committed: Thu Mar 17 13:11:46 2016 -0400

--
 QUICKSTART | 40 
 1 file changed, 32 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/c1e7146f/QUICKSTART
--
diff --git a/QUICKSTART b/QUICKSTART
index 196d392..6e38e7c 100644
--- a/QUICKSTART
+++ b/QUICKSTART
@@ -10,8 +10,8 @@ QUICKSTART GUIDE
 -
 git clone https://git-wip-us.apache.org/repos/asf/qpid-interop-test.git
 
-2. Get Qpid Proton
---
+2. Get and build Qpid Proton
+
 git clone https://git-wip-us.apache.org/repos/asf/qpid-proton.git
 cd qpid-proton
 mkdir build
@@ -23,8 +23,8 @@ sudo make install
 cd ..
 mvn -DskipTests install
 
-3. Build Qpid JMS
--
+3. Get and build Qpid JMS
+-
 git clone https://git-wip-us.apache.org/repos/asf/qpid-jms.git
 cd qpid-jms
 mvn -DskipTests install
@@ -36,18 +36,36 @@ mvn -DskipTests install
 needed, particularly AmqpPrimitiveTypes.TYPE_MAP which controls the AMQP types
 and test values for each type.
 
-4. Run the tests (uninstalled)
+4. Build qpid-interop-test components:
+--
+cd qpid-interop-test
+./java-clean.sh
+./java-buuld.sh
+cd shims/qpid-jms
+./java-clean.sh
+./java-buuld.sh
+cd ../qpid-proton-cpp
+mkdir build
+cd build
+ccmake ..
+make clean
+make
+cd ../../..
+
+5. Run the tests (uninstalled)
 --
 Note that installation is still to be completed, this section will change to
 reflect installation details when complete.
 
-qpid-proton installed:
+Select one of the two following options:
+
+a. qpid-proton installed:
 Assuming proton's "make install" has been run, from top level 
qpid-interop-test directory:
 export 
PYTHONPATH=/usr/local/lib64/proton/bindings/python:src/py/qpid-interop-test
 export LD_LIBRARY_PATH=/usr/local/lib64
 export QPID_INTEROP_TEST_HOME=
 
-qpid-proton built but not installed:
+b. qpid-proton built but not installed:
 Assuming proton's "make" has been run from a "build" directory as described in 
the proton README (but not make install), from top level qpid-interop-test 
directory:
 export PYTHONPATH=/proton-c/bindings/python:/build/proton-c/bindings/python:src/py/qpid-interop-test
 export LD_LIBRARY_PATH=/build/proton-c
@@ -57,6 +75,12 @@ Start a broker (Active-MQ or Qpid).
 NOTE: For qpidd, YOU MUST USE THE --queue-pattern qpid-interop parameter so it 
will create non-existent queues as needed.
 
 From top level directory:
-./src/py/qpid-interop-test/jms/jms_message_tests.py
+AMQP type tests:
 ./src/py/qpid-interop-test/types/simple_type_tests.py
 
+JMS message tests: In order to correctly set the Java CLASSPATH, the versions 
of Qpid-jms and Qpid-proton must be known. These are set as follows:
+./src/py/qpid-interop-test/jms/jms_message_tests.py --qpid-jms-ver 
 --qpid-proton-ver 
+For example:
+./src/py/qpid-interop-test/jms/jms_message_tests.py --qpid-jms-ver 
0.9.0-SNAPSHOT --qpid-proton-ver 0.13.0-SNAPSHOT
+
+


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

[4/5] qpid-interop-test git commit: QPIDIT-22: Updated AMQP and types test to latest Proton C++ API. Files missed in last commit

2016-03-21 Thread kpvdr 
QPIDIT-22: Updated AMQP and types test to latest Proton C++ API. Files missed 
in last commit


Project: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/commit/4f9b9ac6
Tree: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/tree/4f9b9ac6
Diff: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/diff/4f9b9ac6

Branch: refs/heads/master
Commit: 4f9b9ac68f17137fd985342eb4acfdc4107ed1f1
Parents: 901635a
Author: Kim van der Riet 
Authored: Thu Mar 17 13:00:12 2016 -0400
Committer: Kim van der Riet 
Committed: Thu Mar 17 13:00:12 2016 -0400

--
 .../qpid-proton-cpp/src/qpidit/QpidItErrors.cpp |  4 ++--
 .../src/qpidit/shim/JmsSender.cpp   | 22 +---
 .../src/qpidit/shim/JmsSender.hpp   |  6 ++
 3 files changed, 23 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/4f9b9ac6/shims/qpid-proton-cpp/src/qpidit/QpidItErrors.cpp
--
diff --git a/shims/qpid-proton-cpp/src/qpidit/QpidItErrors.cpp 
b/shims/qpid-proton-cpp/src/qpidit/QpidItErrors.cpp
index 0545263..4802787 100644
--- a/shims/qpid-proton-cpp/src/qpidit/QpidItErrors.cpp
+++ b/shims/qpid-proton-cpp/src/qpidit/QpidItErrors.cpp
@@ -66,8 +66,8 @@ namespace qpidit
 // --- IncorrectMessageBodyLengthError ---
 
 IncorrectMessageBodyLengthError::IncorrectMessageBodyLengthError(const 
std::string& context, int expected, int found) :
-std::runtime_error(MSG(context << ": Incorrect body length 
found in message body: expected: " << expected
-<< "; found " << found))
+std::runtime_error(MSG(context << ": Incorrect body length 
found in message body: expected: "
+<< expected << "; found " << found))
 {}
 
 IncorrectMessageBodyLengthError::~IncorrectMessageBodyLengthError() 
throw() {}

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/4f9b9ac6/shims/qpid-proton-cpp/src/qpidit/shim/JmsSender.cpp
--
diff --git a/shims/qpid-proton-cpp/src/qpidit/shim/JmsSender.cpp 
b/shims/qpid-proton-cpp/src/qpidit/shim/JmsSender.cpp
index 3d81cc4..432f370 100644
--- a/shims/qpid-proton-cpp/src/qpidit/shim/JmsSender.cpp
+++ b/shims/qpid-proton-cpp/src/qpidit/shim/JmsSender.cpp
@@ -123,8 +123,7 @@ namespace qpidit
 } else if (subType.compare("bytes") == 0) {
 bin.assign(testValueStr.begin(), testValueStr.end());
 } else if (subType.compare("char") == 0) {
-char val[2];
-val[0] = 0;
+bin.push_back(char(0));
 if (testValueStr[0] == '\\') { // Format: '\xNN'
 
bin.push_back(getIntegralValue(testValueStr.substr(2)));
 } else { // Format: 'c'
@@ -135,22 +134,31 @@ namespace qpidit
 try {
 val = htobe64(std::strtoul(testValueStr.data(), NULL, 16));
 } catch (const std::exception& e) { throw 
qpidit::InvalidTestValueError("double", testValueStr); }
-bin.assign(sizeof(val), val);
+numToBinary(val, bin);
+   //for (int i=0; i

[qpid-proton] Git Push Summary

2016-03-21 Thread kpvdr 
Repository: qpid-proton
Updated Branches:
  refs/heads/kvdr-PROTON-1159 [deleted] 1b1503c12

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

[1/2] qpid-proton git commit: PROTON-1159: Fixed linage for proton::internal::print_hex()

2016-03-21 Thread kpvdr 
Repository: qpid-proton
Updated Branches:
  refs/heads/master 2390f77ec -> 9e2649ac4


PROTON-1159: Fixed linage for proton::internal::print_hex()


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

Branch: refs/heads/master
Commit: 9e2649ac4f4996bbd84c217761fb506569cfd2a8
Parents: caf4f8a
Author: Kim van der Riet 
Authored: Mon Mar 21 15:53:32 2016 -0400
Committer: Kim van der Riet 
Committed: Mon Mar 21 15:56:14 2016 -0400

--
 proton-c/bindings/cpp/include/proton/byte_array.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/9e2649ac/proton-c/bindings/cpp/include/proton/byte_array.hpp
--
diff --git a/proton-c/bindings/cpp/include/proton/byte_array.hpp 
b/proton-c/bindings/cpp/include/proton/byte_array.hpp
index d695007..9ba6abf 100644
--- a/proton-c/bindings/cpp/include/proton/byte_array.hpp
+++ b/proton-c/bindings/cpp/include/proton/byte_array.hpp
@@ -19,6 +19,7 @@
  * under the License.
  */
 
+#include "proton/export.hpp"
 #include 
 #include 
 
@@ -26,9 +27,8 @@
 #include 
 
 namespace proton {
-
 namespace internal {
-void print_hex(std::ostream& o, const uint8_t* p, size_t n);
+PN_CPP_EXTERN void print_hex(std::ostream& o, const uint8_t* p, size_t n);
 }
 
 /// Used to represent fixed-sized data types that don't have a natural C++ 
representation


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

qpid-proton git commit: PROTON-1159: Fixed linage for proton::internal::print_hex()

2016-03-21 Thread kpvdr 
Repository: qpid-proton
Updated Branches:
  refs/heads/kvdr-PROTON-1159 43cebe18b -> 1b1503c12


PROTON-1159: Fixed linage for proton::internal::print_hex()


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

Branch: refs/heads/kvdr-PROTON-1159
Commit: 1b1503c128e32f9e8c4bdca7e18980dd856d46ea
Parents: 43cebe1
Author: Kim van der Riet 
Authored: Mon Mar 21 15:53:32 2016 -0400
Committer: Kim van der Riet 
Committed: Mon Mar 21 15:53:32 2016 -0400

--
 proton-c/bindings/cpp/include/proton/byte_array.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1b1503c1/proton-c/bindings/cpp/include/proton/byte_array.hpp
--
diff --git a/proton-c/bindings/cpp/include/proton/byte_array.hpp 
b/proton-c/bindings/cpp/include/proton/byte_array.hpp
index d695007..9ba6abf 100644
--- a/proton-c/bindings/cpp/include/proton/byte_array.hpp
+++ b/proton-c/bindings/cpp/include/proton/byte_array.hpp
@@ -19,6 +19,7 @@
  * under the License.
  */
 
+#include "proton/export.hpp"
 #include 
 #include 
 
@@ -26,9 +27,8 @@
 #include 
 
 namespace proton {
-
 namespace internal {
-void print_hex(std::ostream& o, const uint8_t* p, size_t n);
+PN_CPP_EXTERN void print_hex(std::ostream& o, const uint8_t* p, size_t n);
 }
 
 /// Used to represent fixed-sized data types that don't have a natural C++ 
representation


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

qpid-dispatch git commit: DISPATCH-242 - Added -A option to qdstat to display autoLinks.

2016-03-21 Thread tross 
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master f51c85241 -> d5a9fe826


DISPATCH-242 - Added -A option to qdstat to display autoLinks.


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

Branch: refs/heads/master
Commit: d5a9fe82678a85a4e8f46a8e1bdd315378884ab9
Parents: f51c852
Author: Ted Ross 
Authored: Mon Mar 21 13:36:40 2016 +
Committer: Ted Ross 
Committed: Mon Mar 21 14:17:57 2016 +

--
 tools/qdstat | 29 +
 1 file changed, 29 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/d5a9fe82/tools/qdstat
--
diff --git a/tools/qdstat b/tools/qdstat
index 764dd72..e98502d 100755
--- a/tools/qdstat
+++ b/tools/qdstat
@@ -47,6 +47,7 @@ def parse_args(argv):
 parser.add_option("-n", "--nodes", help="Show Router Nodes",
action="store_const", const="n",   dest="show")
 parser.add_option("-a", "--address", help="Show Router Addresses",  
action="store_const", const="a",   dest="show")
 parser.add_option("-m", "--memory", help="Show Broker Memory Stats",
action="store_const", const="m",   dest="show")
+parser.add_option("-A", "--autolink", help="Show Auto Links",   
action="store_const", const="A",   dest="show")
 parser.add_option("-v", "--verbose", help="Show maximum detail",
action="store_true", dest="verbose")
 parser.add_option("--log", help="Show recent log entries", 
action="store_const", const="log", dest="show")
 parser.add_option("--limit", help="Limit number of log entries", 
type="int")
@@ -314,6 +315,33 @@ class BusManager(Node):
 dispRows = sorter.getSorted()
 disp.formattedTable(title, heads, dispRows)
 
+def displayAutolinks(self):
+disp = Display(prefix="  ")
+heads = []
+heads.append(Header("addr"))
+heads.append(Header("dir"))
+heads.append(Header("phase"))
+heads.append(Header("link"))
+heads.append(Header("status"))
+heads.append(Header("lastErr"))
+rows = []
+
+objects = self.query('org.apache.qpid.dispatch.router.config.autoLink')
+
+for al in objects:
+row = []
+row.append(al.addr)
+row.append(al.dir)
+row.append(al.phase)
+row.append(al.linkRef)
+row.append(al.operStatus)
+row.append(al.lastError)
+rows.append(row)
+title = "AutoLinks"
+sorter = Sorter(heads, rows, 'addr', 0, True)
+dispRows = sorter.getSorted()
+disp.formattedTable(title, heads, dispRows)
+
 def displayMemory(self):
 disp = Display(prefix="  ")
 heads = []
@@ -361,6 +389,7 @@ class BusManager(Node):
 elif main == 'm': self.displayMemory()
 elif main == 'g': self.displayGeneral()
 elif main == 'c': self.displayConnections()
+elif main == 'A': self.displayAutolinks()
 elif main == 'log': self.displayLog()
 
 def display(self, identitys):


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

qpid-dispatch git commit: NO-JIRA: Add .reviewboardrc to enable rbt

2016-03-21 Thread aconway 
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master eaf81eaab -> f51c85241


NO-JIRA: Add .reviewboardrc to enable rbt

You can now create a review on reviews.apache.com by switching to the
branch to review and typing `rbt -g -d`. See `rbt --hep` for more.

On Fedora, rbt is provided by the `RBTools` package.


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

Branch: refs/heads/master
Commit: f51c8524147504bb5ae3dea8602d6c949b4fa653
Parents: eaf81ea
Author: Alan Conway 
Authored: Mon Mar 21 10:14:16 2016 -0400
Committer: Alan Conway 
Committed: Mon Mar 21 10:14:16 2016 -0400

--
 .reviewboardrc | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/f51c8524/.reviewboardrc
--
diff --git a/.reviewboardrc b/.reviewboardrc
new file mode 100644
index 000..53b5b89
--- /dev/null
+++ b/.reviewboardrc
@@ -0,0 +1,5 @@
+REVIEWBOARD_URL = "https://reviews.apache.org;
+REPOSITORY = 'qpid-dispatch'
+
+
+


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

svn commit: r1735943 - in /qpid/java/trunk: broker-core/src/main/java/org/apache/qpid/server/model/ broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/

2016-03-21 Thread rgodfrey 
Author: rgodfrey
Date: Mon Mar 21 11:06:09 2016
New Revision: 1735943

URL: http://svn.apache.org/viewvc?rev=1735943=rev
Log:
QPID-7095 : Add ability to describe context variables usage through meta data

Added:

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ManagedContextDependency.java
   (with props)
Modified:

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ManagedContextDefault.java

qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ApiDocsServlet.java

qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java

Modified: 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java?rev=1735943=1735942=1735943=diff
==
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java
 (original)
+++ 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java
 Mon Mar 21 11:06:09 2016
@@ -27,6 +27,7 @@ import java.lang.reflect.Modifier;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.AbstractCollection;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -34,6 +35,7 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.SortedSet;
@@ -59,36 +61,38 @@ public class ConfiguredObjectTypeRegistr
 {
 private static final Logger LOGGER = 
LoggerFactory.getLogger(ConfiguredObjectTypeRegistry.class);
 
-private static Map STANDARD_FIRST_FIELDS_ORDER = new 
HashMap<>();
+private static Map STANDARD_FIRST_FIELDS_ORDER = new 
HashMap<>();
 
-private static final ConcurrentMap CATEGORY_CACHE = new ConcurrentHashMap<>();
+private static final ConcurrentMap CATEGORY_CACHE =
+new ConcurrentHashMap<>();
 
 static
 {
 int i = 0;
-for(String name : Arrays.asList(ConfiguredObject.ID,
-ConfiguredObject.NAME,
-ConfiguredObject.DESCRIPTION,
-ConfiguredObject.TYPE,
-ConfiguredObject.DESIRED_STATE,
-ConfiguredObject.STATE,
-ConfiguredObject.DURABLE,
-ConfiguredObject.LIFETIME_POLICY,
-ConfiguredObject.CONTEXT))
+for (String name : Arrays.asList(ConfiguredObject.ID,
+ ConfiguredObject.NAME,
+ ConfiguredObject.DESCRIPTION,
+ ConfiguredObject.TYPE,
+ ConfiguredObject.DESIRED_STATE,
+ ConfiguredObject.STATE,
+ ConfiguredObject.DURABLE,
+ ConfiguredObject.LIFETIME_POLICY,
+ ConfiguredObject.CONTEXT))
 {
 STANDARD_FIRST_FIELDS_ORDER.put(name, i++);
 }
 
 }
 
-private static Map STANDARD_LAST_FIELDS_ORDER = new 
HashMap<>();
+private static Map STANDARD_LAST_FIELDS_ORDER = new 
HashMap<>();
+
 static
 {
 int i = 0;
-for(String name : Arrays.asList(ConfiguredObject.LAST_UPDATED_BY,
-ConfiguredObject.LAST_UPDATED_TIME,
-ConfiguredObject.CREATED_BY,
-ConfiguredObject.CREATED_TIME))
+for (String name : Arrays.asList(ConfiguredObject.LAST_UPDATED_BY,
+ ConfiguredObject.LAST_UPDATED_TIME,
+ ConfiguredObject.CREATED_BY,
+ ConfiguredObject.CREATED_TIME))
 {
 STANDARD_LAST_FIELDS_ORDER.put(name, i++);
 }
@@ -96,17 +100,18 @@ public class ConfiguredObjectTypeRegistr
 }
 
 
-private static final Comparator 
OBJECT_NAME_COMPARATOR = new

svn commit: r1735938 - in /qpid/java/trunk/doc/java-broker/src/docbkx: Java-Broker-Introduction.xml security/Java-Broker-Security-Authentication-Providers-OAuth2.xml

2016-03-21 Thread kwall 
Author: kwall
Date: Mon Mar 21 10:09:23 2016
New Revision: 1735938

URL: http://svn.apache.org/viewvc?rev=1735938=rev
Log:
QPID-7152: [Java Broker Documentation] Correct typo in new OAuth2 docs

Modified:
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Introduction.xml

qpid/java/trunk/doc/java-broker/src/docbkx/security/Java-Broker-Security-Authentication-Providers-OAuth2.xml

Modified: 
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Introduction.xml
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Introduction.xml?rev=1735938=1735937=1735938=diff
==
--- qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Introduction.xml 
(original)
+++ qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Introduction.xml Mon 
Mar 21 10:09:23 2016
@@ -59,7 +59,7 @@
 
 
   Pluggable authentication architecture with out-of-the-box support 
for Kerberos, LDAP,
-External, and file-based authentication mechanisms.
+External, OAuth2, and file-based authentication mechanisms.
 
 
   Support for message compression

Modified: 
qpid/java/trunk/doc/java-broker/src/docbkx/security/Java-Broker-Security-Authentication-Providers-OAuth2.xml
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/security/Java-Broker-Security-Authentication-Providers-OAuth2.xml?rev=1735938=1735937=1735938=diff
==
--- 
qpid/java/trunk/doc/java-broker/src/docbkx/security/Java-Broker-Security-Authentication-Providers-OAuth2.xml
 (original)
+++ 
qpid/java/trunk/doc/java-broker/src/docbkx/security/Java-Broker-Security-Authentication-Providers-OAuth2.xml
 Mon Mar 21 10:09:23 2016
@@ -23,7 +23,7 @@
 http://docbook.org/ns/docbook; version="5.0" 
xml:id="Java-Broker-Security-OAuth2-Provider">
 OAuth2
 
- This authentication provider allows users to login to the broker 
using credential from a different service supporting OAuth2.
+ This authentication provider allows users to login to the broker 
using credentials from a different service supporting OAuth2.
 Unfortunately, the http://www.w3.org/1999/xlink; 
xlink:href="https://www.rfc-editor.org/rfc/rfc6749.txt;>OAuth2 
specification does not define a standard why to get the identity of a 
subject from an access token.
 However, most OAuth2 implementations provide such functionality, 
although in different ways. Qpid handles this by providing so called 
IdentityResolvers.
 Currently the following services are supported:



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