qpid-proton git commit: handle connection closing, cleanup freeing

2017-05-30 Thread gsim 
Repository: qpid-proton
Updated Branches:
  refs/heads/PROTON-1488 fe5dffdde -> 5b69776c2


handle connection closing, cleanup freeing


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

Branch: refs/heads/PROTON-1488
Commit: 5b69776c2c4d73354144e29ea2dad35c1c57ee2d
Parents: fe5dffd
Author: Gordon Sim 
Authored: Tue May 30 21:12:57 2017 +0100
Committer: Gordon Sim 
Committed: Tue May 30 21:12:57 2017 +0100

--
 proton-c/src/sasl/remote_sasl.c | 119 ++-
 proton-c/src/sasl/sasl.c|   2 +-
 2 files changed, 92 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/5b69776c/proton-c/src/sasl/remote_sasl.c
--
diff --git a/proton-c/src/sasl/remote_sasl.c b/proton-c/src/sasl/remote_sasl.c
index 8721a51..55d02d2 100644
--- a/proton-c/src/sasl/remote_sasl.c
+++ b/proton-c/src/sasl/remote_sasl.c
@@ -37,6 +37,7 @@ const int8_t UPSTREAM_RESPONSE_RECEIVED = 2;
 const int8_t DOWNSTREAM_MECHANISMS_RECEIVED = 3;
 const int8_t DOWNSTREAM_CHALLENGE_RECEIVED = 4;
 const int8_t DOWNSTREAM_OUTCOME_RECEIVED = 5;
+const int8_t DOWNSTREAM_CLOSED = 6;
 
 typedef struct
 {
@@ -46,14 +47,16 @@ typedef struct
 char* selected_mechanism;
 pni_owned_bytes_t response;
 int8_t downstream_state;
+bool downstream_released;
 
 pn_connection_t* upstream;
 char* mechlist;
 pni_owned_bytes_t challenge;
 int8_t upstream_state;
+bool upstream_released;
 
+bool complete;
 pn_sasl_outcome_t outcome;
-int refcount;
 } pni_sasl_relay_t;
 
 void pni_copy_bytes(const pn_bytes_t* from, pni_owned_bytes_t* to)
@@ -76,9 +79,13 @@ pni_sasl_relay_t* new_pni_sasl_relay_t(const char* address)
 instance->mechlist = 0;
 instance->challenge.start = 0;
 instance->challenge.size = 0;
-instance->refcount = 1;
 instance->upstream_state = 0;
 instance->downstream_state = 0;
+instance->upstream_released = false;
+instance->downstream_released = false;
+instance->complete = false;
+instance->upstream = 0;
+instance->downstream = 0;
 return instance;
 }
 
@@ -89,14 +96,11 @@ void delete_pni_sasl_relay_t(pni_sasl_relay_t* instance)
 if (instance->selected_mechanism) free(instance->selected_mechanism);
 if (instance->response.start) free(instance->response.start);
 if (instance->challenge.start) free(instance->challenge.start);
