qpid-proton git commit: PROTON-1369: Add deprecation warnings; update examples to avoid use of url

[jross]

Repository: qpid-proton
Updated Branches:
  refs/heads/master 47c9ae01d -> bc6014057


PROTON-1369: Add deprecation warnings; update examples to avoid use of url


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

Branch: refs/heads/master
Commit: bc6014057311be47bc6a5733105ab982f8126099
Parents: 47c9ae0
Author: Justin Ross 
Authored: Thu Oct 12 20:09:39 2017 -0700
Committer: Justin Ross 
Committed: Thu Oct 12 20:09:39 2017 -0700

--
 examples/cpp/CMakeLists.txt |  2 +-
 examples/cpp/broker.cpp |  3 +-
 examples/cpp/example_test.py|  2 +-
 examples/cpp/helloworld.cpp | 19 +++
 examples/cpp/queue_browser.cpp  | 34 +++--
 examples/cpp/reconnect_client.cpp   |  3 +-
 examples/cpp/scheduled_send_03.cpp  |  3 +-
 examples/cpp/selected_recv.cpp  | 17 ---
 examples/cpp/server.cpp | 53 +---
 examples/cpp/service_bus.cpp|  6 +--
 proton-c/bindings/cpp/CMakeLists.txt|  2 +-
 .../bindings/cpp/include/proton/container.hpp   |  8 +--
 .../cpp/include/proton/default_container.hpp|  2 +-
 .../bindings/cpp/include/proton/function.hpp| 18 +++
 .../cpp/include/proton/internal/export.hpp  | 16 +-
 proton-c/bindings/cpp/include/proton/url.hpp|  4 +-
 proton-c/bindings/cpp/include/proton/value.hpp  | 14 ++
 .../bindings/cpp/include/proton/work_queue.hpp  | 18 +++
 .../cpp/src/proactor_container_impl.cpp |  2 -
 19 files changed, 113 insertions(+), 113 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/bc601405/examples/cpp/CMakeLists.txt
--
diff --git a/examples/cpp/CMakeLists.txt b/examples/cpp/CMakeLists.txt
index 5584201..4114c94 100644
--- a/examples/cpp/CMakeLists.txt
+++ b/examples/cpp/CMakeLists.txt
@@ -55,7 +55,6 @@ foreach(example
 flow_control
 ssl
 ssl_client_cert
-service_bus
 encode_decode)
   add_executable(${example} ${example}.cpp)
   set_target_properties(${example} PROPERTIES LINK_FLAGS 
"${CXX_EXAMPLE_FLAGS}")
@@ -65,6 +64,7 @@ if(HAS_CPP11)
   # Examples that require C++11
   foreach(example
   scheduled_send
+  service_bus
   multithreaded_client
   multithreaded_client_flow_control
   )

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/bc601405/examples/cpp/broker.cpp
--
diff --git a/examples/cpp/broker.cpp b/examples/cpp/broker.cpp
index a1c379b..ea21e74 100644
--- a/examples/cpp/broker.cpp
+++ b/examples/cpp/broker.cpp
@@ -17,6 +17,8 @@
  * under the License.
  */
 
+#define PN_CPP_USE_DEPRECATED_API 1
+
 #include "options.hpp"
 
 #include 
@@ -24,7 +26,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/bc601405/examples/cpp/example_test.py
--
diff --git a/examples/cpp/example_test.py b/examples/cpp/example_test.py
index 6dd8587..bc4c6e6 100644
--- a/examples/cpp/example_test.py
+++ b/examples/cpp/example_test.py
@@ -142,7 +142,7 @@ class ContainerExampleTest(BrokerTestCase):
 send.wait_exit())
 
 def test_request_response(self):
-server = self.proc(["server", "-a", self.addr])
+server = self.proc(["server", self.addr, "example"]) # self.addr has 
the connection info
 server.wait_re("connected")
 self.assertMultiLineEqual(CLIENT_EXPECT,
  self.proc(["client", "-a", self.addr]).wait_exit())

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/bc601405/examples/cpp/helloworld.cpp
--
diff --git a/examples/cpp/helloworld.cpp b/examples/cpp/helloworld.cpp
index b9f5b45..5962826 100644
--- a/examples/cpp/helloworld.cpp
+++ b/examples/cpp/helloworld.cpp
@@ -25,26 +25,26 @@
 #include 
 #include 
 #include 
