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 <rgodf...@apache.org> Authored: Tue May 30 18:30:47 2017 +0200 Committer: rgodfrey <rgodf...@apache.org> 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<Principal> userCaptor = ArgumentCaptor.forClass(Principal.class); when(_subjectCreator.createSubjectWithGroups(userCaptor.capture())).then(new Answer<Subject>() --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