-free(instance);
-}
-
-void release_pni_sasl_relay_t(pni_sasl_relay_t* instance)
-{
-if (instance && --(instance->refcount) == 0) {
-delete_pni_sasl_relay_t(instance);
+if (instance->downstream) {
+pn_connection_release(instance->downstream);
+instance->downstream = 0;
 }
+free(instance);
 }
 
 PN_HANDLE(REMOTE_SASL_CTXT)
@@ -162,18 +166,31 @@ bool remote_init_client(pn_transport_t* transport)
 pni_sasl_relay_t* impl = get_sasl_relay_context(conn);
 if (impl) {
 transport->sasl->impl_context = impl;
-impl->refcount++;
 return true;
 } else {
 return false;
-//return pni_init_client(transport);
 }
 }
 
 void remote_free(pn_transport_t *transport)
 {
-if (transport->sasl->impl_context) {
-release_pni_sasl_relay_t((pni_sasl_relay_t*) 
transport->sasl->impl_context);
+pni_sasl_relay_t* impl = (pni_sasl_relay_t*) transport->sasl->impl_context;
+if (impl) {
+if (transport->sasl->client) {
+impl->downstream_released = true;
+if (impl->upstream_released) {
+delete_pni_sasl_relay_t(impl);
+} else {
+pn_connection_wake(impl->upstream);
+}
+} else {
+impl->upstream_released = true;
+if (impl->downstream_released) {
+delete_pni_sasl_relay_t(impl);
+} else {
+pn_connection_wake(impl->downstream);
+}
+}
 }
 }
 
@@ -183,7 +200,7 @@ bool remote_prepare(pn_transport_t *transport)
 if (!impl) return false;
 if (transport->sasl->client) {
 if (impl->downstream_state == UPSTREAM_INIT_RECEIVED) {
-transport->sasl->selected_mechanism = impl->selected_mechanism;
+transport->sasl->selected_mechanism = 
pn_strdup(impl->selected_mechanism);
 transport->sasl->bytes_out.start = impl->response.start;
 transport->sasl->bytes_out.size = impl->response.size;
 pni_sasl_set_desired_state(transport, SASL_POSTED_INIT);
@@ -209,15 +226,40 @@ bool

qpid-dispatch git commit: DISPATCH-777: Restore delayed-activation code in router core.

2017-05-30 Thread aconway 
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master b1f09d5ea -> 75cbe215a


DISPATCH-777: Restore delayed-activation code in router core.

Removed in error, required to ensure that connections are not activated
after they have been deleted by the router core thread.


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

Branch: refs/heads/master
Commit: 75cbe215a26e52b9de9eaa2efdb6d0bea4e44927
Parents: b1f09d5
Author: Alan Conway 
Authored: Tue May 30 13:15:45 2017 -0400
Committer: Alan Conway 
Committed: Tue May 30 13:15:45 2017 -0400

--
 src/router_core/connections.c | 13 -
 src/router_core/router_core_private.h |  2 ++
 src/router_core/router_core_thread.c  | 18 ++
 3 files changed, 32 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/75cbe215/src/router_core/connections.c
--
diff --git a/src/router_core/connections.c b/src/router_core/connections.c
index 277fd37..f0b8d8e 100644
--- a/src/router_core/connections.c
+++ b/src/router_core/connections.c
@@ -491,7 +491,10 @@ void qdr_connection_handlers(qdr_core_t
*core,
 
 void qdr_connection_activate_CT(qdr_core_t *core, qdr_connection_t *conn)
 {
-qd_server_activate((qd_connection_t*) qdr_connection_get_context(conn));
+if (!conn->in_activate_list) {
+DEQ_INSERT_TAIL_N(ACTIVATE, core->connections_to_activate, conn);
+conn->in_activate_list = true;
+}
 }
 
 
@@ -1232,6 +1235,14 @@ static void qdr_connection_closed_CT(qdr_core_t *core, 
qdr_action_t *action, boo
 work = DEQ_HEAD(conn->work_list);
 }
 
+//
+// If this connection is on the activation list, remove it from the list
+//
+if (conn->in_activate_list) {
+conn->in_activate_list = false;
+DEQ_REMOVE_N(ACTIVATE, core->connections_to_activate, conn);
+}
+
 DEQ_REMOVE(core->open_connections, conn);
 sys_mutex_free(conn->work_lock);
 qdr_connection_free(conn);

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/75cbe215/src/router_core/router_core_private.h
--
diff --git a/src/router_core/router_core_private.h 
b/src/router_core/router_core_private.h
index ecd4807..07d832b 100644
--- a/src/router_core/router_core_private.h
+++ b/src/router_core/router_core_private.h
@@ -518,6 +518,7 @@ struct qdr_connection_t {
 uint64_tidentity;
 qdr_core_t *core;
 boolincoming;
+boolin_activate_list;
 qdr_connection_role_t   role;
 int inter_router_cost;
 qdr_conn_identifier_t  *conn_id;
@@ -610,6 +611,7 @@ struct qdr_core_t {
 qd_timer_t  *work_timer;
 
 qdr_connection_list_t open_connections;
+qdr_connection_list_t connections_to_activate;
 qdr_link_list_t   open_links;
 
 //

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/75cbe215/src/router_core/router_core_thread.c
--
diff --git a/src/router_core/router_core_thread.c 
b/src/router_core/router_core_thread.c
index 926063c..e5b00f5 100644
--- a/src/router_core/router_core_thread.c
+++ b/src/router_core/router_core_thread.c
@@ -29,6 +29,19 @@
 
 ALLOC_DEFINE(qdr_action_t);
 
+
+static void qdr_activate_connections_CT(qdr_core_t *core)
+{
+qdr_connection_t *conn = DEQ_HEAD(core->connections_to_activate);
+while (conn) {
+DEQ_REMOVE_HEAD_N(ACTIVATE, core->connections_to_activate);
+conn->in_activate_list = false;
+qd_server_activate((qd_connection_t*) 
qdr_connection_get_context(conn));
+conn = DEQ_HEAD(core->connections_to_activate);
+}
+}
+
+
 void *router_core_thread(void *arg)
 {
 qdr_core_t*core = (qdr_core_t*) arg;
@@ -71,6 +84,11 @@ void *router_core_thread(void *arg)
 free_qdr_action_t(action);
 action = DEQ_HEAD(action_list);
 }
+
+//
+// Activate all connections that were flagged for activation during 
the above processing
+//
+qdr_activate_connections_CT(core);
 }
 
 qd_log(core->log, QD_LOG_INFO, "Router Core thread exited");


-
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-7801 : Remove erroneously committed change

2017-05-30 Thread rgodfrey 
Repository: qpid-broker-j
Updated Branches:
  refs/heads/master b831cf7a6 -> b5e769d81


QPID-7801 : Remove erroneously committed change


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

Branch: refs/heads/master
Commit: b5e769d8188508ffa2cb1e86ce3bd64ca4945894
Parents: b831cf7
Author: rgodfrey 
Authored: Tue May 30 18:33:47 2017 +0200
Committer: rgodfrey 
Committed: Tue May 30 18:33:47 2017 +0200

--
 pom.xml | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/b5e769d8/pom.xml
--
diff --git a/pom.xml b/pom.xml
index b13e2b5..9cb53fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -180,7 +180,6 @@
 broker-plugins/websocket
 broker-plugins/amqp-1-0-bdb-store
 broker-plugins/amqp-1-0-jdbc-store
-broker-plugins/amqp-1-0-remote-sasl-authenticator
 tools
 
 qpid-systests-parent


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

[2/3] qpid-broker-j git commit: QPID-7801 : Allow substitution of address space (based on resolution of SNI / HTTPS HOST to vhost) in OAuth2 resolver URIs (to allow per vhost configuration). Add keycl

2017-05-30 Thread rgodfrey 
QPID-7801 : Allow substitution of address space (based on resolution of SNI / 
HTTPS HOST to vhost) in OAuth2 resolver URIs (to allow per vhost 
configuration).  Add keycloak provider


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

Branch: refs/heads/master
Commit: ee97a9bdd9e2c3979e42c8c9158ae6f3aed201dc
Parents: 9baae38
Author: rgodfrey 
Authored: Tue May 30 18:04:26 2017 +0200
Committer: rgodfrey 
Committed: Tue May 30 18:29:19 2017 +0200

--
 .../server/model/AuthenticationProvider.java|   4 +-
 .../java/org/apache/qpid/server/model/Port.java |   3 +-
 .../qpid/server/model/port/AbstractPort.java|  13 +-
 .../qpid/server/security/SubjectCreator.java|   9 +-
 .../AbstractScramAuthenticationManager.java |   5 +-
 .../manager/AnonymousAuthenticationManager.java |   5 +-
 .../ExternalAuthenticationManagerImpl.java  |   5 +-
 .../manager/KerberosAuthenticationManager.java  |   5 +-
 .../auth/manager/MD5AuthenticationProvider.java |   5 +-
 .../manager/PlainAuthenticationProvider.java|   5 +-
 .../PrincipalDatabaseAuthenticationManager.java |   5 +-
 .../manager/SimpleAuthenticationManager.java|   5 +-
 .../SimpleLDAPAuthenticationManagerImpl.java|   5 +-
 .../oauth2/OAuth2AuthenticationProvider.java|  14 +-
 .../OAuth2AuthenticationProviderImpl.java   |  88 ++--
 .../oauth2/OAuth2IdentityResolverService.java   |   3 +-
 ...oudFoundryOAuth2IdentityResolverService.java |   6 +-
 .../FacebookIdentityResolverService.java|   6 +-
 .../GitHubOAuth2IdentityResolverService.java|   6 +-
 .../GoogleOAuth2IdentityResolverService.java|   6 +-
 .../KeycloakOAuth2IdentityResolverService.java  | 215 +++
 ...rosoftLiveOAuth2IdentityResolverService.java |   6 +-
 .../auth/sasl/oauth2/OAuth2Negotiator.java  |   8 +-
 .../server/security/SubjectCreatorTest.java |   3 +-
 .../AnonymousAuthenticationManagerTest.java |  10 +-
 .../ExternalAuthenticationManagerTest.java  |  20 +-
 .../ManagedAuthenticationManagerTestBase.java   |   4 +-
 ...ncipalDatabaseAuthenticationManagerTest.java |   3 +-
 .../SimpleAuthenticationManagerTest.java|   8 +-
 .../OAuth2AuthenticationProviderImplTest.java   |  23 +-
 .../auth/sasl/oauth2/OAuth2NegotiatorTest.java  |   9 +-
 .../protocol/v0_10/AMQPConnection_0_10Impl.java |   2 +-
 .../v0_10/ServerConnectionDelegate.java |   4 +-
 .../protocol/v0_8/AMQPConnection_0_8Impl.java   |   2 +-
 .../protocol/v0_8/AMQPConnection_0_8Test.java   |   3 +-
 .../protocol/v1_0/AMQPConnection_1_0Impl.java   |   2 +-
 .../protocol/v1_0/ProtocolEngine_1_0_0Test.java |   4 +-
 .../auth/AnonymousInteractiveAuthenticator.java |   2 +-
 .../auth/AnonymousPreemptiveAuthenticator.java  |   2 +-
 .../auth/BasicAuthPreemptiveAuthenticator.java  |   2 +-
 .../auth/OAuth2InteractiveAuthenticator.java|  30 ++-
 .../auth/OAuth2PreemptiveAuthenticator.java |   4 +-
 .../SSLClientCertPreemptiveAuthenticator.java   |   2 +-
 .../plugin/servlet/rest/SaslServlet.java|   2 +-
 .../OAuth2InteractiveAuthenticatorTest.java |  12 +-
 .../auth/OAuth2PreemptiveAuthenticatorTest.java |  12 +-
 pom.xml |   1 +
 47 files changed, 474 insertions(+), 124 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ee97a9bd/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java
 
b/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java
index cfa3163..58bdc2c 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java
@@ -46,7 +46,9 @@ public interface AuthenticationProvider> ext
 @ManagedAttribute( defaultValue = "[]")
 List getDisabledMechanisms();
 
-SaslNegotiator createSaslNegotiator(String mechanism, final SaslSettings 
saslSettings);
+SaslNegotiator createSaslNegotiator(String mechanism,
+final SaslSettings saslSettings,
+final NamedAddressSpace addressSpace);
 
 List getAvailableMechanisms(boolean secure);
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ee97a9bd/broker-core/src/main/java/org/apache/qpid/server/model/Port.java

[1/3] qpid-broker-j git commit: QPID-7801 : Allow substitution of address space (based on resolution of SNI / HTTPS HOST to vhost) in OAuth2 resolver URIs (to allow per vhost configuration). Add keycl

2017-05-30 Thread rgodfrey 
Repository: qpid-broker-j
Updated Branches:
  refs/heads/master 63b2806d5 -> b831cf7a6


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ee97a9bd/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Impl.java
--
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Impl.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Impl.java
index 8bf1183..0abad81 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Impl.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Impl.java
@@ -1283,7 +1283,7 @@ public class AMQPConnection_0_8Impl
 
 private SubjectCreator getSubjectCreator()
 {
-return getPort().getSubjectCreator(getTransport().isSecure());
+return getPort().getSubjectCreator(getTransport().isSecure(), 
getNetwork().getSelectedHost());
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ee97a9bd/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java
--
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java
 
b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java
index d2c4035..d035750 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java
@@ -22,6 +22,7 @@ package org.apache.qpid.server.protocol.v0_8;
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -149,7 +150,7 @@ public class AMQPConnection_0_8Test extends QpidTestCase
 
when(_port.getAddressSpace(VIRTUAL_HOST_NAME)).thenReturn(_virtualHost);
 when(_port.getContextValue(Long.class, 
Port.CONNECTION_MAXIMUM_AUTHENTICATION_DELAY)).thenReturn(2500l);
 when(_port.getContextValue(Integer.class, 
Connection.MAX_MESSAGE_SIZE)).thenReturn(Connection.DEFAULT_MAX_MESSAGE_SIZE);
-when(_port.getSubjectCreator(false)).thenReturn(subjectCreator);
+when(_port.getSubjectCreator(eq(false), 
anyString())).thenReturn(subjectCreator);
 
 _sender = mock(ByteBufferSender.class);
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ee97a9bd/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java
--
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java
index cd798c7..311c510 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java
@@ -254,7 +254,7 @@ public class AMQPConnection_1_0Impl extends 
AbstractAMQPConnectionhttp://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ee97a9bd/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java
--
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java
 
b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java
index dfe7a39..5e81b4a 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java
@@ -132,7 +132,7 @@ public class ProtocolEngine_1_0_0Test extends QpidTestCase
 }).when(_virtualHost).registerConnection(connectionCaptor.capture());
 
when(_virtualHost.getPrincipal()).thenReturn(mock(VirtualHostPrincipal.class));
 when(_port.getAddressSpace(anyString())).thenReturn(_virtualHost);
-
when(_port.getSubjectCreator(anyBoolean())).thenReturn(_subjectCreator);
+when(_port.getSubjectCreator(anyBoolean(), 
anyString())).thenReturn(_subjectCreator);

[3/3] qpid-broker-j git commit: Merge remote-tracking branch 'origin/master'

2017-05-30 Thread rgodfrey 
Merge remote-tracking branch 'origin/master'


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

Branch: refs/heads/master
Commit: b831cf7a6ec4c5d47ca2d154814ba27134851563
Parents: ee97a9b 63b2806
Author: rgodfrey 
Authored: Tue May 30 18:30:47 2017 +0200
Committer: rgodfrey 
Committed: Tue May 30 18:30:47 2017 +0200

--
 .../qpid/server/model/NamedAddressSpace.java|   4 +-
 .../transport/AbstractAMQPConnection.java   |   4 -
 ...stractNonConnectionAcceptingVirtualHost.java |   4 +-
 .../server/virtualhost/AbstractVirtualHost.java |  31 +-
 .../ConnectionEstablishmentPolicy.java  |  28 ++
 .../NoopConnectionEstablishmentPolicy.java  |  33 +++
 .../qpid/server/model/VirtualHostTest.java  |  15 +-
 .../server/protocol/v0_10/ServerConnection.java |   2 +
 .../protocol/v0_10/ServerSessionTest.java   |   3 +
 .../protocol/v0_8/AMQPConnection_0_8Impl.java   |   2 +
 .../protocol/v1_0/AMQPConnection_1_0Impl.java   | 211 ++
 .../type/codec/AMQPDescribedTypeRegistry.java   |  15 +-
 .../SoleConnectionConnectionProperties.java |  30 ++
 .../soleconn/SoleConnectionDetectionPolicy.java |  80 ++
 .../SoleConnectionEnforcementPolicy.java|  80 ++
 .../protocol/v1_0/type/transport/Open.java  |   6 +-
 .../protocol/v1_0/ProtocolEngine_1_0_0Test.java |  13 +-
 .../management/amqp/ManagementAddressSpace.java |   5 +-
 .../security/Java-Broker-Security-ACLs.xml  |  10 +-
 .../systest/disttest/endtoend/EndToEndTest.java |   1 -
 .../qpid/tests/protocol/v1_0/InputHandler.java  |   3 +-
 .../qpid/tests/protocol/v1_0/OutputHandler.java |   3 +-
 .../soleconn/CloseExistingPolicy.java   | 252 
 .../v1_0/extensions/soleconn/MixedPolicy.java   | 153 ++
 .../soleconn/RefuseConnectionPolicy.java| 286 +++
 .../deliverydelay/DeliveryDelayTest.java|  22 +-
 .../subscription/SharedSubscriptionTest.java|   9 +-
 .../org/apache/qpid/systest/rest/Asserts.java   |   2 -
 .../qpid/test/utils/ConnectionBuilder.java  |  43 +++
 .../org/apache/qpid/test/utils/JmsProvider.java |   2 +
 .../qpid/test/utils/QpidBrokerTestCase.java |   6 +
 .../utils/QpidJmsClient0xConnectionBuilder.java | 162 +++
 .../test/utils/QpidJmsClient0xProvider.java |   8 +-
 .../utils/QpidJmsClientConnectionBuilder.java   | 191 +
 .../qpid/test/utils/QpidJmsClientProvider.java  |  24 +-
 .../qpid/server/queue/TimeToLiveTest.java   |   2 +-
 .../test/unit/client/MaxDeliveryCountTest.java  |   4 +-
 .../qpid/test/unit/topic/TopicSessionTest.java  |   6 +-
 38 files changed, 1617 insertions(+), 138 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/b831cf7a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Impl.java
--

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/b831cf7a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java
--

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/b831cf7a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java
--
diff --cc 
broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java
index 5e81b4a,63a56b4..c315c2d
--- 
a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java
@@@ -129,10 -132,10 +132,10 @@@ public class ProtocolEngine_1_0_0Test e
  _connection = connectionCaptor.getValue();
  return null;
  }
- }).when(_virtualHost).registerConnection(connectionCaptor.capture());
+ }).when(_virtualHost).registerConnection(connectionCaptor.capture(), 
establishmentPolicyCaptor.capture());
  