-#include 
 
 #include 
 
 #include "fake_cpp11.hpp"
 
 class hello_world : public proton::messaging_handler {
-  private:
-proton::url url;
+std::string conn_url_;
+std::string addr_;
 
   public:
-hello_world(const std::string& u) : url(u) {}
+hello_world(const std::string& u, const std::string& a) :
+conn_url_(u), addr_(a) {}
 
 void on_container_start(proton::container& c) OVERRIDE {
-c.connect(url);
+

qpid-proton git commit: PROTON-1534: BlockingConnection proper cleanup after LinkDetached exception

[cliffjansen]

Repository: qpid-proton
Updated Branches:
  refs/heads/master b9d64d66c -> 47c9ae01d


PROTON-1534: BlockingConnection proper cleanup after LinkDetached exception


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

Branch: refs/heads/master
Commit: 47c9ae01dcbdbfffc0a4e78b4648171896d0f2a7
Parents: b9d64d6
Author: Clifford Jansen 
Authored: Thu Oct 12 14:04:15 2017 -0700
Committer: Clifford Jansen 
Committed: Thu Oct 12 14:05:50 2017 -0700

--
 proton-c/bindings/python/proton/utils.py | 35 ++-
 1 file changed, 23 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/47c9ae01/proton-c/bindings/python/proton/utils.py
--
diff --git a/proton-c/bindings/python/proton/utils.py 
b/proton-c/bindings/python/proton/utils.py
index 13f29a7..c9a3654 100644
--- a/proton-c/bindings/python/proton/utils.py
+++ b/proton-c/bindings/python/proton/utils.py
@@ -22,6 +22,7 @@ from proton import ConnectionException, Delivery, Endpoint, 
Handler, Link, LinkE
 from proton import ProtonException, Timeout, Url
 from proton.reactor import Container
 from proton.handlers import MessagingHandler, IncomingMessageHandler
+from cproton import pn_reactor_collector, pn_collector_release
 
 
 class BlockingLink(object):
@@ -43,7 +44,8 @@ class BlockingLink(object):
 def _checkClosed(self):
 if self.link.state & Endpoint.REMOTE_CLOSED:
 self.link.close()
-raise LinkDetached(self.link)
+if not self.connection.closing:
+raise LinkDetached(self.link)
 
 def close(self):
 self.link.close()
@@ -99,10 +101,12 @@ class Fetcher(MessagingHandler):
 def on_link_error(self, event):
 if event.link.state & Endpoint.LOCAL_ACTIVE:
 event.link.close()
-raise LinkDetached(event.link)
+if not self.connection.closing:
+raise LinkDetached(event.link)
 
 def on_connection_error(self, event):
-raise ConnectionClosed(event.connection)
+if not self.connection.closing:
+raise ConnectionClosed(event.connection)
 
 @property
 def has_message(self):
@@ -214,6 +218,7 @@ class BlockingConnection(Handler):
 self.container.start()
 self.url = Url(url).defaults()
 self.conn = None
+self.closing = False
 failed = True
 try:
 self.conn = self.container.connect(url=self.url, handler=self, 
ssl_domain=ssl_domain, reconnect=False, heartbeat=heartbeat, **kwargs)
@@ -239,19 +244,23 @@ class BlockingConnection(Handler):
 self, self.container.create_receiver(self.conn, address, 
name=name, dynamic=dynamic, handler=handler or fetcher, options=options), 
fetcher, credit=prefetch)
 
 def close(self):
-if not self.conn:
+# TODO: provide stronger interrupt protection on cleanup.  See PEP 419
+if self.closing:
 return
-self.conn.close()
+self.closing = True
+self.container.errors = []
 try:
-self.wait(lambda: not (self.conn.state & Endpoint.REMOTE_ACTIVE),
-  msg="Closing connection")
+if self.conn:
+self.conn.close()
+self.wait(lambda: not (self.conn.state & 
Endpoint.REMOTE_ACTIVE),
+  msg="Closing connection")
 finally:
 self.conn.free()
-# For cleanup, reactor needs to process PN_CONNECTION_FINAL
-# and all events with embedded contexts must be drained.
-self.run() # will not block any more
+# Nothing left to block on.  Allow reactor to clean up.
+self.run()
 self.conn = None
 self.container.global_handler = None # break circular ref: 
container to cadapter.on_error
+pn_collector_release(pn_reactor_collector(self.container._impl)) # 
straggling event may keep reactor alive
 self.container = None
 
 def _is_closed(self):
@@ -293,12 +302,14 @@ class BlockingConnection(Handler):
 def on_link_remote_close(self, event):
 if event.link.state & Endpoint.LOCAL_ACTIVE:
 event.link.close()
-raise LinkDetached(event.link)
+if not self.closing:
+raise LinkDetached(event.link)
 
 def on_connection_remote_close(self, event):
 if event.connection.state & Endpoint.LOCAL_ACTIVE:
 event.connection.close()
-raise 

[qpid-jms] Git Push Summary

[tabish]

Repository: qpid-jms
Updated Branches:
  refs/heads/connection-consumer-2 [deleted] f0042a6ba

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

qpid-jms git commit: QPIDJMS-339 optionally read the key and trust store types from env

[tabish]

Repository: qpid-jms
Updated Branches:
  refs/heads/master f6c95d448 -> 475ff58fe


QPIDJMS-339 optionally read the key and trust store types from env

Use the standard java system properties to attempt to read key and trust
store types from. 

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

Branch: refs/heads/master
Commit: 475ff58fed092ae96ce106b93f947553835a1dc1
Parents: f6c95d4
Author: Timothy Bish 
Authored: Thu Oct 12 15:41:56 2017 -0400
Committer: Timothy Bish 
Committed: Thu Oct 12 15:41:56 2017 -0400

--
 .../jms/transports/TransportSslOptions.java |  8 +++-
 .../jms/integration/SslIntegrationTest.java | 48 ++--
 2 files changed, 49 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/475ff58f/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/TransportSslOptions.java
--
diff --git 
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/TransportSslOptions.java
 
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/TransportSslOptions.java
index 0eac9e3..0fec49a 100644
--- 
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/TransportSslOptions.java
+++ 
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/TransportSslOptions.java
@@ -38,16 +38,18 @@ public class TransportSslOptions extends TransportOptions {
 public static final int DEFAULT_SSL_PORT = 5671;
 
 private static final String JAVAX_NET_SSL_KEY_STORE = 
"javax.net.ssl.keyStore";
+private static final String JAVAX_NET_SSL_KEY_STORE_TYPE = 
"javax.net.ssl.keyStoreType";
 private static final String JAVAX_NET_SSL_KEY_STORE_PASSWORD = 
"javax.net.ssl.keyStorePassword";
 private static final String JAVAX_NET_SSL_TRUST_STORE = 
"javax.net.ssl.trustStore";
+private static final String JAVAX_NET_SSL_TRUST_STORE_TYPE = 
"javax.net.ssl.trustStoreType";
 private static final String JAVAX_NET_SSL_TRUST_STORE_PASSWORD = 
"javax.net.ssl.trustStorePassword";
 
 private String keyStoreLocation;
 private String keyStorePassword;
 private String trustStoreLocation;
 private String trustStorePassword;
-private String keyStoreType = DEFAULT_STORE_TYPE;
-private String trustStoreType = DEFAULT_STORE_TYPE;
+private String keyStoreType;
+private String trustStoreType;
 private String[] enabledCipherSuites;
 private String[] disabledCipherSuites;
 private String[] enabledProtocols;
@@ -62,8 +64,10 @@ public class TransportSslOptions extends TransportOptions {
 
 public TransportSslOptions() {
 setKeyStoreLocation(System.getProperty(JAVAX_NET_SSL_KEY_STORE));
+setKeyStoreType(System.getProperty(JAVAX_NET_SSL_KEY_STORE_TYPE, 
DEFAULT_STORE_TYPE));
 
setKeyStorePassword(System.getProperty(JAVAX_NET_SSL_KEY_STORE_PASSWORD));
 setTrustStoreLocation(System.getProperty(JAVAX_NET_SSL_TRUST_STORE));
+setTrustStoreType(System.getProperty(JAVAX_NET_SSL_TRUST_STORE_TYPE, 
DEFAULT_STORE_TYPE));
 
setTrustStorePassword(System.getProperty(JAVAX_NET_SSL_TRUST_STORE_PASSWORD));
 }
 

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/475ff58f/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SslIntegrationTest.java
--
diff --git 
a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SslIntegrationTest.java
 
b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SslIntegrationTest.java
index 14c3531..9e25779 100644
--- 
a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SslIntegrationTest.java
+++ 
b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SslIntegrationTest.java
@@ -49,12 +49,17 @@ import org.junit.Test;
 public class SslIntegrationTest extends QpidJmsTestCase {
 
 private static final String BROKER_JKS_KEYSTORE = 
"src/test/resources/broker-jks.keystore";
+private static final String BROKER_PKCS12_KEYSTORE = 
"src/test/resources/broker-pkcs12.keystore";
 private static final String BROKER_JKS_TRUSTSTORE = 
"src/test/resources/broker-jks.truststore";
+private static final String BROKER_PKCS12_TRUSTSTORE = 
"src/test/resources/broker-pkcs12.truststore";
 private static final String CLIENT_MULTI_KEYSTORE = 
"src/test/resources/client-multiple-keys-jks.keystore";
 private static final String CLIENT_JKS_TRUSTSTORE = 
"src/test/resources/client-jks.truststore";
+private static final String CLIENT_PKCS12_TRUSTSTORE = 

[2/2] qpid-jms git commit: This closes #13

[tabish]

This closes #13


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

Branch: refs/heads/master
Commit: f6c95d4484fa8a1b03bf302d07ae875b656c9225
Parents: 9c7c10d 83b76d3
Author: Timothy Bish 
Authored: Thu Oct 12 14:24:03 2017 -0400
Committer: Timothy Bish 
Committed: Thu Oct 12 14:24:03 2017 -0400

--
 .../jms/transports/TransportSslOptions.java | 44 +++
 .../qpid/jms/transports/TransportSupport.java   |  4 +-
 .../jms/transports/TransportSslOptionsTest.java |  9 ++--
 .../netty/NettySslTransportFactoryTest.java | 56 +++-
 4 files changed, 97 insertions(+), 16 deletions(-)
--



-
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-7969: [Stress Test Tools] Add ability into StressTestClient to pause indefinitely after creation of test session and before session close

[orudyy]

Repository: qpid-broker-j
Updated Branches:
  refs/heads/master 39a6419b0 -> b53d39aab


QPID-7969: [Stress Test Tools] Add ability into StressTestClient to pause 
indefinitely after creation of test session and before session close


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/b53d39aa
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/b53d39aa
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/b53d39aa

Branch: refs/heads/master
Commit: b53d39aab93fe1a71920c21cae60debc075f4a8b
Parents: 39a6419
Author: Alex Rudyy 
Authored: Thu Oct 12 16:59:38 2017 +0100
Committer: Alex Rudyy 
Committed: Thu Oct 12 16:59:38 2017 +0100

--
 .../org/apache/qpid/tools/StressTestClient.java | 198 ---
 1 file changed, 125 insertions(+), 73 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/b53d39aa/tools/src/main/java/org/apache/qpid/tools/StressTestClient.java
--
diff --git a/tools/src/main/java/org/apache/qpid/tools/StressTestClient.java 
b/tools/src/main/java/org/apache/qpid/tools/StressTestClient.java
index 566ce42..fb0dd1e 100644
--- a/tools/src/main/java/org/apache/qpid/tools/StressTestClient.java
+++ b/tools/src/main/java/org/apache/qpid/tools/StressTestClient.java
@@ -70,7 +70,11 @@ public class StressTestClient
 private static final String CLOSE_SESSION_ARG = "closeSession";
 private static final String PAUSE_AFTER_CONNECTION_OPEN_ARG = 
"pauseAfterConnectionOpen";
 private static final String PAUSE_BEFORE_CONNECTION_CLOSE_ARG = 
"pauseBeforeConnectionClose";
-private static final String ITERATIONS = "iterations";
+private static final String CLOSE_PRODUCERS_ARG = "closeProducers";
+private static final String PAUSE_AFTER_SESSION_CREATE_ARG = 
"pauseAfterSessionCreate";
+private static final String PAUSE_BEFORE_SESSION_CLOSE_ARG = 
"pauseBeforeSessionClose";
+private static final String SESSION_ITERATIONS_ARG = "sessionIterations";
+private static final String MESSAGING_ITERATIONS_ARG = 
"messagingIterations";
 private static final String CONSUMER_MESSAGE_COUNT = 
"consumerMessageCount";
 private static final String CONSUMER_SELECTOR = "selector";
 
@@ -96,7 +100,11 @@ public class StressTestClient
 private static final String CLOSE_SESSION_DEFAULT = "false";
 private static final String PAUSE_AFTER_CONNECTION_OPEN_DEFAULT = "false";
 private static final String PAUSE_BEFORE_CONNECTION_CLOSE_DEFAULT = 
"false";
-private static final String ITERATIONS_DEFAULT = "1";
+private static final String CLOSE_PRODUCERS_DEFAULT = "false";
+private static final String PAUSE_AFTER_SESSION_CREATE_DEFAULT = "false";
+private static final String PAUSE_BEFORE_SESSION_CLOSE_DEFAULT = "false";
+private static final String SESSION_ITERATIONS_DEFAULT = "1";
+private static final String MESSAGING_ITERATIONS_DEFAULT = "1";
 private static final String CONSUMERS_SELECTOR_DEFAULT = "";
 private static final String CLASS = "StressTestClient";
 private static final String DISABLE_MESSAGE_ID_DEFAULT = 
Boolean.FALSE.toString();
@@ -130,7 +138,11 @@ public class StressTestClient
 options.put(CLOSE_SESSION_ARG, CLOSE_SESSION_DEFAULT);
 options.put(PAUSE_AFTER_CONNECTION_OPEN_ARG, 
PAUSE_AFTER_CONNECTION_OPEN_DEFAULT);
 options.put(PAUSE_BEFORE_CONNECTION_CLOSE_ARG, 
PAUSE_BEFORE_CONNECTION_CLOSE_DEFAULT);
-options.put(ITERATIONS, ITERATIONS_DEFAULT);
+options.put(CLOSE_PRODUCERS_ARG, CLOSE_PRODUCERS_DEFAULT);
+options.put(PAUSE_AFTER_SESSION_CREATE_ARG, 
PAUSE_AFTER_SESSION_CREATE_DEFAULT);
+options.put(PAUSE_BEFORE_SESSION_CLOSE_ARG, 
PAUSE_BEFORE_SESSION_CLOSE_DEFAULT);
+options.put(SESSION_ITERATIONS_ARG, SESSION_ITERATIONS_DEFAULT);
+options.put(MESSAGING_ITERATIONS_ARG, MESSAGING_ITERATIONS_DEFAULT);
 options.put(CONSUMER_SELECTOR, CONSUMERS_SELECTOR_DEFAULT);
 options.put(CONSUMER_MESSAGE_COUNT, "");
 
@@ -190,7 +202,11 @@ public class StressTestClient
 boolean closeSession = Boolean.valueOf(options.get(CLOSE_SESSION_ARG));
 boolean pauseAfterConnectionOpen = 
Boolean.valueOf(options.get(PAUSE_AFTER_CONNECTION_OPEN_ARG));
 boolean pauseBeforeConnectionClose = 
Boolean.valueOf(options.get(PAUSE_BEFORE_CONNECTION_CLOSE_ARG));
-int iterations = Integer.parseInt(options.get(ITERATIONS));
+boolean closeProducers = 
Boolean.valueOf(options.get(CLOSE_PRODUCERS_ARG));
+boolean pauseAfterSessionCreate = 
Boolean.valueOf(options.get(PAUSE_AFTER_SESSION_CREATE_ARG));
+boolean pauseBeforeSessionClose = 

svn commit: r22394 - /dev/qpid/proton-j/0.23.0-rc1/

[robbie]

Author: robbie
Date: Thu Oct 12 15:30:40 2017
New Revision: 22394

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

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

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

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

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

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

Added: dev/qpid/proton-j/0.23.0-rc1/apache-qpid-proton-j-0.23.0-bin.tar.gz.md5
==
--- dev/qpid/proton-j/0.23.0-rc1/apache-qpid-proton-j-0.23.0-bin.tar.gz.md5 
(added)
+++ dev/qpid/proton-j/0.23.0-rc1/apache-qpid-proton-j-0.23.0-bin.tar.gz.md5 Thu 
Oct 12 15:30:40 2017
@@ -0,0 +1 @@
+f63fe9bd2c35cbe919af104713c6bec1  apache-qpid-proton-j-0.23.0-bin.tar.gz

Added: 
dev/qpid/proton-j/0.23.0-rc1/apache-qpid-proton-j-0.23.0-bin.tar.gz.sha512
==
--- dev/qpid/proton-j/0.23.0-rc1/apache-qpid-proton-j-0.23.0-bin.tar.gz.sha512 
(added)
+++ dev/qpid/proton-j/0.23.0-rc1/apache-qpid-proton-j-0.23.0-bin.tar.gz.sha512 
Thu Oct 12 15:30:40 2017
@@ -0,0 +1 @@
+88f499b732f74b1bbab8992490d7a087f9c7b9f233e0ae922b780e6fc85d44a2b061691c6aaa72c620e7cb14a3423ea663eccfd357bb784c587f9aa4d22284f3
  apache-qpid-proton-j-0.23.0-bin.tar.gz

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

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

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

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

Added: dev/qpid/proton-j/0.23.0-rc1/apache-qpid-proton-j-0.23.0-src.tar.gz.md5
==
--- dev/qpid/proton-j/0.23.0-rc1/apache-qpid-proton-j-0.23.0-src.tar.gz.md5 
(added)
+++ dev/qpid/proton-j/0.23.0-rc1/apache-qpid-proton-j-0.23.0-src.tar.gz.md5 Thu 
Oct 12 15:30:40 2017
@@ -0,0 +1 @@
+e60aeac00dc52f4fd6951b199b32da03  apache-qpid-proton-j-0.23.0-src.tar.gz

Added: 
dev/qpid/proton-j/0.23.0-rc1/apache-qpid-proton-j-0.23.0-src.tar.gz.sha512
==
--- dev/qpid/proton-j/0.23.0-rc1/apache-qpid-proton-j-0.23.0-src.tar.gz.sha512 
(added)
+++ dev/qpid/proton-j/0.23.0-rc1/apache-qpid-proton-j-0.23.0-src.tar.gz.sha512 
Thu Oct 12 15:30:40 2017
@@ -0,0 +1 @@
+eb16509e3fd85ae42628c54d488d4e579e12b806a18d61ebebd1e7aef78151af8f3168707862fc89cd3cb7a3189b8dfc139ce3d47b19a321a52060a20a943c35
  apache-qpid-proton-j-0.23.0-src.tar.gz



-
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-7967: [Java Broker] Fix context variables description

[orudyy]

Repository: qpid-broker-j
Updated Branches:
  refs/heads/master 5b10b018b -> 39a6419b0


QPID-7967: [Java Broker] Fix context variables description


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/39a6419b
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/39a6419b
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/39a6419b

Branch: refs/heads/master
Commit: 39a6419b0686b83106ce98c00ea0945c50e433df
Parents: 5b10b01
Author: Alex Rudyy 
Authored: Thu Oct 12 15:54:17 2017 +0100
Committer: Alex Rudyy 
Committed: Thu Oct 12 15:54:17 2017 +0100

--
 .../src/main/java/org/apache/qpid/server/model/port/AmqpPort.java  | 2 +-
 .../src/main/java/org/apache/qpid/server/model/port/HttpPort.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/39a6419b/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java 
b/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
index d1d4e01..295367d 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
@@ -123,7 +123,7 @@ public interface AmqpPort> extends 
Port
 
 String TLS_SESSION_CACHE_SIZE = "qpid.port.amqp.tlsSessionCacheSize";
 @SuppressWarnings("unused")
-@ManagedContextDefault(name = TLS_SESSION_CACHE_SIZE, description = "TLS 
session cache size for AMQP ports (seconds).")
+@ManagedContextDefault(name = TLS_SESSION_CACHE_SIZE, description = "TLS 
session cache size for AMQP ports.")
 int DEFAULT_TLS_SESSION_CACHE_SIZE = 100;
 
 String CONNECTION_PROPERTY_ENRICHERS = 
"qpid.port.connection_property_enrichers";

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/39a6419b/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPort.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPort.java 
b/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPort.java
index cc61281..131afa3 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPort.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPort.java
@@ -69,7 +69,7 @@ public interface HttpPort> extends 
Port
 
 String TLS_SESSION_CACHE_SIZE = "qpid.port.http.tlsSessionCacheSize";
 @SuppressWarnings("unused")
-@ManagedContextDefault(name = TLS_SESSION_CACHE_SIZE, description = "TLS 
session cache size for HTTP ports (seconds).")
+@ManagedContextDefault(name = TLS_SESSION_CACHE_SIZE, description = "TLS 
session cache size for HTTP ports.")
 int DEFAULT_TLS_SESSION_CACHE_SIZE = 1000;
 
 @ManagedAttribute(defaultValue = "*")


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

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

[robbie]

Repository: qpid-proton-j
Updated Branches:
  refs/heads/master f8e66894f -> cb3b9f4d5


[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/cb3b9f4d
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/tree/cb3b9f4d
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/diff/cb3b9f4d

Branch: refs/heads/master
Commit: cb3b9f4d51e1ee14a5f455eb23dd36415e0433e7
Parents: f8e6689
Author: Robert Gemmell 
Authored: Thu Oct 12 15:53:41 2017 +0100
Committer: Robert Gemmell 
Committed: Thu Oct 12 15:53:41 2017 +0100

--
 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/pom.xml| 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/cb3b9f4d/apache-qpid-proton-j/pom.xml
--
diff --git a/apache-qpid-proton-j/pom.xml b/apache-qpid-proton-j/pom.xml
index 15d80f0..7d24347 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.23.0
+0.24.0-SNAPSHOT
 ../pom.xml
   
   4.0.0

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/cb3b9f4d/examples/engine/pom.xml
--
diff --git a/examples/engine/pom.xml b/examples/engine/pom.xml
index c4ef3ed..42833b4 100644
--- a/examples/engine/pom.xml
+++ b/examples/engine/pom.xml
@@ -19,7 +19,7 @@
   
 org.apache.qpid
 proton-j-parent
-0.23.0
+0.24.0-SNAPSHOT
 ../../pom.xml
   
   4.0.0

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/cb3b9f4d/examples/reactor/pom.xml
--
diff --git a/examples/reactor/pom.xml b/examples/reactor/pom.xml
index af26735..fa6371c 100644
--- a/examples/reactor/pom.xml
+++ b/examples/reactor/pom.xml
@@ -19,7 +19,7 @@
   
 org.apache.qpid
 proton-j-parent
-0.23.0
+0.24.0-SNAPSHOT
 ../../pom.xml
   
   4.0.0

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/cb3b9f4d/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 6ebc5e2..32856c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 
   org.apache.qpid
   proton-j-parent
-  0.23.0
+  0.24.0-SNAPSHOT
   pom
 
   Proton-J Parent
@@ -169,7 +169,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.23.0
+HEAD
   
   
 https://issues.apache.org/jira/browse/PROTON

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/cb3b9f4d/proton-j/pom.xml
--
diff --git a/proton-j/pom.xml b/proton-j/pom.xml
index 09c7c8d..6c6e954 100644
--- a/proton-j/pom.xml
+++ b/proton-j/pom.xml
@@ -19,7 +19,7 @@
   
 org.apache.qpid
 proton-j-parent
-0.23.0
+0.24.0-SNAPSHOT
   
   4.0.0
 

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/cb3b9f4d/tests/pom.xml
--
diff --git a/tests/pom.xml b/tests/pom.xml
index 7dbf404..0612daa 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -23,7 +23,7 @@
   
 org.apache.qpid
 proton-j-parent
-0.23.0
+0.24.0-SNAPSHOT
   
 
   proton-tests


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

qpid-proton git commit: PROTON-1625: flush received data from aborted messages

[chug]

Repository: qpid-proton
Updated Branches:
  refs/heads/master 174747c03 -> b9d64d66c


PROTON-1625: flush received data from aborted messages


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

Branch: refs/heads/master
Commit: b9d64d66c2851e005279fa78f770eed75407536d
Parents: 174747c
Author: Chuck Rolke 
Authored: Thu Oct 12 10:53:33 2017 -0400
Committer: Chuck Rolke 
Committed: Thu Oct 12 10:53:33 2017 -0400

--
 examples/c/receive.c | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/b9d64d66/examples/c/receive.c
--
diff --git a/examples/c/receive.c b/examples/c/receive.c
index e77ef27..2a50166 100644
--- a/examples/c/receive.c
+++ b/examples/c/receive.c
@@ -109,6 +109,7 @@ static bool handle(app_data_t* app, pn_event_t* event) {
  m->size = 0;   /* Forget the data we accumulated */
  pn_delivery_settle(d); /* Free the delivery so we can receive the 
next message */
  pn_link_flow(l, 1);/* Replace credit for aborted message */
+ *m = pn_rwbytes_null;  /* Reset the buffer for the next message*/
} else if (recv < 0 && recv != PN_EOS) {/* Unexpected error */
  pn_condition_format(pn_link_condition(l), "broker", "PN_DELIVERY 
error: %s", pn_code(recv));
  pn_link_close(l);   /* Unexpected error, close the link */


-
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

[robbie]

Repository: qpid-proton-j
Updated Tags:  refs/tags/0.23.0 [created] e6d59f66e

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

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

[robbie]

Repository: qpid-proton-j
Updated Branches:
  refs/heads/master 1b858d4fc -> f8e66894f


[maven-release-plugin] prepare release 0.23.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/f8e66894
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/tree/f8e66894
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/diff/f8e66894

Branch: refs/heads/master
Commit: f8e66894f621380e241c088ce74ec1004308f95f
Parents: 1b858d4
Author: Robert Gemmell 
Authored: Thu Oct 12 15:52:36 2017 +0100
Committer: Robert Gemmell 
Committed: Thu Oct 12 15:52:36 2017 +0100

--
 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/pom.xml| 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/f8e66894/apache-qpid-proton-j/pom.xml
--
diff --git a/apache-qpid-proton-j/pom.xml b/apache-qpid-proton-j/pom.xml
index afb759f..15d80f0 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.23.0-SNAPSHOT
+0.23.0
 ../pom.xml
   
   4.0.0

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/f8e66894/examples/engine/pom.xml
--
diff --git a/examples/engine/pom.xml b/examples/engine/pom.xml
index 667e8a8..c4ef3ed 100644
--- a/examples/engine/pom.xml
+++ b/examples/engine/pom.xml
@@ -19,7 +19,7 @@
   
 org.apache.qpid
 proton-j-parent
-0.23.0-SNAPSHOT
+0.23.0
 ../../pom.xml
   
   4.0.0

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/f8e66894/examples/reactor/pom.xml
--
diff --git a/examples/reactor/pom.xml b/examples/reactor/pom.xml
index 29ab86a..af26735 100644
--- a/examples/reactor/pom.xml
+++ b/examples/reactor/pom.xml
@@ -19,7 +19,7 @@
   
 org.apache.qpid
 proton-j-parent
-0.23.0-SNAPSHOT
+0.23.0
 ../../pom.xml
   
   4.0.0

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/f8e66894/pom.xml
--
diff --git a/pom.xml b/pom.xml
index f7a710e..6ebc5e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 
   org.apache.qpid
   proton-j-parent
-  0.23.0-SNAPSHOT
+  0.23.0
   pom
 
   Proton-J Parent
@@ -169,7 +169,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.23.0
   
   
 https://issues.apache.org/jira/browse/PROTON

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/f8e66894/proton-j/pom.xml
--
diff --git a/proton-j/pom.xml b/proton-j/pom.xml
index af8efa2..09c7c8d 100644
--- a/proton-j/pom.xml
+++ b/proton-j/pom.xml
@@ -19,7 +19,7 @@
   
 org.apache.qpid
 proton-j-parent
-0.23.0-SNAPSHOT
+0.23.0
   
   4.0.0
 

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/f8e66894/tests/pom.xml
--
diff --git a/tests/pom.xml b/tests/pom.xml
index 5e9ea07..7dbf404 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -23,7 +23,7 @@
   
 org.apache.qpid
 proton-j-parent
-0.23.0-SNAPSHOT
+0.23.0
   
 
   proton-tests


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

qpid-proton git commit: PROTON-1623: append new data to existing data

[chug]

Repository: qpid-proton
Updated Branches:
  refs/heads/master 884ec562b -> 174747c03


PROTON-1623: append new data to existing data


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

Branch: refs/heads/master
Commit: 174747c030050bb5fc75f342ca54a57c769874bf
Parents: 884ec56
Author: Chuck Rolke 
Authored: Thu Oct 12 10:47:58 2017 -0400
Committer: Chuck Rolke 
Committed: Thu Oct 12 10:47:58 2017 -0400

--
 examples/c/receive.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/174747c0/examples/c/receive.c
--
diff --git a/examples/c/receive.c b/examples/c/receive.c
index 1eeba43..e77ef27 100644
--- a/examples/c/receive.c
+++ b/examples/c/receive.c
@@ -100,9 +100,10 @@ static bool handle(app_data_t* app, pn_event_t* event) {
size_t size = pn_delivery_pending(d);
pn_rwbytes_t* m = >msgin; /* Append data to incoming message 
buffer */
int recv;
+   size_t oldsize = m->size;
m->size += size;
m->start = (char*)realloc(m->start, m->size);
-   recv = pn_link_recv(l, m->start, m->size);
+   recv = pn_link_recv(l, m->start + oldsize, m->size);
if (recv == PN_ABORTED) {
  fprintf(stderr, "Message aborted\n");
  m->size = 0;   /* Forget the data we accumulated */


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

qpid-proton git commit: PROTON-1624: Handle messages larger than 128 bytes

[chug]

Repository: qpid-proton
Updated Branches:
  refs/heads/master e1425d8f0 -> 884ec562b


PROTON-1624: Handle messages larger than 128 bytes


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

Branch: refs/heads/master
Commit: 884ec562ba7224ed05ff7bafcf966965a39026ab
Parents: e1425d8
Author: Chuck Rolke 
Authored: Thu Oct 12 10:38:23 2017 -0400
Committer: Chuck Rolke 
Committed: Thu Oct 12 10:40:17 2017 -0400

--
 examples/c/send.c | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/884ec562/examples/c/send.c
--
diff --git a/examples/c/send.c b/examples/c/send.c
index 6e5966c..1af74f8 100644
--- a/examples/c/send.c
+++ b/examples/c/send.c
@@ -80,6 +80,7 @@ static pn_bytes_t encode_message(app_data_t* app) {
 app->message_buffer.size *= 2;
 app->message_buffer.start = (char*)realloc(app->message_buffer.start, 
app->message_buffer.size);
 mbuf.size = app->message_buffer.size;
+mbuf.start = app->message_buffer.start;
   }
   if (status != 0) {
 fprintf(stderr, "error encoding message: %s\n", 
pn_error_text(pn_message_error(message)));


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

qpid-proton git commit: PROTON-1616: C/C++ fix issues reported by coverity

[aconway]

Repository: qpid-proton
Updated Branches:
  refs/heads/master 87bd8d97e -> e1425d8f0


PROTON-1616: C/C++ fix issues reported by coverity

See https://scan4.coverity.com/reports.htm#v30998/p10556


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

Branch: refs/heads/master
Commit: e1425d8f0e3da391ae39ff98c5476d211b910cba
Parents: 87bd8d9
Author: Alan Conway 
Authored: Thu Oct 12 07:47:59 2017 -0400
Committer: Alan Conway 
Committed: Thu Oct 12 09:57:05 2017 -0400

--
 examples/c/broker.c  |  8 +--
 examples/c/direct.c  |  1 +
 examples/cpp/scheduled_send_03.cpp   |  1 +
 examples/cpp/service_bus.cpp |  3 +-
 proton-c/bindings/cpp/src/value_test.cpp | 92 ++-
 proton-c/src/core/connection_driver.c|  3 +-
 proton-c/src/proactor/epoll.c| 16 +++--
 proton-c/src/sasl/default_sasl.c |  2 +-
 proton-c/src/ssl/openssl.c   |  5 +-
 proton-c/src/tests/test_tools.h  |  2 +-
 10 files changed, 72 insertions(+), 61 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/e1425d8f/examples/c/broker.c
--
diff --git a/examples/c/broker.c b/examples/c/broker.c
index f862133..d6cb753 100644
--- a/examples/c/broker.c
+++ b/examples/c/broker.c
@@ -70,7 +70,7 @@ typedef struct queue_t {
 
 static void queue_init(queue_t *q, const char* name, queue_t *next) {
   pthread_mutex_init(>lock, NULL);
-  strncpy(q->name, name, sizeof(q->name));
+  strncpy(q->name, name, sizeof(q->name)-1);
   VEC_INIT(q->messages);
   VEC_INIT(q->waiting);
   q->next = next;
@@ -80,7 +80,6 @@ static void queue_init(queue_t *q, const char* name, queue_t 
*next) {
 static void queue_destroy(queue_t *q) {
   size_t i;
   pthread_mutex_destroy(>lock);
-  free(q->name);
   for (i = 0; i < q->messages.len; ++i)
 free(q->messages.data[i].start);
   VEC_FINAL(q->messages);
@@ -169,8 +168,9 @@ void queues_init(queues_t *qs) {
 }
 
 void queues_destroy(queues_t *qs) {
-  queue_t *q;
-  for (q = qs->queues; q; q = q->next) {
+  while (qs->queues) {
+queue_t *q = qs->queues;
+qs->queues = qs->queues->next;
 queue_destroy(q);
 free(q);
   }

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/e1425d8f/examples/c/direct.c
--
diff --git a/examples/c/direct.c b/examples/c/direct.c
index 63ae090..fb737a1 100644
--- a/examples/c/direct.c
+++ b/examples/c/direct.c
@@ -245,6 +245,7 @@ static bool handle(app_data_t* app, pn_event_t* event) {
  pn_transport_t *t = pn_event_transport(event);
  pn_transport_require_auth(t, false);
  pn_sasl_allowed_mechs(pn_sasl(t), "ANONYMOUS");
+ break;
}
case PN_CONNECTION_REMOTE_OPEN: {
  pn_connection_open(pn_event_connection(event)); /* Complete the open */

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/e1425d8f/examples/cpp/scheduled_send_03.cpp
--
diff --git a/examples/cpp/scheduled_send_03.cpp 
b/examples/cpp/scheduled_send_03.cpp
index 5299bde..d3ba8ab 100644
--- a/examples/cpp/scheduled_send_03.cpp
+++ b/examples/cpp/scheduled_send_03.cpp
@@ -49,6 +49,7 @@ class scheduled_sender : public proton::messaging_handler {
 url(s),
 interval(int(d*proton::duration::SECOND.milliseconds())), // Send 
interval.
 timeout(int(t*proton::duration::SECOND.milliseconds())), // Cancel 
after timeout.
+work_queue(0),
 ready(true),// Ready to send.
 canceled(false) // Canceled.
 {}

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/e1425d8f/examples/cpp/service_bus.cpp
--
diff --git a/examples/cpp/service_bus.cpp b/examples/cpp/service_bus.cpp
index 3ec7ad1..4b16a62 100644
--- a/examples/cpp/service_bus.cpp
+++ b/examples/cpp/service_bus.cpp
@@ -263,7 +263,8 @@ class sequence : public proton::messaging_handler {
   public:
 static sequence *the_sequence;
 
-sequence (const std::string , const std::string ) : sequence_no(0),
+sequence (const std::string , const std::string ) :
+container(0), sequence_no(0),
 snd(c, e), rcv_red(c, e, "red"), rcv_green(c, e, "green"), rcv_null(c, 
e, NULL) {
 the_sequence = this;
 }

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/e1425d8f/proton-c/bindings/cpp/src/value_test.cpp

qpid-broker-j git commit: QPID-7969: [Stress Test Tools] Add ability into StressTestClient to pause indefinitely after opening of test connection and before connection close

[orudyy]

Repository: qpid-broker-j
Updated Branches:
  refs/heads/master fce924717 -> 5b10b018b


QPID-7969: [Stress Test Tools] Add ability into StressTestClient to pause 
indefinitely after opening of test connection and before connection close


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/5b10b018
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/5b10b018
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/5b10b018

Branch: refs/heads/master
Commit: 5b10b018b28b0a3ddbc3e78df52c1a5d7716f973
Parents: fce9247
Author: Alex Rudyy 
Authored: Thu Oct 12 15:13:47 2017 +0100
Committer: Alex Rudyy 
Committed: Thu Oct 12 15:14:37 2017 +0100

--
 .../org/apache/qpid/tools/StressTestClient.java | 39 +++-
 1 file changed, 38 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/5b10b018/tools/src/main/java/org/apache/qpid/tools/StressTestClient.java
--
diff --git a/tools/src/main/java/org/apache/qpid/tools/StressTestClient.java 
b/tools/src/main/java/org/apache/qpid/tools/StressTestClient.java
index 4d8d227..566ce42 100644
--- a/tools/src/main/java/org/apache/qpid/tools/StressTestClient.java
+++ b/tools/src/main/java/org/apache/qpid/tools/StressTestClient.java
@@ -67,6 +67,9 @@ public class StressTestClient
 private static final String REPORT_MOD_ARG = "reportmod";
 private static final String TRANSACTED_ARG = "transacted";
 private static final String TX_BATCH_ARG = "txbatch";
+private static final String CLOSE_SESSION_ARG = "closeSession";
+private static final String PAUSE_AFTER_CONNECTION_OPEN_ARG = 
"pauseAfterConnectionOpen";
+private static final String PAUSE_BEFORE_CONNECTION_CLOSE_ARG = 
"pauseBeforeConnectionClose";
 private static final String ITERATIONS = "iterations";
 private static final String CONSUMER_MESSAGE_COUNT = 
"consumerMessageCount";
 private static final String CONSUMER_SELECTOR = "selector";
@@ -90,6 +93,9 @@ public class StressTestClient
 private static final String REPORT_MOD_DEFAULT = "1";
 private static final String TRANSACTED_DEFAULT = "false";
 private static final String TX_BATCH_DEFAULT = "1";
+private static final String CLOSE_SESSION_DEFAULT = "false";
+private static final String PAUSE_AFTER_CONNECTION_OPEN_DEFAULT = "false";
+private static final String PAUSE_BEFORE_CONNECTION_CLOSE_DEFAULT = 
"false";
 private static final String ITERATIONS_DEFAULT = "1";
 private static final String CONSUMERS_SELECTOR_DEFAULT = "";
 private static final String CLASS = "StressTestClient";
@@ -121,6 +127,9 @@ public class StressTestClient
 options.put(REPORT_MOD_ARG, REPORT_MOD_DEFAULT);
 options.put(TRANSACTED_ARG, TRANSACTED_DEFAULT);
 options.put(TX_BATCH_ARG, TX_BATCH_DEFAULT);
+options.put(CLOSE_SESSION_ARG, CLOSE_SESSION_DEFAULT);
+options.put(PAUSE_AFTER_CONNECTION_OPEN_ARG, 
PAUSE_AFTER_CONNECTION_OPEN_DEFAULT);
+options.put(PAUSE_BEFORE_CONNECTION_CLOSE_ARG, 
PAUSE_BEFORE_CONNECTION_CLOSE_DEFAULT);
 options.put(ITERATIONS, ITERATIONS_DEFAULT);
 options.put(CONSUMER_SELECTOR, CONSUMERS_SELECTOR_DEFAULT);
 options.put(CONSUMER_MESSAGE_COUNT, "");
@@ -178,6 +187,9 @@ public class StressTestClient
 int reportingMod = Integer.parseInt(options.get(REPORT_MOD_ARG));
 boolean transacted = Boolean.valueOf(options.get(TRANSACTED_ARG));
 int txBatch = Integer.parseInt(options.get(TX_BATCH_ARG));
+boolean closeSession = Boolean.valueOf(options.get(CLOSE_SESSION_ARG));
+boolean pauseAfterConnectionOpen = 
Boolean.valueOf(options.get(PAUSE_AFTER_CONNECTION_OPEN_ARG));
+boolean pauseBeforeConnectionClose = 
Boolean.valueOf(options.get(PAUSE_BEFORE_CONNECTION_CLOSE_ARG));
 int iterations = Integer.parseInt(options.get(ITERATIONS));
 String consumerSelector =  options.get(CONSUMER_SELECTOR);
 int consumerMessageCount = 
!"".equals(options.get(CONSUMER_MESSAGE_COUNT)) ?
@@ -236,6 +248,13 @@ public class StressTestClient
 
 connectionList.add(conn);
 conn.start();
+
+if (pauseAfterConnectionOpen)
+{
+System.out.println(String.format("Connection %d is 
open. Press any key to continue...", co));
+System.in.read();
+}
+
 for (int se= 1; se<= numSessions ; se++)
 {
 if( se % reportingMod == 0)
@@ -273,6 +292,7 @@ public class StressTestClient
 }
 
 

qpid-broker-j git commit: QPID-7965: Centralise setting of connection props

[rgodfrey]

Repository: qpid-broker-j
Updated Branches:
  refs/heads/master fc952cea2 -> fce924717


QPID-7965: Centralise setting of connection props


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/fce92471
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/fce92471
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/fce92471

Branch: refs/heads/master
Commit: fce924717643445931a836bf126917095c70b639
Parents: fc952ce
Author: rgodfrey 
Authored: Thu Oct 12 16:02:39 2017 +0200
Committer: rgodfrey 
Committed: Thu Oct 12 16:06:37 2017 +0200

--
 .../StandardConnectionPropertyEnricher.java | 115 +++
 .../SuppliedMapConnectionPropertyEnricher.java  |  67 +++
 .../apache/qpid/server/model/port/AmqpPort.java |  10 ++
 .../qpid/server/model/port/AmqpPortImpl.java|  30 -
 .../plugin/ConnectionPropertyEnricher.java  |  27 +
 .../v0_10/ServerConnectionDelegate.java |  46 ++--
 .../protocol/v0_8/AMQPConnection_0_8Impl.java   |  34 ++
 .../protocol/v1_0/AMQPConnection_1_0Impl.java   |  17 ++-
 8 files changed, 277 insertions(+), 69 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fce92471/broker-core/src/main/java/org/apache/qpid/server/connection/StandardConnectionPropertyEnricher.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/connection/StandardConnectionPropertyEnricher.java
 
b/broker-core/src/main/java/org/apache/qpid/server/connection/StandardConnectionPropertyEnricher.java
new file mode 100644
index 000..d7151df
--- /dev/null
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/connection/StandardConnectionPropertyEnricher.java
@@ -0,0 +1,115 @@
+/**
+ * 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.connection;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.qpid.server.common.ServerPropertyNames;
+import org.apache.qpid.server.configuration.CommonProperties;
+import org.apache.qpid.server.model.Broker;
+import org.apache.qpid.server.plugin.ConnectionPropertyEnricher;
+import org.apache.qpid.server.plugin.PluggableService;
+import org.apache.qpid.server.properties.ConnectionStartProperties;
+import org.apache.qpid.server.transport.AMQPConnection;
+
+@PluggableService
+public class StandardConnectionPropertyEnricher implements 
ConnectionPropertyEnricher
+{
+private static final Logger LOG = 
LoggerFactory.getLogger(StandardConnectionPropertyEnricher.class);
+
+@Override
+public Map addConnectionProperties(final AMQPConnection 
connection,
+   final Map existingProperties)
+{
+Map modifiedProperties = new 
LinkedHashMap<>(existingProperties);
+
+Broker broker = connection.getBroker();
+
+modifiedProperties.put(ServerPropertyNames.PRODUCT, 
CommonProperties.getProductName());
+modifiedProperties.put(ServerPropertyNames.VERSION, 
CommonProperties.getReleaseVersion());
+modifiedProperties.put(ServerPropertyNames.QPID_BUILD, 
CommonProperties.getBuildVersion());
+modifiedProperties.put(ServerPropertyNames.QPID_INSTANCE_NAME, 
broker.getName());
+
modifiedProperties.put(ConnectionStartProperties.QPID_VIRTUALHOST_PROPERTIES_SUPPORTED,
+   
String.valueOf(broker.isVirtualHostPropertiesNodeEnabled()));
+
+
modifiedProperties.put(ConnectionStartProperties.QPID_MESSAGE_COMPRESSION_SUPPORTED,
+   
String.valueOf(broker.isMessageCompressionEnabled()));
+
modifiedProperties.put(ConnectionStartProperties.QPID_QUEUE_LIFETIME_SUPPORTED, 
Boolean.TRUE.toString());
+
+
+

qpid-proton git commit: PROTON-1619: remove pn_connection_driver_log definitions

[aconway]

Repository: qpid-proton
Updated Branches:
  refs/heads/master 8a891c92b -> 87bd8d97e


PROTON-1619: remove pn_connection_driver_log definitions

removed definitions: pn_connection_driver_log, pn_connection_driver_logf, 
pn_connection_driver_vlogf


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

Branch: refs/heads/master
Commit: 87bd8d97e497e6ff5654a5fa4dcbe78a5d001be0
Parents: 8a891c9
Author: Alan Conway 
Authored: Thu Oct 12 08:51:06 2017 -0400
Committer: Alan Conway 
Committed: Thu Oct 12 08:52:17 2017 -0400

--
 proton-c/src/core/connection_driver.c | 8 
 1 file changed, 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/87bd8d97/proton-c/src/core/connection_driver.c
--
diff --git a/proton-c/src/core/connection_driver.c 
b/proton-c/src/core/connection_driver.c
index 12d4b28..7c0f597 100644
--- a/proton-c/src/core/connection_driver.c
+++ b/proton-c/src/core/connection_driver.c
@@ -166,14 +166,6 @@ void pn_connection_driver_errorf(pn_connection_driver_t 
*d, const char *name, co
   va_end(ap);
 }
 
-void pn_connection_driver_log(pn_connection_driver_t *d, const char *msg) {
-  pn_transport_log(d->transport, msg);
-}
-
-void pn_connection_driver_vlogf(pn_connection_driver_t *d, const char *fmt, 
va_list ap) {
-  pn_transport_vlogf(d->transport, fmt, ap);
-}
-
 pn_connection_driver_t* pn_event_batch_connection_driver(pn_event_batch_t 
*batch) {
   return (batch->next_event == batch_next) ?
 (pn_connection_driver_t*)((char*)batch - offsetof(pn_connection_driver_t, 
batch)) :


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

qpid-proton git commit: PROTON-1619: c rename/remove/un-export private functions

[aconway]

Repository: qpid-proton
Updated Branches:
  refs/heads/master 485cdbd3f -> 8a891c92b


PROTON-1619: c rename/remove/un-export private functions

renamed as pni_*:
pn_log_enabled, pn_logf_impl, pn_vlogf_impl - still exported for 
libqpid-proton-proactor
pn_message_get_extra, pn_message_with_extra - still exported for 
libqpid-proton-cpp

removed: pn_connection_driver_log, pn_connection_driver_logf, 
pn_connection_driver_vlogf

unexported: pni_parse_url - now private in extras/url.c


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

Branch: refs/heads/master
Commit: 8a891c92b7a4f56d009e1e437d979c3379fe4a6f
Parents: 485cdbd
Author: Alan Conway 
Authored: Thu Oct 12 06:56:00 2017 -0400
Committer: Alan Conway 
Committed: Thu Oct 12 08:20:01 2017 -0400

--
 proton-c/CMakeLists.txt |   3 +-
 proton-c/bindings/cpp/src/message.cpp   |  10 +-
 proton-c/include/proton/connection_driver.h |  19 +---
 proton-c/include/proton/message.h   |  11 ---
 proton-c/src/core/connection_driver.c   |   7 --
 proton-c/src/core/log.c |  14 +--
 proton-c/src/core/log_private.h |  14 +--
 proton-c/src/core/message-internal.h|  43 +
 proton-c/src/core/message.c |   6 +-
 proton-c/src/core/url-internal.c| 115 ---
 proton-c/src/core/url-internal.h|  32 ---
 proton-c/src/extra/url.c|  96 ++-
 proton-c/src/messenger/messenger.c  |   4 +-
 13 files changed, 165 insertions(+), 209 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/8a891c92/proton-c/CMakeLists.txt
--
diff --git a/proton-c/CMakeLists.txt b/proton-c/CMakeLists.txt
index 40d1d2e..6b6cfb4 100644
--- a/proton-c/CMakeLists.txt
+++ b/proton-c/CMakeLists.txt
@@ -412,7 +412,6 @@ set (qpid-proton-core
   src/core/autodetect.c
   src/core/transport.c
   src/core/message.c
-  src/core/url-internal.c
 )
 
 set (qpid-proton-include-generated
@@ -442,7 +441,7 @@ set (qpid-proton-private-includes
   src/core/data.h
   src/core/decoder.h
   src/core/max_align.h
-  src/core/url-internal.h
+  src/core/message-internal.h
   src/reactor/io/windows/iocp.h
   src/reactor/selector.h
   src/reactor/io.h

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/8a891c92/proton-c/bindings/cpp/src/message.cpp
--
diff --git a/proton-c/bindings/cpp/src/message.cpp 
b/proton-c/bindings/cpp/src/message.cpp
index 1fbdf70..5e9487b 100644
--- a/proton-c/bindings/cpp/src/message.cpp
+++ b/proton-c/bindings/cpp/src/message.cpp
@@ -32,8 +32,8 @@
 #include "proton_bits.hpp"
 #include "types_internal.hpp"
 
-#include 
-#include 
+#include "core/message-internal.h"
+#include "proton/delivery.h"
 
 #include 
 #include 
@@ -94,15 +94,15 @@ void swap(message& x, message& y) {
 
 pn_message_t *message::pn_msg() const {
 if (!pn_msg_) {
-pn_msg_ = pn_message_with_extra(sizeof(struct message::impl));
+pn_msg_ = pni_message_with_extra(sizeof(struct message::impl));
 // Construct impl in extra storage allocated with pn_msg_
-new (pn_message_get_extra(pn_msg_)) struct message::impl(pn_msg_);
+new (pni_message_get_extra(pn_msg_)) struct message::impl(pn_msg_);
 }
 return pn_msg_;
 }
 
 struct message::impl& message::impl() const {
-return *(struct message::impl*)pn_message_get_extra(pn_msg());
+return *(struct message::impl*)pni_message_get_extra(pn_msg());
 }
 
 message& message::operator=(const message& m) {

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/8a891c92/proton-c/include/proton/connection_driver.h
--
diff --git a/proton-c/include/proton/connection_driver.h 
b/proton-c/include/proton/connection_driver.h
index 89040af..1ad4469 100644
--- a/proton-c/include/proton/connection_driver.h
+++ b/proton-c/include/proton/connection_driver.h
@@ -218,7 +218,7 @@ PN_EXTERN bool 
pn_connection_driver_has_event(pn_connection_driver_t *);
 PN_EXTERN bool pn_connection_driver_finished(pn_connection_driver_t *);
 
 /**
- * Set IO error information.
+ * Set transport error.
  *
  * The name and formatted description are set on the transport condition, and
  * returned as a PN_TRANSPORT_ERROR event from 
pn_connection_driver_next_event().
@@ -229,26 +229,11 @@ PN_EXTERN bool 
pn_connection_driver_finished(pn_connection_driver_t *);
 PN_EXTERN 

qpid-broker-j git commit: QPID-7799: [Java Broker] Introduce operation to set and remove individual context variable

[orudyy]

Repository: qpid-broker-j
Updated Branches:
  refs/heads/master 538c917e6 -> d8e033abc


QPID-7799: [Java Broker] Introduce operation to set and remove individual 
context variable


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/d8e033ab
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/d8e033ab
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/d8e033ab

Branch: refs/heads/master
Commit: d8e033abc5a228fa5e4de18ec7e4a6aa700dc2bf
Parents: 538c917
Author: Alex Rudyy 
Authored: Thu Oct 12 12:04:07 2017 +0100
Committer: Alex Rudyy 
Committed: Thu Oct 12 12:04:07 2017 +0100

--
 .../server/model/AbstractConfiguredObject.java  | 17 +++
 .../qpid/server/model/ConfiguredObject.java | 13 ++
 .../singleton/AbstractConfiguredObjectTest.java | 49 
 3 files changed, 79 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d8e033ab/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
 
b/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
index 4b15161..3b01324 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
@@ -3184,6 +3184,23 @@ public abstract class AbstractConfiguredObject> im
 return map;
 }
 
+@Override
+public String setContextVariable(final String name, final String value)
+{
+Map context = new LinkedHashMap<>(getContext());
+String previousValue = context.put(name, value);
+setAttributes(Collections.singletonMap(CONTEXT, context));
+return previousValue;
+}
+
+@Override
+public String removeContextVariable(final String name)
+{
+Map context = new LinkedHashMap<>(getContext());
+String previousValue = context.remove(name);
+setAttributes(Collections.singletonMap(CONTEXT, context));
+return previousValue;
+}
 
 @Override
 public > Y findConfiguredObject(Class 
clazz, String name)

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d8e033ab/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java 
b/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java
index a38352f..6f70709 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java
@@ -176,6 +176,19 @@ public interface ConfiguredObject> extends Context
 Map getStatistics(@Param(name = "statistics", defaultValue 
= "[]",
 description = "Optional list of statistic values to retrieve") 
List statistics);
 
+@ManagedOperation(description = "Set context variable with given name to 
given value."
++ " Previous value is returned or null if 
not set directly on configured object.",
+changesConfiguredObjectState = true,
+skipAclCheck = true)
+String setContextVariable(@Param(name = "name", description = "Context 
variable name") String name,
+  @Param(name = "value", description = "Context 
variable value") String value);
+
+@ManagedOperation(description = "Remove context variable with given name."
++ " Variable value is returned or null if 
not set directly on configured object.",
+changesConfiguredObjectState = true,
+skipAclCheck = true)
+String removeContextVariable(@Param(name = "name", description = "Context 
variable name") String name);
+
 /**
  * Get the names of attributes that are set on this object
  *

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d8e033ab/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/AbstractConfiguredObjectTest.java
--
diff --git 
a/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/AbstractConfiguredObjectTest.java
 
b/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/AbstractConfiguredObjectTest.java
index e29ac7f..47461b3 100644
--- 

qpid-broker-j git commit: QPID-7799: [Java Broker] Replace StatisticsCounters with AtomicLongs and remove statistics reset functionality

[orudyy]

Repository: qpid-broker-j
Updated Branches:
  refs/heads/master d60f40a49 -> 538c917e6


QPID-7799: [Java Broker] Replace StatisticsCounters with AtomicLongs and remove 
statistics reset functionality


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/538c917e
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/538c917e
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/538c917e

Branch: refs/heads/master
Commit: 538c917e6c3252e9c6f482e783007c031b2a56d1
Parents: d60f40a
Author: Alex Rudyy 
Authored: Thu Oct 12 07:40:37 2017 +0100
Committer: Alex Rudyy 
Committed: Thu Oct 12 10:33:31 2017 +0100

--
 .../org/apache/qpid/server/model/Broker.java|   4 -
 .../apache/qpid/server/model/BrokerImpl.java|  81 ++-
 .../org/apache/qpid/server/model/Queue.java |   3 -
 .../apache/qpid/server/queue/AbstractQueue.java |   6 -
 .../qpid/server/queue/QueueStatistics.java  |  17 --
 .../qpid/server/stats/StatisticsCounter.java| 215 ---
 .../qpid/server/stats/StatisticsGatherer.java   |  52 ++---
 .../qpid/server/transport/AMQPConnection.java   |   4 +-
 .../transport/AbstractAMQPConnection.java   |  60 ++
 .../server/virtualhost/AbstractVirtualHost.java |  82 ++-
 .../virtualhost/QueueManagingVirtualHost.java   |   4 -
 .../server/stats/StatisticsCounterTest.java | 116 --
 .../server/protocol/v0_10/ServerSession.java|   2 +-
 .../qpid/server/protocol/v0_8/AMQChannel.java   |   2 +-
 .../v1_0/StandardReceivingLinkEndpoint.java |   5 +-
 15 files changed, 77 insertions(+), 576 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/538c917e/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
--
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java 
b/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
index cdc2189..e462b83 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
@@ -327,10 +327,6 @@ public interface Broker> extends 
ConfiguredObject, EventL
 void purgeUser(@Param(name="origin", description="The 
AuthenticationProvider the username is associated 
with")AuthenticationProvider origin,
@Param(name="username", description="The unqualified 
username that should be purged from the broker", mandatory = true)String 
username);
 
-@Override
-@ManagedOperation(description = "Resets statistics on this object and all 
child objects", changesConfiguredObjectState = false, nonModifying = true)
-void resetStatistics();
-
 //children
 Collection getVirtualHostNodes();
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/538c917e/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java 
b/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
index 97e2fad..7c484d3 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
@@ -40,6 +40,7 @@ import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.regex.Pattern;
 
 import javax.security.auth.Subject;
@@ -77,8 +78,6 @@ import 
org.apache.qpid.server.security.auth.SocketConnectionPrincipal;
 import org.apache.qpid.server.security.auth.UsernamePrincipal;
 import 
org.apache.qpid.server.security.auth.manager.SimpleAuthenticationManager;
 import org.apache.qpid.server.security.group.GroupPrincipal;
-import org.apache.qpid.server.stats.StatisticsCounter;
-import org.apache.qpid.server.stats.StatisticsGatherer;
 import org.apache.qpid.server.stats.StatisticsReportingTask;
 import org.apache.qpid.server.store.FileBasedSettings;
 import org.apache.qpid.server.store.preferences.PreferenceRecord;
@@ -115,7 +114,7 @@ public class BrokerImpl extends 
AbstractContainer implements Broker<
 
 private AuthenticationProvider _managementModeAuthenticationProvider;
 
-private final StatisticsCounter _messagesDelivered, _dataDelivered, 
_messagesReceived, _dataReceived;
+private final AtomicLong _messagesDelivered, _dataDelivered, 
_messagesReceived, _dataReceived;
 
 @ManagedAttributeField
 private int _statisticsReportingPeriod;
@@ -166,10 +165,10