when(_virtualHost.getPrincipal()).thenReturn(mock(VirtualHostPrincipal.class));
  when(_port.getAddressSpace(anyString())).thenReturn(_virtualHost);
 -
when(_port.getSubjectCreator(anyBoolean())).thenReturn(_subjectCreator);
 +when(_port.getSubjectCreator(anyBoolean(), 
anyString())).thenReturn(_subjectCreator);
  
  final ArgumentCaptor

[3/3] qpid-broker-j git commit: QPID-7605: [Java Broker] AMQP 1.0 support the soleconn AMQP extension

2017-05-30 Thread lquack 
QPID-7605: [Java Broker] AMQP 1.0 support the soleconn AMQP extension

The standard is not finalised, yet. This reflects the WD02 status.


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

Branch: refs/heads/master
Commit: 63b2806d552faa3fe2004b35bcf8a702671190e2
Parents: 6cf1680
Author: Lorenz Quack 
Authored: Thu May 25 09:16:58 2017 +0100
Committer: Lorenz Quack 
Committed: Tue May 30 16:20:43 2017 +0100

--
 .../qpid/server/model/NamedAddressSpace.java|   4 +-
 .../transport/AbstractAMQPConnection.java   |   4 -
 ...stractNonConnectionAcceptingVirtualHost.java |   4 +-
 .../server/virtualhost/AbstractVirtualHost.java |  31 +-
 .../ConnectionEstablishmentPolicy.java  |  28 ++
 .../NoopConnectionEstablishmentPolicy.java  |  33 +++
 .../qpid/server/model/VirtualHostTest.java  |  15 +-
 .../server/protocol/v0_10/ServerConnection.java |   2 +
 .../protocol/v0_10/ServerSessionTest.java   |   3 +
 .../protocol/v0_8/AMQPConnection_0_8Impl.java   |   2 +
 .../protocol/v1_0/AMQPConnection_1_0Impl.java   | 211 ++
 .../type/codec/AMQPDescribedTypeRegistry.java   |  15 +-
 .../SoleConnectionConnectionProperties.java |  30 ++
 .../soleconn/SoleConnectionDetectionPolicy.java |  80 ++
 .../SoleConnectionEnforcementPolicy.java|  80 ++
 .../protocol/v1_0/type/transport/Open.java  |   6 +-
 .../protocol/v1_0/ProtocolEngine_1_0_0Test.java |  13 +-
 .../management/amqp/ManagementAddressSpace.java |   5 +-
 .../systest/disttest/endtoend/EndToEndTest.java |   1 -
 .../qpid/tests/protocol/v1_0/InputHandler.java  |   3 +-
 .../qpid/tests/protocol/v1_0/OutputHandler.java |   3 +-
 .../soleconn/CloseExistingPolicy.java   | 252 
 .../v1_0/extensions/soleconn/MixedPolicy.java   | 153 ++
 .../soleconn/RefuseConnectionPolicy.java| 286 +++
 .../deliverydelay/DeliveryDelayTest.java|  22 +-
 .../subscription/SharedSubscriptionTest.java|   9 +-
 .../org/apache/qpid/systest/rest/Asserts.java   |   2 -
 .../qpid/test/utils/QpidJmsClientProvider.java  |  16 +-
 .../qpid/server/queue/TimeToLiveTest.java   |   2 +-
 .../test/unit/client/MaxDeliveryCountTest.java  |   4 +-
 .../qpid/test/unit/topic/TopicSessionTest.java  |   6 +-
 31 files changed, 1198 insertions(+), 127 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/63b2806d/broker-core/src/main/java/org/apache/qpid/server/model/NamedAddressSpace.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/model/NamedAddressSpace.java 
b/broker-core/src/main/java/org/apache/qpid/server/model/NamedAddressSpace.java
index 9d53ad1..370d06d 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/model/NamedAddressSpace.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/model/NamedAddressSpace.java
@@ -33,6 +33,7 @@ import org.apache.qpid.server.protocol.LinkModel;
 import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.transport.AMQPConnection;
 import org.apache.qpid.server.txn.DtxRegistry;
+import org.apache.qpid.server.virtualhost.ConnectionEstablishmentPolicy;
 
 public interface NamedAddressSpace extends Named
 {
@@ -43,7 +44,8 @@ public interface NamedAddressSpace extends Named
 
 MessageDestination getAttainedMessageDestination(String name);
 
-void registerConnection(AMQPConnection connection);
+boolean registerConnection(AMQPConnection connection,
+   final ConnectionEstablishmentPolicy 
connectionEstablishmentPolicy);
 void deregisterConnection(AMQPConnection connection);
 
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/63b2806d/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java
 
b/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java
index 36fb0d5..4ba537b 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java
@@ -52,7 +52,6 @@ import org.apache.qpid.server.logging.EventLoggerProvider;
 import org.apache.qpid.server.logging.LogSubject;
 import org.apache.qpid.server.logging.messages.ConnectionMessages;
 import

[1/3] qpid-broker-j git commit: NO-JIRA: [Java Broker] Introduce Builder pattern for connections in systests

2017-05-30 Thread lquack 
Repository: qpid-broker-j
Updated Branches:
  refs/heads/master 8b76ea6d5 -> 63b2806d5


NO-JIRA: [Java Broker] Introduce Builder pattern for connections in systests


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

Branch: refs/heads/master
Commit: 6cf1680a8e1fb80d4b419cc3cb044e13603c159c
Parents: 8b76ea6
Author: Lorenz Quack 
Authored: Tue May 30 15:59:08 2017 +0100
Committer: Lorenz Quack 
Committed: Tue May 30 16:08:20 2017 +0100

--
 .../qpid/test/utils/ConnectionBuilder.java  |  43 +
 .../org/apache/qpid/test/utils/JmsProvider.java |   2 +
 .../qpid/test/utils/QpidBrokerTestCase.java |   6 +
 .../utils/QpidJmsClient0xConnectionBuilder.java | 162 
 .../test/utils/QpidJmsClient0xProvider.java |   8 +-
 .../utils/QpidJmsClientConnectionBuilder.java   | 191 +++
 .../qpid/test/utils/QpidJmsClientProvider.java  |   8 +-
 7 files changed, 418 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6cf1680a/systests/src/main/java/org/apache/qpid/test/utils/ConnectionBuilder.java
--
diff --git 
a/systests/src/main/java/org/apache/qpid/test/utils/ConnectionBuilder.java 
b/systests/src/main/java/org/apache/qpid/test/utils/ConnectionBuilder.java
new file mode 100644
index 000..52d39c2
--- /dev/null
+++ b/systests/src/main/java/org/apache/qpid/test/utils/ConnectionBuilder.java
@@ -0,0 +1,43 @@
+/*
+ * 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.test.utils;
+
+import java.util.Map;
+
+import javax.jms.Connection;
+import javax.jms.JMSException;
+import javax.naming.NamingException;
+
+import org.apache.qpid.url.URLSyntaxException;
+
+public interface ConnectionBuilder
+{
+ConnectionBuilder setPrefetch(int prefetch);
+ConnectionBuilder setClientId(String clientId);
+ConnectionBuilder setUsername(String username);
+ConnectionBuilder setPassword(String password);
+ConnectionBuilder setVirtualHost(String virtualHostName);
+ConnectionBuilder setFailover(boolean enableFailover);
+ConnectionBuilder setFailoverReconnectAttempts(int reconnectAttempts);
+ConnectionBuilder setTls(boolean enableTls);
+
+Connection build() throws NamingException, JMSException, 
URLSyntaxException;
+}

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6cf1680a/systests/src/main/java/org/apache/qpid/test/utils/JmsProvider.java
--
diff --git a/systests/src/main/java/org/apache/qpid/test/utils/JmsProvider.java 
b/systests/src/main/java/org/apache/qpid/test/utils/JmsProvider.java
index 661905d..6e21325 100644
--- a/systests/src/main/java/org/apache/qpid/test/utils/JmsProvider.java
+++ b/systests/src/main/java/org/apache/qpid/test/utils/JmsProvider.java
@@ -91,4 +91,6 @@ public interface JmsProvider
 boolean isQueueExist(Connection con, Queue destination) throws Exception;
 
 String getBrokerDetailsFromDefaultConnectionUrl();
+
+ConnectionBuilder getConnectionBuilder();
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6cf1680a/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
--
diff --git 
a/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java 
b/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
index d89729b..43d9f88 100755
--- a/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
+++ b/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
@@ -220,6 +220,12 @@ public class QpidBrokerTestCase extends QpidTestCase
 }
 }
 
+
+public ConnectionBuilder

[2/3] qpid-broker-j git commit: QPID-7605: [Java Broker] AMQP 1.0 support the soleconn AMQP extension

2017-05-30 Thread lquack 
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/63b2806d/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/RefuseConnectionPolicy.java
--
diff --git 
a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/RefuseConnectionPolicy.java
 
b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/RefuseConnectionPolicy.java
new file mode 100644
index 000..d0f3f04
--- /dev/null
+++ 
b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/RefuseConnectionPolicy.java
@@ -0,0 +1,286 @@
+/*
+ * 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.tests.protocol.v1_0.extensions.soleconn;
+
+import static 
org.apache.qpid.server.protocol.v1_0.type.extensions.soleconn.SoleConnectionConnectionProperties.SOLE_CONNECTION_FOR_CONTAINER;
+import static 
org.apache.qpid.server.protocol.v1_0.type.extensions.soleconn.SoleConnectionConnectionProperties.SOLE_CONNECTION_DETECTION_POLICY;
+import static 
org.apache.qpid.server.protocol.v1_0.type.extensions.soleconn.SoleConnectionConnectionProperties.SOLE_CONNECTION_ENFORCEMENT_POLICY;
+import static 
org.apache.qpid.server.protocol.v1_0.type.extensions.soleconn.SoleConnectionEnforcementPolicy.REFUSE_CONNECTION;
+import static org.hamcrest.CoreMatchers.hasItem;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasKey;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isIn;
+import static org.junit.Assume.assumeThat;
+
+import java.net.InetSocketAddress;
+import java.util.Arrays;
+import java.util.Collections;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.apache.qpid.server.protocol.v1_0.type.Symbol;
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedInteger;
+import 
org.apache.qpid.server.protocol.v1_0.type.extensions.soleconn.SoleConnectionDetectionPolicy;
+import org.apache.qpid.server.protocol.v1_0.type.transport.AmqpError;
+import org.apache.qpid.server.protocol.v1_0.type.transport.Close;
+import org.apache.qpid.server.protocol.v1_0.type.transport.Open;
+import org.apache.qpid.tests.protocol.v1_0.BrokerAdmin;
+import org.apache.qpid.tests.protocol.v1_0.FrameTransport;
+import org.apache.qpid.tests.protocol.v1_0.PerformativeResponse;
+import org.apache.qpid.tests.protocol.v1_0.ProtocolTestBase;
+
+public class RefuseConnectionPolicy extends ProtocolTestBase
+{
+private InetSocketAddress _brokerAddress;
+
+@Before
+public void setUp()
+{
+_brokerAddress = 
getBrokerAdmin().getBrokerAddress(BrokerAdmin.PortType.ANONYMOUS_AMQP);
+}
+
+@Test
+public void basicNegotiation() throws Exception
+{
+try (FrameTransport transport = new FrameTransport(_brokerAddress))
+{
+transport.doProtocolNegotiation();
+Open open = new Open();
+open.setContainerId("testContainerId");
+open.setDesiredCapabilities(new 
Symbol[]{SOLE_CONNECTION_FOR_CONTAINER});
+
open.setProperties(Collections.singletonMap(SOLE_CONNECTION_ENFORCEMENT_POLICY,
+REFUSE_CONNECTION));
+
+transport.sendPerformative(open);
+PerformativeResponse response = (PerformativeResponse) 
transport.getNextResponse();
+
+assertThat(response, is(notNullValue()));
+assertThat(response.getFrameBody(), is(instanceOf(Open.class)));
+Open responseOpen = (Open) response.getFrameBody();
+assertThat(Arrays.asList(responseOpen.getOfferedCapabilities()), 
hasItem(SOLE_CONNECTION_FOR_CONTAINER));
+if 
(responseOpen.getProperties().containsKey(SOLE_CONNECTION_DETECTION_POLICY))
+{
+
assertThat(responseOpen.getProperties().get(SOLE_CONNECTION_DETECTION_POLICY),
+

qpid-jms-amqp-0-x git commit: QPID-7778: [Documentation] State that JCE unlimited strength is required for message encryption feature

2017-05-30 Thread kwall 
Repository: qpid-jms-amqp-0-x
Updated Branches:
  refs/heads/master 5df5d1382 -> aeb7377c8


QPID-7778: [Documentation] State that JCE unlimited strength is required for 
message encryption feature


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

Branch: refs/heads/master
Commit: aeb7377c8077d6873e896b04de527cbe2ed568ee
Parents: 5df5d13
Author: Keith Wall 
Authored: Tue May 30 16:16:09 2017 +0100
Committer: Keith Wall 
Committed: Tue May 30 16:16:09 2017 +0100

--
 .../src/docbkx/JMS-Client-Getting-And-Dependencies.xml   | 4 +++-
 doc/jms-client-0-8/src/docbkx/JMS-Client-Message-Encryption.xml  | 4 
 doc/jms-client-0-8/src/docbkx/JMS-Client-System-Properties.xml   | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/aeb7377c/doc/jms-client-0-8/src/docbkx/JMS-Client-Getting-And-Dependencies.xml
--
diff --git 
a/doc/jms-client-0-8/src/docbkx/JMS-Client-Getting-And-Dependencies.xml 
b/doc/jms-client-0-8/src/docbkx/JMS-Client-Getting-And-Dependencies.xml
index bcc2219..1d8cd01 100644
--- a/doc/jms-client-0-8/src/docbkx/JMS-Client-Getting-And-Dependencies.xml
+++ b/doc/jms-client-0-8/src/docbkx/JMS-Client-Getting-And-Dependencies.xml
@@ -45,7 +45,9 @@
 The Client has minimal set of external dependencies. 
  It requires: 
 
-  JDK 1.7 or higher.
+  JDK 1.7 or higher.The Java Cryptography 
Extension (JCE)
+Unlimited Strength policy files are required for the  http://www.w3.org/1999/xlink;  
linkend="JMS-Client-Message-Encryption">Message Encryption
+feature.
 
 
   JMS 1.1 specification (such as geronimo-jms_1.1_spec 
JAR)

http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/aeb7377c/doc/jms-client-0-8/src/docbkx/JMS-Client-Message-Encryption.xml
--
diff --git a/doc/jms-client-0-8/src/docbkx/JMS-Client-Message-Encryption.xml 
b/doc/jms-client-0-8/src/docbkx/JMS-Client-Message-Encryption.xml
index 3287b6c..3b70ff8 100644
--- a/doc/jms-client-0-8/src/docbkx/JMS-Client-Message-Encryption.xml
+++ b/doc/jms-client-0-8/src/docbkx/JMS-Client-Message-Encryption.xml
@@ -61,6 +61,10 @@
 distributed to those who you wish to send messages to you) and to 
have the private key associated with the
 certificate so that you can decrypt messages sent to you.
 
+
+This feature requires the Java Cryptography Extension (JCE) 
Unlimited Strength policy files are installed
+in the JVM.
+
 
 
 

http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/aeb7377c/doc/jms-client-0-8/src/docbkx/JMS-Client-System-Properties.xml
--
diff --git a/doc/jms-client-0-8/src/docbkx/JMS-Client-System-Properties.xml 
b/doc/jms-client-0-8/src/docbkx/JMS-Client-System-Properties.xml
index 59657bc..a0227fd 100644
--- a/doc/jms-client-0-8/src/docbkx/JMS-Client-System-Properties.xml
+++ b/doc/jms-client-0-8/src/docbkx/JMS-Client-System-Properties.xml
@@ -255,7 +255,7 @@
If 
false, the sync is not performed.  This will improve 
performance but will mean
duplicate messages are 
more likely to be received following a failure.

-   This can also be set per 
connection using the 
+   This can also be set per 
connection using the 
Connection URL 
options.




-
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-7345: [Java Broker] Remove mentioning of "immediate" flag from ACL documentation

2017-05-30 Thread orudyy 
Repository: qpid-broker-j
Updated Branches:
  refs/heads/master 9baae38e5 -> 8b76ea6d5


QPID-7345: [Java Broker] Remove mentioning of "immediate" flag from ACL 
documentation


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

Branch: refs/heads/master
Commit: 8b76ea6d5b4c872a7a017b4dfe62e5db51f9d656
Parents: 9baae38
Author: Alex Rudyy 
Authored: Tue May 30 14:07:53 2017 +0100
Committer: Alex Rudyy 
Committed: Tue May 30 14:09:31 2017 +0100

--
 .../src/docbkx/security/Java-Broker-Security-ACLs.xml | 10 +-
 1 file changed, 1 insertion(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/8b76ea6d/doc/java-broker/src/docbkx/security/Java-Broker-Security-ACLs.xml
--
diff --git a/doc/java-broker/src/docbkx/security/Java-Broker-Security-ACLs.xml 
b/doc/java-broker/src/docbkx/security/Java-Broker-Security-ACLs.xml
index 320963a..fce9e42 100644
--- a/doc/java-broker/src/docbkx/security/Java-Broker-Security-ACLs.xml
+++ b/doc/java-broker/src/docbkx/security/Java-Broker-Security-ACLs.xml
@@ -189,7 +189,7 @@
PUBLISH 
 Applied on a per message basis on publish message 
transfers 
   EXCHANGE
-  name, routingkey, immediate, 
virtualhost_name
+  name, routingkey, virtualhost_name
 
 
CREATE 
@@ -415,14 +415,6 @@
 
   
 
-
-  immediate
-  
-
-  Boolean. A property can be used to restrict PUBLISH action to 
publishing only messages with given immediate flag.
-
-  
-
   
 
   


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

[2/2] qpid-broker-j git commit: QPID-7800 - [Java Broker] Refactor Port classes to remove unnecessary intermediate classes/interfaces

2017-05-30 Thread rgodfrey 
QPID-7800 - [Java Broker] Refactor Port classes to remove unnecessary 
intermediate classes/interfaces


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

Branch: refs/heads/master
Commit: 9baae38e5b673c3384f7dde5072cbc6e8436e1bf
Parents: fed08da
Author: rgodfrey 
Authored: Tue May 30 14:48:06 2017 +0200
Committer: rgodfrey 
Committed: Tue May 30 14:48:06 2017 +0200

--
 .../server/model/AuthenticationProvider.java|  17 +-
 .../java/org/apache/qpid/server/model/Port.java |  18 ++
 ...ctClientAuthCapablePortWithAuthProvider.java | 130 -
 .../qpid/server/model/port/AbstractPort.java| 165 ++--
 .../port/AbstractPortWithAuthProvider.java  | 112 
 .../apache/qpid/server/model/port/AmqpPort.java |  17 +-
 .../qpid/server/model/port/AmqpPortImpl.java|  10 +-
 .../model/port/ClientAuthCapablePort.java   |  32 ---
 .../apache/qpid/server/model/port/HttpPort.java |  16 +-
 .../qpid/server/model/port/HttpPortImpl.java|   3 +-
 .../server/model/port/PortWithAuthProvider.java |  29 --
 .../qpid/server/security/SubjectCreator.java|  35 +--
 .../manager/AbstractAuthenticationManager.java  |  27 +-
 .../OAuth2AuthenticationProviderImpl.java   |   9 +-
 .../server/security/SubjectCreatorTest.java |  37 +--
 .../ManagedAuthenticationManagerTestBase.java   |   9 +-
 .../protocol/v0_10/AMQPConnection_0_10Impl.java |  97 ---
 .../v0_10/ServerConnectionDelegate.java |  30 +--
 .../protocol/v0_8/AMQPConnection_0_8Impl.java   |  28 +-
 .../protocol/v0_8/AMQPConnection_0_8Test.java   |   7 +-
 .../protocol/v1_0/AMQPConnection_1_0Impl.java   | 270 ---
 .../protocol/v1_0/type/transport/Open.java  |   7 +-
 .../protocol/v1_0/ProtocolEngine_1_0_0Test.java |  18 +-
 .../management/plugin/HttpManagement.java   |  15 +-
 .../plugin/HttpManagementConfiguration.java |   3 +
 .../management/plugin/HttpManagementUtil.java   |  18 +-
 .../auth/AnonymousInteractiveAuthenticator.java |   4 +-
 .../auth/AnonymousPreemptiveAuthenticator.java  |   4 +-
 .../auth/BasicAuthPreemptiveAuthenticator.java  |   4 +-
 .../auth/OAuth2InteractiveAuthenticator.java|   5 +-
 .../auth/OAuth2PreemptiveAuthenticator.java |   4 +-
 .../SSLClientCertPreemptiveAuthenticator.java   |   4 +-
 .../plugin/servlet/rest/AbstractServlet.java|   3 +-
 .../plugin/servlet/rest/RestServlet.java|   7 +-
 .../plugin/servlet/rest/SaslServlet.java|  21 +-
 .../OAuth2InteractiveAuthenticatorTest.java |  11 +-
 .../auth/OAuth2PreemptiveAuthenticatorTest.java |  10 +-
 .../org/apache/qpid/systest/rest/Asserts.java   |   6 +-
 38 files changed, 508 insertions(+), 734 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/9baae38e/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java
 
b/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java
index 06d7e8d..cfa3163 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java
@@ -20,15 +20,9 @@
  */
 package org.apache.qpid.server.model;
 
-import java.security.Principal;
 import java.util.List;
 
-import javax.security.sasl.SaslException;
-import javax.security.sasl.SaslServer;
-
 import org.apache.qpid.server.logging.EventLoggerProvider;
-import org.apache.qpid.server.security.SubjectCreator;
-import org.apache.qpid.server.security.auth.AuthenticationResult;
 import org.apache.qpid.server.security.auth.sasl.SaslNegotiator;
 import org.apache.qpid.server.security.auth.sasl.SaslSettings;
 
@@ -38,14 +32,6 @@ public interface AuthenticationProvider> ext
 {
 
 /**
- * A temporary method to create SubjectCreator.
- *
- * TODO: move all the functionality from SubjectCreator into 
AuthenticationProvider
- * @param secure
- */
-SubjectCreator getSubjectCreator(final boolean secure);
-
-/**
  * Gets the SASL mechanisms known to this manager.
  *
  * @return SASL mechanism names, space separated.
@@ -61,4 +47,7 @@ public interface AuthenticationProvider> ext
 List getDisabledMechanisms();
 
 SaslNegotiator createSaslNegotiator(String mechanism, final SaslSettings 
saslSettings);
+
+List getAvailableMechanisms(boolean secure);
+
 }

[1/2] qpid-broker-j git commit: QPID-7800 - [Java Broker] Refactor Port classes to remove unnecessary intermediate classes/interfaces

2017-05-30 Thread rgodfrey 
Repository: qpid-broker-j
Updated Branches:
  refs/heads/master fed08dabe -> 9baae38e5


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/9baae38e/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java
--
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java
index c5ba4a4..cd798c7 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java
@@ -215,18 +215,16 @@ public class AMQPConnection_1_0Impl extends 
AbstractAMQPConnection _properties;
 private boolean _saslComplete;
 
 private SaslNegotiator _saslNegotiator;
 private String _localHostname;
 private long _desiredIdleTimeout;
 
-private Error _remoteError;
-
 private static final long MINIMUM_SUPPORTED_IDLE_TIMEOUT = 1000L;
 
-private Map _remoteProperties;
+private volatile Map _remoteProperties;
 
 private final AtomicBoolean _orderlyClose = new AtomicBoolean(false);
 
@@ -256,7 +254,7 @@ public class AMQPConnection_1_0Impl extends 
AbstractAMQPConnection()
+AccessController.doPrivileged((PrivilegedAction) () ->
 {
-@Override
-public Object run()
-{
-session.remoteEnd(new End());
-return null;
-}
+session.remoteEnd(new End());
+return null;
 }, session.getAccessControllerContext());
 }
 }
@@ -452,12 +445,14 @@ public class AMQPConnection_1_0Impl extends 
AbstractAMQPConnection(open.getProperties()));
+if (_remoteProperties.containsKey(Symbol.valueOf("product")))
 {
-if (_remoteProperties.containsKey(Symbol.valueOf("product")))
-{
-
setClientProduct(_remoteProperties.get(Symbol.valueOf("product")).toString());
-}
-if (_remoteProperties.containsKey(Symbol.valueOf("version")))
-{
-
setClientVersion(_remoteProperties.get(Symbol.valueOf("version")).toString());
-}
-setClientId(_remoteContainerId);
+
setClientProduct(_remoteProperties.get(Symbol.valueOf("product")).toString());
+}
+if (_remoteProperties.containsKey(Symbol.valueOf("version")))
+{
+
setClientVersion(_remoteProperties.get(Symbol.valueOf("version")).toString());
 }
+setClientId(_remoteContainerId);
 if (_idleTimeout != 0L && _idleTimeout < 
MINIMUM_SUPPORTED_IDLE_TIMEOUT)
 {
 closeConnection(ConnectionError.CONNECTION_FORCED,
@@ -791,7 +792,7 @@ public class AMQPConnection_1_0Impl extends 
AbstractAMQPConnection()
+AccessController.doPrivileged((PrivilegedAction) () ->
 {
-@Override
-public Object run()
-{
-getEventLogger().message(ConnectionMessages.IDLE_CLOSE("", 
false));
-getNetwork().close();
-return null;
-}
+getEventLogger().message(ConnectionMessages.IDLE_CLOSE("", false));
+getNetwork().close();
+return null;
 }, getAccessControllerContext());
 }
 
@@ -1203,64 +1202,61 @@ public class AMQPConnection_1_0Impl extends 
AbstractAMQPConnection()
+AccessController.doPrivileged((PrivilegedAction) () ->
 {
-@Override
-public Object run()
+updateLastReadTime();
+try
 {
-updateLastReadTime();
-try
+int remaining;
+
+do
 {
-int remaining;
+remaining = msg.remaining();
 
-do
+switch (_frameReceivingState)
 {
-remaining = msg.remaining();
-
-switch (_frameReceivingState)
-{
-case AMQP_OR_SASL_HEADER:
-case AMQP_HEADER:
-if (remaining >= 8)
-{
-processProtocolHeader(msg);
-}
-break;
-case OPEN_ONLY:
-case ANY_FRAME:
-case SASL_INIT_ONLY:
-case SASL_RESPONSE_ONLY:
-_frameHandler.parse(msg);
-