[qpid-broker-j] branch master updated: QPID-8460 [Broker-j] Do not expose private information to exception message (#55)

[rgodfrey]

This is an automated email from the ASF dual-hosted git repository.

rgodfrey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git


The following commit(s) were added to refs/heads/master by this push:
 new 734fb39  QPID-8460 [Broker-j] Do not expose private information to 
exception message (#55)
734fb39 is described below

commit 734fb3994f74ae066b587d3563322f10e47e6727
Author: vavrtom 
AuthorDate: Thu Aug 6 23:41:42 2020 +0200

QPID-8460 [Broker-j] Do not expose private information to exception message 
(#55)

* QPID-8460 Do not expose private information to exception message

* Implemented review comments

Co-authored-by: Tomas Vavricka 
---
 .../server/model/ConfiguredAutomatedAttribute.java |  3 +-
 .../AbstractScramAuthenticationManager.java| 24 +---
 .../crammd5/CramMd5Base64HashedNegotiator.java | 25 +++-
 .../sasl/crammd5/CramMd5Base64HexNegotiator.java   | 33 +-
 .../java/org/apache/qpid/server/util/Strings.java  | 24 +---
 .../auth/BasicAuthPreemptiveAuthenticator.java | 24 
 6 files changed, 70 insertions(+), 63 deletions(-)

diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredAutomatedAttribute.java
 
b/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredAutomatedAttribute.java
index a5b3598..d98a96f 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredAutomatedAttribute.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredAutomatedAttribute.java
@@ -255,7 +255,8 @@ public class ConfiguredAutomatedAttribute  extend
 Type returnType = getGetter().getGenericReturnType();
 String simpleName = returnType instanceof Class ? ((Class) 
returnType).getSimpleName() : returnType.toString();
 
-throw new IllegalArgumentException("Cannot convert '" + value
+throw new IllegalArgumentException("Cannot convert '" +
+   (isSecure() ? 
AbstractConfiguredObject.SECURED_STRING_VALUE : value)
+ "' into a " + simpleName
+ " for attribute " + getName()
+ " (" + iae.getMessage() + 
")", iae);
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractScramAuthenticationManager.java
 
b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractScramAuthenticationManager.java
index e8bb81e..abc6cbf 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractScramAuthenticationManager.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractScramAuthenticationManager.java
@@ -159,17 +159,18 @@ public abstract class 
AbstractScramAuthenticationManager
+{
+final byte[] passwordBytes = Strings.decodePrivateBase64(new 
String(passwordData), "CRAM MD5 hashed password");
+final char[] password = new char[passwordBytes.length];
+for (int i = 0; i < passwordBytes.length; i++)
+{
+password[i] = (char) passwordBytes[i];
+}
+return password;
+};
 
 public CramMd5Base64HashedNegotiator(final 
PasswordCredentialManagingAuthenticationProvider authenticationProvider,
  final String localFQDN,
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CramMd5Base64HexNegotiator.java
 
b/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CramMd5Base64HexNegotiator.java
index 22fc95c..edcbff5 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CramMd5Base64HexNegotiator.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CramMd5Base64HexNegotiator.java
@@ -27,26 +27,19 @@ import org.apache.qpid.server.util.Strings;
 public class CramMd5Base64HexNegotiator extends AbstractCramMd5Negotiator
 {
 public static final String MECHANISM = "CRAM-MD5-HEX";
-private static final PasswordTransformer BASE64_HEX_PASSWORD_TRANSFORMER =
-new PasswordTransformer()
-{
-private final char[] HEX_CHARACTERS =
-{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 
'a', 'b', 'c', 'd', 'e', 'f'};
-
-@Override
-public char[] transform(final char[] passwordData)
-{
-byte[] passwordBytes = Strings.decodeBase64(new 
String(passwordData));
-char[] password = new char[passwordBytes.length * 2];
-
-for (int i = 0; i < passwordBytes.length; i++)
-  

[qpid-broker-j] branch master updated: QPID-8105 : Fix assumptions on Locale separators

[rgodfrey]

This is an automated email from the ASF dual-hosted git repository.

rgodfrey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git


The following commit(s) were added to refs/heads/master by this push:
 new 66bb384  QPID-8105 : Fix assumptions on Locale separators
66bb384 is described below

commit 66bb384ded6a6c72126881e7dd8a6a3484bce68b
Author: Robert Godfrey 
AuthorDate: Mon Feb 10 22:14:47 2020 +0100

QPID-8105 : Fix assumptions on Locale separators
---
 .../qpid/server/logging/messages/BrokerMessagesTest.java  |  8 ++--
 .../server/stats/FormattingStatisticsResolverTest.java| 15 ++-
 .../store/VirtualHostStoreUpgraderAndRecovererTest.java   |  6 +-
 .../controller/v6_1/category/QueueControllerTest.java |  7 +--
 4 files changed, 26 insertions(+), 10 deletions(-)

diff --git 
a/broker-core/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java
 
b/broker-core/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java
index 14164e4..ccb12e7 100644
--- 
a/broker-core/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java
+++ 
b/broker-core/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java
@@ -22,6 +22,7 @@ package org.apache.qpid.server.logging.messages;
 
 import java.text.NumberFormat;
 import java.util.List;
+import java.util.Locale;
 
 import org.junit.Test;
 
@@ -139,9 +140,12 @@ public class BrokerMessagesTest extends 
AbstractTestMessages
 _logMessage = BrokerMessages.MAX_MEMORY(oneGiga, twoGiga);
 List log = performLog();
 
+// Log messages always use US Locale format for numbers
+NumberFormat numberFormat = NumberFormat.getNumberInstance(Locale.US);
+
 String[] expected = {"Maximum Memory :",
- "Heap", 
NumberFormat.getNumberInstance().format(oneGiga), "bytes",
- "Direct", 
NumberFormat.getNumberInstance().format(twoGiga), "bytes"
+ "Heap", numberFormat.format(oneGiga), "bytes",
+ "Direct", numberFormat.format(twoGiga), "bytes"
 };
 
 validateLogMessage(log, "BRK-1011", expected);
diff --git 
a/broker-core/src/test/java/org/apache/qpid/server/stats/FormattingStatisticsResolverTest.java
 
b/broker-core/src/test/java/org/apache/qpid/server/stats/FormattingStatisticsResolverTest.java
index afb55ee..3c7cf96 100644
--- 
a/broker-core/src/test/java/org/apache/qpid/server/stats/FormattingStatisticsResolverTest.java
+++ 
b/broker-core/src/test/java/org/apache/qpid/server/stats/FormattingStatisticsResolverTest.java
@@ -25,6 +25,7 @@ import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import java.text.NumberFormat;
 import java.util.Date;
 import java.util.Map;
 
@@ -102,9 +103,13 @@ public class FormattingStatisticsResolverTest extends 
UnitTestBase
 @Test
 public void testIEC8BinaryPrefixed() throws Exception
 {
-assertEquals("1.0 MiB",
+NumberFormat formatter = NumberFormat.getInstance();
+formatter.setMinimumFractionDigits(1);
+String ONE_POINT_ZERO = formatter.format(1L);
+
+assertEquals(ONE_POINT_ZERO + " MiB",
 _resolver.resolve(LARGEST_POSITIVE_VALUE_STAT_NAME 
+ ":" + FormattingStatisticsResolver.BYTEUNIT, null));
-assertEquals("1.0 KiB",
+assertEquals(ONE_POINT_ZERO + " KiB",
 _resolver.resolve(LARGER_POSITIVE_VALUE_STAT_NAME 
+ ":" + FormattingStatisticsResolver.BYTEUNIT, null));
 assertEquals("10 B",
 _resolver.resolve(POSITIVE_VALUE_STAT_NAME + ":" + 
FormattingStatisticsResolver.BYTEUNIT, null));
@@ -112,10 +117,10 @@ public class FormattingStatisticsResolverTest extends 
UnitTestBase
 _resolver.resolve(ZERO_VALUE_STAT_NAME + ":" + 
FormattingStatisticsResolver.BYTEUNIT, null));
 assertEquals("-1 B",
 _resolver.resolve(NEGATIVE_VALUE_STAT_NAME + ":" + 
FormattingStatisticsResolver.BYTEUNIT, null));
-assertEquals("-1.0 KiB",
+assertEquals("-"+ ONE_POINT_ZERO + " KiB",
 _resolver.resolve(SMALLER_NEGATIVE_VALUE_STAT_NAME 
+ ":" + FormattingStatisticsResolver.BYTEUNIT, null));
-assertEquals("-1.0 MiB",
+assertEquals("-" + ONE_POINT_ZERO + " MiB",
 
_resolver.resolve(SMALLEST_NEGATIVE_VALUE_STAT_NAME + ":" + 
FormattingStatisticsResolver.BYTEUNIT, null));
 }
 
-}
\ No newline 

[qpid-broker-j] branch master updated (dfad483 -> 5330ba5)

[rgodfrey]

This is an automated email from the ASF dual-hosted git repository.

rgodfrey pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git.


from dfad483  NO-JIRA: Log enviornment and JVM settings in Kerberos tests 
for debug purposes
 add 5330ba5  QPID-8404 : Fix usage of Jetty for TLS client certs

No new revisions were added by this update.

Summary of changes:
 .../java/org/apache/qpid/server/management/plugin/HttpManagement.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


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

[qpid-broker-j] branch master updated: QPID-8385 : Apply simpler version of fix

[rgodfrey]

This is an automated email from the ASF dual-hosted git repository.

rgodfrey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git


The following commit(s) were added to refs/heads/master by this push:
 new 7e3a450  QPID-8385 : Apply simpler version of fix
7e3a450 is described below

commit 7e3a450cbeba471466d215de6c31a1eb1f5f2128
Author: rgodfrey 
AuthorDate: Thu Dec 26 16:19:11 2019 +0100

QPID-8385 : Apply simpler version of fix
---
 .../apache/qpid/server/queue/AbstractQueue.java| 34 +++---
 1 file changed, 4 insertions(+), 30 deletions(-)

diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java 
b/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
index d9557a9..9d5602c 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
@@ -1825,38 +1825,10 @@ public abstract class AbstractQueue>
 
 private void dequeueEntry(final QueueEntry node)
 {
-ServerTransaction txn = new 
AsyncAutoCommitTransaction(getVirtualHost().getMessageStore(), 
this::onEntryDequeue);
+ServerTransaction txn = new 
AsyncAutoCommitTransaction(getVirtualHost().getMessageStore(), (future, action) 
-> action.postCommit());
 dequeueEntry(node, txn);
 }
 
-private void onEntryDequeue(final ListenableFuture future,
-final ServerTransaction.Action action)
-{
-Futures.addCallback(future,
-new FutureCallback()
-{
-@Override
-public void onSuccess(
-final Void result)
-{
-
executeTask(String.format("Dequeue-PostCommit:%s", getName()), 
action::postCommit);
-}
-
-@Override
-public void onFailure(
-final Throwable t)
-{
-
executeTask(String.format("Dequeue-OnRollback:%s", getName()), 
action::onRollback);
-}
-}, MoreExecutors.directExecutor());
-
-}
-
-private void executeTask(final String name, final Runnable runnable)
-{
-getVirtualHost().executeTask(name, runnable, 
getSystemTaskControllerContext(name, _virtualHost.getPrincipal()));
-}
-
 private void dequeueEntry(final QueueEntry node, ServerTransaction txn)
 {
 txn.dequeue(node.getEnqueueRecord(),
@@ -3934,7 +3906,9 @@ public abstract class AbstractQueue>
 if (getState() == State.ACTIVE)
 {
 String taskName = String.format("Queue Housekeeping : %s : TTL 
Update", getName());
-executeTask(taskName, this::updateQueueEntryExpiration);
+getVirtualHost().executeTask(taskName,
+ this::updateQueueEntryExpiration,
+ 
getSystemTaskControllerContext(taskName, _virtualHost.getPrincipal()));
 }
 }
 


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

[qpid-broker-j] branch master updated: QPID-8385 : Improve performance of dequeuing old queue entries on triggering ring policy

[rgodfrey]

This is an automated email from the ASF dual-hosted git repository.

rgodfrey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git


The following commit(s) were added to refs/heads/master by this push:
 new a4af0a7  QPID-8385 : Improve performance of dequeuing old queue 
entries on triggering ring policy
a4af0a7 is described below

commit a4af0a71a890ec7bb4bf23723b17904846019ccb
Author: rgodfrey 
AuthorDate: Thu Dec 26 16:12:30 2019 +0100

QPID-8385 : Improve performance of dequeuing old queue entries on 
triggering ring policy
---
 .../apache/qpid/server/queue/AbstractQueue.java| 93 ++
 .../apache/qpid/server/queue/QueueEntryImpl.java   | 23 ++
 .../server/queue/RingOverflowPolicyHandler.java| 93 +-
 .../qpid/server/store/MemoryMessageStore.java  |  1 +
 .../qpid/server/util/StateChangeListenerEntry.java | 12 ++-
 .../qpid/server/queue/AbstractQueueTestBase.java   | 40 ++
 6 files changed, 206 insertions(+), 56 deletions(-)

diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java 
b/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
index a9e316e..d9557a9 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
@@ -114,7 +114,7 @@ import org.apache.qpid.server.store.MessageEnqueueRecord;
 import org.apache.qpid.server.store.StorableMessageMetaData;
 import org.apache.qpid.server.store.StoredMessage;
 import org.apache.qpid.server.transport.AMQPConnection;
-import org.apache.qpid.server.txn.AutoCommitTransaction;
+import org.apache.qpid.server.txn.AsyncAutoCommitTransaction;
 import org.apache.qpid.server.txn.LocalTransaction;
 import org.apache.qpid.server.txn.ServerTransaction;
 import org.apache.qpid.server.txn.TransactionMonitor;
@@ -1809,7 +1809,7 @@ public abstract class AbstractQueue>
 while (queueListIterator.advance())
 {
 final QueueEntry node = queueListIterator.getNode();
-boolean acquired = node.acquireOrSteal(() -> dequeueEntry(node));
+boolean acquired = node.acquireOrSteal(new DequeueEntryTask(node, 
null));
 
 if (acquired)
 {
@@ -1825,10 +1825,38 @@ public abstract class AbstractQueue>
 
 private void dequeueEntry(final QueueEntry node)
 {
-ServerTransaction txn = new 
AutoCommitTransaction(getVirtualHost().getMessageStore());
+ServerTransaction txn = new 
AsyncAutoCommitTransaction(getVirtualHost().getMessageStore(), 
this::onEntryDequeue);
 dequeueEntry(node, txn);
 }
 
+private void onEntryDequeue(final ListenableFuture future,
+final ServerTransaction.Action action)
+{
+Futures.addCallback(future,
+new FutureCallback()
+{
+@Override
+public void onSuccess(
+final Void result)
+{
+
executeTask(String.format("Dequeue-PostCommit:%s", getName()), 
action::postCommit);
+}
+
+@Override
+public void onFailure(
+final Throwable t)
+{
+
executeTask(String.format("Dequeue-OnRollback:%s", getName()), 
action::onRollback);
+}
+}, MoreExecutors.directExecutor());
+
+}
+
+private void executeTask(final String name, final Runnable runnable)
+{
+getVirtualHost().executeTask(name, runnable, 
getSystemTaskControllerContext(name, _virtualHost.getPrincipal()));
+}
+
 private void dequeueEntry(final QueueEntry node, ServerTransaction txn)
 {
 txn.dequeue(node.getEnqueueRecord(),
@@ -1855,17 +1883,54 @@ public abstract class AbstractQueue>
 deleteEntry(entry, null);
 }
 
+private final class DequeueEntryTask implements Runnable
+{
+private final QueueEntry _entry;
+private final Runnable _postDequeueTask;
+
+public DequeueEntryTask(final QueueEntry entry, final Runnable 
postDequeueTask)
+{
+_entry = entry;
+_postDequeueTask = postDequeueTask;
+}
+
+@Override
+public void run()
+{
+LOGGER.debug("Dequeuing stolen node {}", _entry);
+dequeueEntry(_entry);
+if (_postDequeueTask != null)
+{
+_postDequeueTask.run();
+}
+}
+
+@Override
+public boolean equals(final Objec

[qpid-broker-j] 01/02: QPID-8392 : Remove docs references to outdated DLQ configuration

[rgodfrey]

This is an automated email from the ASF dual-hosted git repository.

rgodfrey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git

commit 4a9a435fa6a5ebd01935ff68d692e164f85d94c5
Author: rgodfrey 
AuthorDate: Mon Dec 23 15:40:39 2019 +0100

QPID-8392 : Remove docs references to outdated DLQ configuration
---
 .../apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java | 4 ++--
 .../java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java| 4 ++--
 .../docbkx/Java-Broker-Appendix-Queue-Declaration-Arguments.xml  | 9 -
 .../src/docbkx/Java-Broker-Appendix-System-Properties.xml| 6 --
 4 files changed, 4 insertions(+), 19 deletions(-)

diff --git 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
index da95578..97fceb2 100644
--- 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
+++ 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
@@ -959,7 +959,7 @@ public class ServerSessionDelegate extends 
MethodDelegate impleme
 exception(session,
   method,
   ExecutionErrorCode.NOT_FOUND,
-  String.format("Unknown alternate exchange '%s'", 
e.getAlternateBindingName()));
+  String.format("Unknown alternate destination 
'%s'", e.getAlternateBindingName()));
 }
 catch(NoFactoryForTypeException e)
 {
@@ -1658,7 +1658,7 @@ public class ServerSessionDelegate extends 
MethodDelegate impleme
 exception(session,
   method,
   ExecutionErrorCode.NOT_FOUND,
-  String.format("Unknown alternate exchange '%s'", 
e.getAlternateBindingName()));
+  String.format("Unknown alternate destination '%s'", 
e.getAlternateBindingName()));
 }
 catch (IllegalArgumentException | IllegalConfigurationException e)
 {
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
index 152e919..4c4ebd2 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
@@ -2701,7 +2701,7 @@ public class AMQChannel extends 
AbstractAMQPSessionSpecifies this queue's maximum delivery 
count.
 
 
-
-
-x-qpid-dlq-enabled
-
-
-If set true, a dead letter 
queue will be automatically created
-and assigned as this queue's 
alternateBinding.
-
-
 
 
 x-single-active-consumer
diff --git 
a/doc/java-broker/src/docbkx/Java-Broker-Appendix-System-Properties.xml 
b/doc/java-broker/src/docbkx/Java-Broker-Appendix-System-Properties.xml
index 561061d..9929dbf 100644
--- a/doc/java-broker/src/docbkx/Java-Broker-Appendix-System-Properties.xml
+++ b/doc/java-broker/src/docbkx/Java-Broker-Appendix-System-Properties.xml
@@ -43,12 +43,6 @@
   Factor to determine the maximum length of that may elapse 
between heartbeats being
 received from the peer before a connection is deemed to have been 
broken.
 
-
-  qpid.broker_dead_letter_queue_suffix
-  _DLQ
-  Used with the 
-feature. Governs the suffix used when generating a name for a Dead 
Letter Queue.
-
 
   qpid.broker_status_updates
   true


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

[qpid-broker-j] 02/02: QPID-8392 : Update node auto-creation to aid with automated DLQs

[rgodfrey]

This is an automated email from the ASF dual-hosted git repository.

rgodfrey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git

commit 016079c70a73644128acdf5afeccd67bd5937754
Author: rgodfrey 
AuthorDate: Tue Dec 24 10:53:30 2019 +0100

QPID-8392 : Update node auto-creation to aid with automated DLQs

* Allow for defaulting queue alternate bindings.
* Only auto create nodes when client is looking for the node or trying to 
use it
* Allow for auto creation on routing to the alternate binding
* Document how to use defaulting and node auto creation policy to set up 
automated DLQs
---
 .../qpid/server/exchange/AbstractExchange.java |  2 +-
 .../qpid/server/exchange/DefaultDestination.java   |  2 +-
 .../qpid/server/model/AttributeValueConverter.java |  4 
 .../qpid/server/model/DestinationAddress.java  |  9 ++--
 .../qpid/server/model/NamedAddressSpace.java   |  2 --
 .../java/org/apache/qpid/server/model/Queue.java   | 15 +
 .../apache/qpid/server/queue/QueueEntryImpl.java   |  4 
 .../AbstractNonConnectionAcceptingVirtualHost.java |  6 -
 .../server/virtualhost/AbstractVirtualHost.java|  8 +--
 .../manager/KerberosAuthenticationManagerTest.java |  5 +++--
 .../access/config/LegacyAccessControlAdapter.java  |  3 +--
 .../protocol/v0_10/ServerSessionDelegate.java  | 26 +++---
 .../PropertyConverter_Internal_to_v0_10Test.java   | 19 +---
 .../protocol/v0_10/ServerSessionDelegateTest.java  |  6 +++--
 .../qpid/server/protocol/v0_8/AMQChannel.java  | 17 --
 .../qpid/server/protocol/v0_8/AMQChannelTest.java  |  5 +++--
 .../PropertyConverter_Internal_to_v0_8Test.java| 21 +
 .../protocol/v1_0/AnonymousRelayDestination.java   |  2 +-
 .../qpid/server/protocol/v1_0/Session_1_0.java |  4 ++--
 .../PropertyConverter_1_0_to_0_10Test.java | 23 ++-
 .../v0_8_v0_10/MessageConverter_0_10_to_0_8.java   |  2 +-
 .../PropertyConverter_1_0_to_0_8Test.java  | 21 +
 .../management/amqp/ManagementAddressSpace.java| 10 ++---
 ...ker-Runtime-Handling-Undeliverable-Messages.xml | 21 -
 24 files changed, 137 insertions(+), 100 deletions(-)

diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
 
b/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
index c6a7a95..26a1009 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
@@ -794,7 +794,7 @@ public abstract class AbstractExchange>
 private MessageDestination getAttainedMessageDestination(final String name)
 {
 MessageDestination destination = 
getVirtualHost().getAttainedQueue(name);
-return destination == null ? 
getVirtualHost().getAttainedMessageDestination(name) : destination;
+return destination == null ? 
getVirtualHost().getAttainedMessageDestination(name, false) : destination;
 }
 
 private MessageDestination getOpenedMessageDestination(final String name)
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultDestination.java
 
b/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultDestination.java
index 8b94c60..1206889 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultDestination.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultDestination.java
@@ -99,7 +99,7 @@ public class DefaultDestination implements 
MessageDestination, PermissionedObjec
 {
 RoutingResult result = new RoutingResult<>(message);
 
-DestinationAddress destinationAddress = new 
DestinationAddress(_virtualHost, routingAddress);
+DestinationAddress destinationAddress = new 
DestinationAddress(_virtualHost, routingAddress, true);
 MessageDestination messageDestination = 
destinationAddress.getMessageDestination();
 if (messageDestination != null)
 {
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/model/AttributeValueConverter.java
 
b/broker-core/src/main/java/org/apache/qpid/server/model/AttributeValueConverter.java
index b0f50ab..43fe10e 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/model/AttributeValueConverter.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/model/AttributeValueConverter.java
@@ -1418,6 +1418,10 @@ abstract class AttributeValueConverter
 else if(value instanceof String)
 {
 String interpolated = 
AbstractConfiguredObject.interpolate(object, (String) value);
+if(interpolated.trim().isEmpty())
+{
+return null;
+}
 ObjectMapper objectMapper = new ObjectMapper();
   

[qpid-broker-j] branch master updated (66eabc0 -> 016079c)

[rgodfrey]

This is an automated email from the ASF dual-hosted git repository.

rgodfrey pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git.


from 66eabc0  QPID-8389 : [Broker-J] Support the ability to limit the 
number of active consumers
 new 4a9a435  QPID-8392 : Remove docs references to outdated DLQ 
configuration
 new 016079c  QPID-8392 : Update node auto-creation to aid with automated 
DLQs

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../qpid/server/exchange/AbstractExchange.java |  2 +-
 .../qpid/server/exchange/DefaultDestination.java   |  2 +-
 .../qpid/server/model/AttributeValueConverter.java |  4 +++
 .../qpid/server/model/DestinationAddress.java  |  9 +--
 .../qpid/server/model/NamedAddressSpace.java   |  2 --
 .../java/org/apache/qpid/server/model/Queue.java   | 15 ---
 .../apache/qpid/server/queue/QueueEntryImpl.java   |  4 +++
 .../AbstractNonConnectionAcceptingVirtualHost.java |  6 -
 .../server/virtualhost/AbstractVirtualHost.java|  8 +-
 .../manager/KerberosAuthenticationManagerTest.java |  5 ++--
 .../access/config/LegacyAccessControlAdapter.java  |  3 +--
 .../protocol/v0_10/ServerSessionDelegate.java  | 30 +++---
 .../PropertyConverter_Internal_to_v0_10Test.java   | 19 --
 .../protocol/v0_10/ServerSessionDelegateTest.java  |  6 +++--
 .../qpid/server/protocol/v0_8/AMQChannel.java  | 21 ---
 .../qpid/server/protocol/v0_8/AMQChannelTest.java  |  5 ++--
 .../PropertyConverter_Internal_to_v0_8Test.java| 21 ---
 .../protocol/v1_0/AnonymousRelayDestination.java   |  2 +-
 .../qpid/server/protocol/v1_0/Session_1_0.java |  4 +--
 .../PropertyConverter_1_0_to_0_10Test.java | 23 +
 .../v0_8_v0_10/MessageConverter_0_10_to_0_8.java   |  2 +-
 .../PropertyConverter_1_0_to_0_8Test.java  | 21 ---
 .../management/amqp/ManagementAddressSpace.java| 10 ++--
 ...Broker-Appendix-Queue-Declaration-Arguments.xml |  9 ---
 .../Java-Broker-Appendix-System-Properties.xml |  6 -
 ...ker-Runtime-Handling-Undeliverable-Messages.xml | 21 ++-
 26 files changed, 141 insertions(+), 119 deletions(-)


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

[qpid-broker-j] branch master updated: QPID-8389 : [Broker-J] Support the ability to limit the number of active consumers

[rgodfrey]

This is an automated email from the ASF dual-hosted git repository.

rgodfrey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git


The following commit(s) were added to refs/heads/master by this push:
 new 66eabc0  QPID-8389 : [Broker-J] Support the ability to limit the 
number of active consumers
66eabc0 is described below

commit 66eabc0d836c40e4e34d999149175652aa0d799d
Author: Robert Godfrey 
AuthorDate: Sun Dec 8 21:51:29 2019 +0100

QPID-8389 : [Broker-J] Support the ability to limit the number of active 
consumers
---
 .../org/apache/qpid/server/model/Consumer.java |   1 +
 .../java/org/apache/qpid/server/model/Queue.java   |  13 ++
 .../apache/qpid/server/queue/AbstractQueue.java| 151 +++--
 .../qpid/server/queue/QueueArgumentsConverter.java |  13 ++
 .../qpid/server/queue/QueueConsumerImpl.java   |  13 +-
 ...Broker-Appendix-Queue-Declaration-Arguments.xml |  11 ++
 .../limitliveconsumers/LimitLiveConsumersTest.java | 130 ++
 7 files changed, 291 insertions(+), 41 deletions(-)

diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java 
b/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java
index 9db4b21..505a03e 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java
@@ -90,4 +90,5 @@ public interface Consumer, T extends 
ConsumerTarget> ext
 
 boolean isActive();
 
+boolean isNonLive();
 }
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java 
b/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
index 3920a14..bf4b724 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
@@ -88,6 +88,7 @@ public interface Queue> extends 
ConfiguredObject,
 String MAXIMUM_QUEUE_DEPTH_MESSAGES = "maximumQueueDepthMessages";
 String MAXIMUM_QUEUE_DEPTH_BYTES = "maximumQueueDepthBytes";
 String EXPIRY_POLICY = "expiryPolicy";
+String MAXIMUM_LIVE_CONSUMERS = "maximumLiveConsumers";
 
 String QUEUE_SCAVANGE_COUNT = "qpid.queue.scavenge_count";
 @SuppressWarnings("unused")
@@ -349,6 +350,18 @@ public interface Queue> extends 
ConfiguredObject,
 mandatory = true)
 ExpiryPolicy getExpiryPolicy();
 
+@SuppressWarnings("unused")
+@ManagedContextDefault(name = "queue.defaultMaximumLiveConsumers",
+description = "Specifies the default value for maximum live 
consumers. ")
+int DEFAULT_MAXIMUM_LIVE_CONSUMERS = 0;
+
+@ManagedAttribute(defaultValue = "${queue.defaultMaximumLiveConsumers}",
+description = "Maximum live consumers. If the maximum number of 
live consumers is set to a number greater "
+  + "than zero, then consumers in excess of this limit 
are held in reserve and will only become "
+  + "eligible to receive messages if a live consumer 
is removed")
+int getMaximumLiveConsumers();
+
+
 @ManagedOperation(nonModifying = true, changesConfiguredObjectState = 
false, skipAclCheck = true)
 Collection getPublishingLinks();
 
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java 
b/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
index cc6608d..a9e316e 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
@@ -49,6 +49,7 @@ import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.zip.GZIPInputStream;
@@ -257,6 +258,13 @@ public abstract class AbstractQueue>
 @ManagedAttributeField
 private ExpiryPolicy _expiryPolicy;
 
+@ManagedAttributeField
+private volatile int _maximumLiveConsumers;
+
+private static final AtomicIntegerFieldUpdater 
LIVE_CONSUMERS_UPDATER =
+AtomicIntegerFieldUpdater.newUpdater(AbstractQueue.class, 
"_liveConsumers");
+private volatile int _liveConsumers;
+
 private static final int RECOVERING = 1;
 private static final int COMPLETING_RECOVERY = 2;
 private static final int RECOVERED = 3;
@@ -266,7 +274,7 @@ public abstract class AbstractQueue>
 private final ConcurrentLinkedQueue _postRecoveryQueue = 
new ConcurrentLinkedQueue<>();
 private final ConcurrentMap> 
_defaultFiltersMap = new ConcurrentHa

[qpid-broker-j] branch master updated: QPID-8388 : [Java Broker] Allow configuration of behaviour on unknown queue declare arguments

[rgodfrey]

This is an automated email from the ASF dual-hosted git repository.

rgodfrey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git


The following commit(s) were added to refs/heads/master by this push:
 new 8c299bc  QPID-8388 : [Java Broker] Allow configuration of behaviour on 
unknown queue declare arguments
8c299bc is described below

commit 8c299bc827da86388831a11ccc11796f0652b820
Author: rgodfrey 
AuthorDate: Thu Dec 5 14:28:35 2019 +0100

QPID-8388 : [Java Broker] Allow configuration of behaviour on unknown queue 
declare arguments
---
 .../java/org/apache/qpid/server/model/Queue.java   | 11 
 .../qpid/server/queue/QueueArgumentsConverter.java | 18 +-
 .../protocol/v0_10/ServerSessionDelegate.java  |  8 ++-
 .../qpid/server/protocol/v0_8/AMQChannel.java  |  6 +-
 .../QueueDeclareInvalidOptionBehaviourTest.java| 71 ++
 5 files changed, 109 insertions(+), 5 deletions(-)

diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java 
b/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
index 26dcdc0..3920a14 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
@@ -131,6 +131,17 @@ public interface Queue> extends 
ConfiguredObject,
 description = "The behaviour of consumer if it tries to consumer a 
messages that it cannot convert.")
 MessageConversionExceptionHandlingPolicy 
DEFAULT_MESSAGE_CONVERSION_EXCEPTION_HANDLING_POLICY = 
MessageConversionExceptionHandlingPolicy.REJECT;
 
+enum BehaviourOnUnknownDeclareArgument
+{
+IGNORE, LOG, FAIL
+}
+
+String UNKNOWN_QUEUE_DECLARE_ARGUMENT_BEHAVIOUR_NAME = 
"queue.behaviourOnUnknownDeclareArgument";
+@ManagedContextDefault(name= UNKNOWN_QUEUE_DECLARE_ARGUMENT_BEHAVIOUR_NAME)
+Queue.BehaviourOnUnknownDeclareArgument
+ON_UNKNOWN_QUEUE_DECLARE_OPTION = 
Queue.BehaviourOnUnknownDeclareArgument.FAIL;
+
+
 @SuppressWarnings("unused")
 @ManagedAttribute( defaultValue = 
"${queue.defaultEnsureNonDestructiveConsumers}" )
 boolean isEnsureNondestructiveConsumers();
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/queue/QueueArgumentsConverter.java
 
b/broker-core/src/main/java/org/apache/qpid/server/queue/QueueArgumentsConverter.java
index 05330eb..f9b054d 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/queue/QueueArgumentsConverter.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/queue/QueueArgumentsConverter.java
@@ -139,7 +139,8 @@ public class QueueArgumentsConverter
 
 public static Map convertWireArgsToModel(final String 
queueName,
 final Map wireArguments,
-final Model model)
+final Model model,
+final 
Queue.BehaviourOnUnknownDeclareArgument unknownArgumentBehaviour)
 {
 Map modelArguments = new HashMap<>();
 if(wireArguments != null)
@@ -251,8 +252,19 @@ public class QueueArgumentsConverter
 
 if (!wireArgumentNames.isEmpty())
 {
-throw new IllegalArgumentException(String.format("Unsupported 
queue declare argument(s) : %s",
- 
String.join(",", wireArgumentNames)));
+
+switch(unknownArgumentBehaviour)
+{
+case LOG:
+LOGGER.warn("Unsupported queue declare argument(s) : 
{}", String.join(",", wireArgumentNames));
+break;
+case IGNORE:
+break;
+case FAIL:
+default:
+throw new 
IllegalArgumentException(String.format("Unsupported queue declare argument(s) : 
%s",
+ 
String.join(",", wireArgumentNames)));
+}
 }
 }
 return modelArguments;
diff --git 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
index 06c1690..da95578 100644
--- 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
+++ 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
@@ -1588,10 +1588,16 @@ public class ServerSessionDelegate extends 
MethodDelegate 

[qpid-broker-j] branch master updated: QPID-8373 : Modify test to encourage synchronous send

[rgodfrey]

This is an automated email from the ASF dual-hosted git repository.

rgodfrey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git


The following commit(s) were added to refs/heads/master by this push:
 new c59342a  QPID-8373 : Modify test to encourage synchronous send
c59342a is described below

commit c59342a4eb53fccfc6f7476e7321938f5bd9ac50
Author: Robert Godfrey 
AuthorDate: Sat Nov 23 15:04:15 2019 +0100

QPID-8373 : Modify test to encourage synchronous send
---
 .../java/org/apache/qpid/tests/http/endtoend/message/MessageTest.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git 
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/MessageTest.java
 
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/MessageTest.java
index 36afeed..2be0603 100644
--- 
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/MessageTest.java
+++ 
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/MessageTest.java
@@ -44,6 +44,7 @@ import java.util.stream.IntStream;
 
 import javax.jms.BytesMessage;
 import javax.jms.Connection;
+import javax.jms.DeliveryMode;
 import javax.jms.MapMessage;
 import javax.jms.Message;
 import javax.jms.MessageConsumer;
@@ -160,6 +161,7 @@ public class MessageTest extends HttpTestBase
 Queue queue = session.createQueue(QUEUE_NAME);
 
 MessageProducer producer = session.createProducer(queue);
+producer.setDeliveryMode(DeliveryMode.PERSISTENT);
 Message jmsMessage = session.createMessage();
 producer.send(jmsMessage);
 


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

[qpid-broker-j] branch master updated: QPID-8376 : Fix earlier change to work on JDK 11 as well as JDK 8

[rgodfrey]

This is an automated email from the ASF dual-hosted git repository.

rgodfrey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git


The following commit(s) were added to refs/heads/master by this push:
 new 039e348  QPID-8376 : Fix earlier change to work on JDK 11 as well as 
JDK 8
039e348 is described below

commit 039e34899c229164a557c8e6debec3e11f5db6bc
Author: Robert Godfrey 
AuthorDate: Fri Nov 22 21:34:31 2019 +0100

QPID-8376 : Fix earlier change to work on JDK 11 as well as JDK 8
---
 .../qpid/server/model/BrokerAttributeInjector.java | 185 -
 1 file changed, 106 insertions(+), 79 deletions(-)

diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerAttributeInjector.java
 
b/broker-core/src/main/java/org/apache/qpid/server/model/BrokerAttributeInjector.java
index 8208973..dc4fa3a 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerAttributeInjector.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/model/BrokerAttributeInjector.java
@@ -54,14 +54,16 @@ public class BrokerAttributeInjector implements 
ConfiguredObjectAttributeInjecto
 
 private final Class _hotSpotDiagnosticMXBeanClass;
 private final PlatformManagedObject _hotSpotDiagnosticMXBean;
+private final Class _operatingSystemMXBeanClass;
+private final OperatingSystemMXBean _operatingSystemMXBean;
 
 public BrokerAttributeInjector()
 {
+ClassLoader systemClassLoader = ClassLoader.getSystemClassLoader();
 Class hotSpotDiagnosticMXBeanClass = null;
 PlatformManagedObject hotSpotDiagnosticMXBean = null;
 try
 {
-ClassLoader systemClassLoader = ClassLoader.getSystemClassLoader();
 hotSpotDiagnosticMXBeanClass =
 
Class.forName("com.sun.management.HotSpotDiagnosticMXBean", true, 
systemClassLoader);
 hotSpotDiagnosticMXBean =
@@ -75,6 +77,26 @@ public class BrokerAttributeInjector implements 
ConfiguredObjectAttributeInjecto
 
 _hotSpotDiagnosticMXBeanClass = hotSpotDiagnosticMXBeanClass;
 _hotSpotDiagnosticMXBean = hotSpotDiagnosticMXBean;
+
+
+Class operatingSystemMXBeanClass = null;
+PlatformManagedObject operatingSystemMXBean = null;
+try
+{
+operatingSystemMXBeanClass =
+Class.forName("com.sun.management.OperatingSystemMXBean", 
true, systemClassLoader);
+operatingSystemMXBean =
+ManagementFactory.getPlatformMXBean((Class) operatingSystemMXBeanClass);
+
+}
+catch (IllegalArgumentException | ClassNotFoundException e)
+{
+LOGGER.debug("com.sun.management.OperatingSystemMXBean MXBean: " + 
e);
+}
+
+_operatingSystemMXBeanClass = operatingSystemMXBeanClass;
+_operatingSystemMXBean = (OperatingSystemMXBean) operatingSystemMXBean;
+
 }
 
 @Override
@@ -165,7 +187,8 @@ public class BrokerAttributeInjector implements 
ConfiguredObjectAttributeInjecto
 new 
ConfiguredObjectInjectedStatistic<>(jvmGCCollectionTimeStatisticName,
 
getGCCollectionTime,
 new 
Object[]{garbageCollectorMXBean},
-"Cumulative 
time in ms taken to perform collections for GC " + 
garbageCollectorMXBean.getName(),
+"Cumulative 
time in ms taken to perform collections for GC "
++ 
garbageCollectorMXBean.getName(),
 _typeValidator,
 
StatisticUnit.COUNT,
 
StatisticType.CUMULATIVE,
@@ -187,7 +210,8 @@ public class BrokerAttributeInjector implements 
ConfiguredObjectAttributeInjecto
 new 
ConfiguredObjectInjectedStatistic<>(jvmGCCollectionCountStatisticName,
 
getGCCollectionCount,
 new 
Object[]{garbageCollectorMXBean},
-"Cumulative 
number of collections for GC " + garbageCollectorMXBean.getName(),
+"Cumulative 
number of collections for GC "
++ 
garbageCollectorMXBean.getName(),
 _typeValidator,
   

[qpid-broker-j] branch master updated: QPID-8382 : Allow for making attribute injectors type specific

[rgodfrey]

This is an automated email from the ASF dual-hosted git repository.

rgodfrey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git


The following commit(s) were added to refs/heads/master by this push:
 new cf12504  QPID-8382 : Allow for making attribute injectors type specific
cf12504 is described below

commit cf1250432e74b7793182b7b7970fe07419647e09
Author: rgodfrey 
AuthorDate: Thu Nov 21 12:58:47 2019 +0100

QPID-8382 : Allow for making attribute injectors type specific
---
 .../qpid/server/model/BrokerAttributeInjector.java | 16 ++--
 .../server/model/ConfiguredObjectTypeRegistry.java | 29 --
 .../plugin/ConfiguredObjectAttributeInjector.java  |  6 +
 3 files changed, 29 insertions(+), 22 deletions(-)

diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerAttributeInjector.java
 
b/broker-core/src/main/java/org/apache/qpid/server/model/BrokerAttributeInjector.java
index a2d5278..8208973 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerAttributeInjector.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/model/BrokerAttributeInjector.java
@@ -50,15 +50,7 @@ public class BrokerAttributeInjector implements 
ConfiguredObjectAttributeInjecto
 {
 private static final Logger LOGGER = 
LoggerFactory.getLogger(BrokerAttributeInjector.class);
 
-private final InjectedAttributeOrStatistic.TypeValidator _typeValidator =
-new InjectedAttributeOrStatistic.TypeValidator()
-{
-@Override
-public boolean appliesToType(final Class> type)
-{
-return Broker.class.isAssignableFrom(type);
-}
-};
+private final InjectedAttributeOrStatistic.TypeValidator _typeValidator = 
Broker.class::isAssignableFrom;
 
 private final Class _hotSpotDiagnosticMXBeanClass;
 private final PlatformManagedObject _hotSpotDiagnosticMXBean;
@@ -86,6 +78,12 @@ public class BrokerAttributeInjector implements 
ConfiguredObjectAttributeInjecto
 }
 
 @Override
+public InjectedAttributeStatisticOrOperation.TypeValidator 
getTypeValidator()
+{
+return _typeValidator;
+}
+
+@Override
 public Collection> 
getInjectedAttributes()
 {
 List> attributes = new 
ArrayList<>();
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java
 
b/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java
index 65b8d23..79b5fc6 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java
@@ -815,27 +815,30 @@ public class ConfiguredObjectTypeRegistry
 
 for (ConfiguredObjectAttributeInjector injector : _attributeInjectors)
 {
-for (ConfiguredObjectInjectedAttribute attr : 
injector.getInjectedAttributes())
+if (injector.getTypeValidator().appliesToType((Class>) clazz))
 {
-if (attr.appliesToConfiguredObjectType((Class>) clazz))
+for (ConfiguredObjectInjectedAttribute attr : 
injector.getInjectedAttributes())
 {
-attributeSet.add(attr);
+if (attr.appliesToConfiguredObjectType((Class>) clazz))
+{
+attributeSet.add(attr);
+}
 }
-}
 
-for (ConfiguredObjectInjectedStatistic attr : 
injector.getInjectedStatistics())
-{
-if (attr.appliesToConfiguredObjectType((Class>) clazz))
+for (ConfiguredObjectInjectedStatistic attr : 
injector.getInjectedStatistics())
 {
-statisticSet.add(attr);
+if (attr.appliesToConfiguredObjectType((Class>) clazz))
+{
+statisticSet.add(attr);
+}
 }
-}
 
-for (ConfiguredObjectInjectedOperation operation : 
injector.getInjectedOperations())
-{
-if (operation.appliesToConfiguredObjectType((Class>) clazz))
+for (ConfiguredObjectInjectedOperation operation : 
injector.getInjectedOperations())
 {
-operationsSet.add(operation);
+if (operation.appliesToConfiguredObjectType((Class>) clazz))
+{
+operationsSet.add(operation);
+}
 }
 }
 }
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/plugin/ConfiguredObjectAttributeInjector.java
 
b/broker-core/src/main/java/org/apache/qpid/server/plugin/ConfiguredObjectAttributeInjector.java
index 779884a..1

[qpid-broker-j] branch master updated: QPID-8373 : Add deliveredToConsumerId to MessageInfo

[rgodfrey]

This is an automated email from the ASF dual-hosted git repository.

rgodfrey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git


The following commit(s) were added to refs/heads/master by this push:
 new 5ef9728  QPID-8373 : Add deliveredToConsumerId to MessageInfo
5ef9728 is described below

commit 5ef97289cea7b797e0c50fbeb6f2c91361da0b00
Author: Robert Godfrey 
AuthorDate: Wed Nov 20 10:42:41 2019 +0100

QPID-8373 : Add deliveredToConsumerId to MessageInfo
---
 .../apache/qpid/server/message/MessageInfo.java|  1 +
 .../qpid/server/message/MessageInfoImpl.java   | 10 +
 .../tests/http/endtoend/message/MessageTest.java   | 49 --
 3 files changed, 57 insertions(+), 3 deletions(-)

diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/message/MessageInfo.java 
b/broker-core/src/main/java/org/apache/qpid/server/message/MessageInfo.java
index b0e720b..d0fdce5 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/message/MessageInfo.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/message/MessageInfo.java
@@ -36,6 +36,7 @@ public interface MessageInfo extends ManagedAttributeValue
 int getDeliveryCount();
 String getState();
 String getDeliveredTo();
+String getDeliveredToConsumerId();
 Date getArrivalTime();
 boolean isPersistent();
 String getMessageId();
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/message/MessageInfoImpl.java 
b/broker-core/src/main/java/org/apache/qpid/server/message/MessageInfoImpl.java
index f495361..252950e 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/message/MessageInfoImpl.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/message/MessageInfoImpl.java
@@ -25,6 +25,8 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import org.apache.qpid.server.model.Consumer;
+
 public class MessageInfoImpl implements MessageInfo
 {
 private final String _deliveredTo;
@@ -52,6 +54,7 @@ public class MessageInfoImpl implements MessageInfo
 private final Date _notValidBefore;
 private final String _messageType;
 private final String _groupId;
+private final String _deliveredToConsumerId;
 
 public MessageInfoImpl(final MessageInstance instance, final boolean 
includeHeaders)
 {
@@ -60,6 +63,7 @@ public class MessageInfoImpl implements MessageInfo
 
 MessageInstanceConsumer acquiringConsumer = 
instance.getAcquiringConsumer();
 _deliveredTo = acquiringConsumer == null ? null : 
String.valueOf(acquiringConsumer.getIdentifier());
+_deliveredToConsumerId = (acquiringConsumer instanceof Consumer) ?  
String.valueOf(((Consumer)acquiringConsumer).getId()) : null;
 _arrivalTime = message.getArrivalTime() == 0L ? null : new 
Date(message.getArrivalTime());
 _messageType = message.getMessageType();
 _persistent = message.isPersistent();
@@ -150,6 +154,12 @@ public class MessageInfoImpl implements MessageInfo
 }
 
 @Override
+public String getDeliveredToConsumerId()
+{
+return _deliveredToConsumerId;
+}
+
+@Override
 public Date getArrivalTime()
 {
 return _arrivalTime == null ? null : new Date(_arrivalTime.getTime());
diff --git 
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/MessageTest.java
 
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/MessageTest.java
index d1661e6..36afeed 100644
--- 
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/MessageTest.java
+++ 
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/MessageTest.java
@@ -32,8 +32,6 @@ import static org.hamcrest.Matchers.typeCompatibleWith;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assume.assumeThat;
 
-import java.io.InputStream;
-import java.net.HttpURLConnection;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -57,7 +55,6 @@ import javax.jms.TextMessage;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.common.base.Strings;
-import com.google.common.io.ByteStreams;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -153,6 +150,52 @@ public class MessageTest extends HttpTestBase
 
 
 @Test
+public void getAcquiredMessage() throws Exception
+{
+
+Connection connection = getConnection();
+try
+{
+Session session = connection.createSession(false, 
Session.CLIENT_ACKNOWLEDGE);
+Queue queue = session.createQueue(QUEUE_NAME);
+
+MessageProducer producer = session.createProducer(queue);
+Message jmsMessage = session.createMessage();
+producer.send(jmsMessage);
+
+List> messages = 
getHelper().postJ

[qpid-broker-j] branch master updated: QPID-8377 : add test to verify IGNORE behaviour

[rgodfrey]

This is an automated email from the ASF dual-hosted git repository.

rgodfrey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git


The following commit(s) were added to refs/heads/master by this push:
 new 8a2a025  QPID-8377 : add test to verify IGNORE behaviour
8a2a025 is described below

commit 8a2a02521a76f889e23d89f67ff025e73b578df5
Author: Robert Godfrey 
AuthorDate: Tue Nov 19 11:57:11 2019 +0100

QPID-8377 : add test to verify IGNORE behaviour
---
 .../ExchangeDeclareInvalidOptionBehaviourTest.java | 67 ++
 1 file changed, 67 insertions(+)

diff --git 
a/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/exchange/ExchangeDeclareInvalidOptionBehaviourTest.java
 
b/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/exchange/ExchangeDeclareInvalidOptionBehaviourTest.java
new file mode 100644
index 000..2555024
--- /dev/null
+++ 
b/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/exchange/ExchangeDeclareInvalidOptionBehaviourTest.java
@@ -0,0 +1,67 @@
+/*
+ * 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.v0_8.extension.exchange;
+
+import static org.apache.qpid.tests.utils.BrokerAdmin.KIND_BROKER_J;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import java.util.Collections;
+
+import org.junit.Test;
+
+import org.apache.qpid.server.protocol.ErrorCodes;
+import org.apache.qpid.server.protocol.v0_8.transport.ChannelOpenOkBody;
+import org.apache.qpid.server.protocol.v0_8.transport.ConnectionCloseBody;
+import org.apache.qpid.server.protocol.v0_8.transport.ExchangeBoundOkBody;
+import org.apache.qpid.server.protocol.v0_8.transport.ExchangeDeclareOkBody;
+import org.apache.qpid.tests.protocol.v0_8.FrameTransport;
+import org.apache.qpid.tests.protocol.v0_8.Interaction;
+import org.apache.qpid.tests.utils.BrokerAdminUsingTestBase;
+import org.apache.qpid.tests.utils.BrokerSpecific;
+import org.apache.qpid.tests.utils.ConfigItem;
+
+@BrokerSpecific(kind = KIND_BROKER_J)
+@ConfigItem(name = "exchange.behaviourOnUnknownDeclareArgument", value = 
"IGNORE")
+public class ExchangeDeclareInvalidOptionBehaviourTest extends 
BrokerAdminUsingTestBase
+{
+private static final String TEST_EXCHANGE = "testExchange";
+
+@Test
+public void exchangeDeclareInvalidWireArguments() throws Exception
+{
+try (FrameTransport transport = new 
FrameTransport(getBrokerAdmin()).connect())
+{
+final Interaction interaction = transport.newInteraction();
+interaction.negotiateOpen()
+   .channel()
+   .open()
+   .consumeResponse(ChannelOpenOkBody.class)
+   .exchange()
+   .declareName(TEST_EXCHANGE)
+   .declareArguments(Collections.singletonMap("foo", 
"bar"))
+   .declare()
+   .consumeResponse(ExchangeDeclareOkBody.class);
+
+
+}
+}
+}


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

[qpid-broker-j] branch master updated: QPID-8380 : Add groupId to MessageInfo

[rgodfrey]

This is an automated email from the ASF dual-hosted git repository.

rgodfrey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git


The following commit(s) were added to refs/heads/master by this push:
 new 1ffacb6  QPID-8380 : Add groupId to MessageInfo
1ffacb6 is described below

commit 1ffacb65710a9d1f46350b5361e337a76bd924ca
Author: Robert Godfrey 
AuthorDate: Tue Nov 19 11:39:15 2019 +0100

QPID-8380 : Add groupId to MessageInfo
---
 .../apache/qpid/server/message/MessageInfo.java|  1 +
 .../qpid/server/message/MessageInfoImpl.java   |  8 ++
 .../tests/http/endtoend/message/MessageTest.java   | 33 +-
 3 files changed, 41 insertions(+), 1 deletion(-)

diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/message/MessageInfo.java 
b/broker-core/src/main/java/org/apache/qpid/server/message/MessageInfo.java
index 055ec23..b0e720b 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/message/MessageInfo.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/message/MessageInfo.java
@@ -49,6 +49,7 @@ public interface MessageInfo extends ManagedAttributeValue
 Date getTimestamp();
 String getType();
 String getUserId();
+String getGroupId();
 Map getHeaders();
 Date getNotValidBefore();
 String getInitialRoutingAddress();
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/message/MessageInfoImpl.java 
b/broker-core/src/main/java/org/apache/qpid/server/message/MessageInfoImpl.java
index 7626dc6..f495361 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/message/MessageInfoImpl.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/message/MessageInfoImpl.java
@@ -51,6 +51,7 @@ public class MessageInfoImpl implements MessageInfo
 private final String _to;
 private final Date _notValidBefore;
 private final String _messageType;
+private final String _groupId;
 
 public MessageInfoImpl(final MessageInstance instance, final boolean 
includeHeaders)
 {
@@ -73,6 +74,7 @@ public class MessageInfoImpl implements MessageInfo
 _timestamp = messageHeader.getTimestamp() == 0L ? null : new 
Date(messageHeader.getTimestamp());
 _type = messageHeader.getType();
 _userId = messageHeader.getUserId();
+_groupId = messageHeader.getGroupId();
 if (instance.isAvailable())
 {
 _state = instance.isHeld() ? "Held" : "Available";
@@ -226,6 +228,12 @@ public class MessageInfoImpl implements MessageInfo
 }
 
 @Override
+public String getGroupId()
+{
+return _groupId;
+}
+
+@Override
 public Map getHeaders()
 {
 return _headers;
diff --git 
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/MessageTest.java
 
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/MessageTest.java
index 4c525e3..d1661e6 100644
--- 
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/MessageTest.java
+++ 
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/MessageTest.java
@@ -90,7 +90,7 @@ public class MessageTest extends HttpTestBase
 }
 
 @Test
-public void getJmsMessage() throws Exception
+public void getJmsMessageWithProperty() throws Exception
 {
 final String messageProperty = "myProp";
 final String messagePropertyValue = "myValue";
@@ -122,6 +122,37 @@ public class MessageTest extends HttpTestBase
 }
 
 @Test
+public void getJmsMessageWithGroupId() throws Exception
+{
+final String groupIdValue = "mygroup";
+
+Connection connection = getConnection();
+try
+{
+Session session = connection.createSession(false, 
Session.AUTO_ACKNOWLEDGE);
+MessageProducer producer = 
session.createProducer(session.createQueue(QUEUE_NAME));
+Message message = session.createMessage();
+message.setStringProperty("JMSXGroupID", groupIdValue);
+producer.send(message);
+}
+finally
+{
+connection.close();
+}
+
+List> messages = 
getHelper().postJson("queue/myqueue/getMessageInfo",
+  
Collections.singletonMap("includeHeaders",
+   
Boolean.FALSE),
+  
LIST_MAP_TYPE_REF, SC_OK);
+assertThat(messages.size(), is(equalTo(1)));
+
+Map message = messages.get(0);
+
+assertThat(message.get("groupId"), is(groupIdValue));
+}
+
+
+@Test
  

[qpid-broker-j] branch master updated: QPID-8377 : Allow configuration of behaviour with unknown exchange declare arguments

[rgodfrey]

This is an automated email from the ASF dual-hosted git repository.

rgodfrey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git


The following commit(s) were added to refs/heads/master by this push:
 new 03b751e  QPID-8377 : Allow configuration of behaviour with unknown 
exchange declare arguments
03b751e is described below

commit 03b751e1467f7482c825f6c5f09a89bb0157b057
Author: Robert Godfrey 
AuthorDate: Sun Nov 17 23:12:30 2019 +0100

QPID-8377 : Allow configuration of behaviour with unknown exchange declare 
arguments
---
 .../org/apache/qpid/server/model/Exchange.java | 11 ++
 .../protocol/v0_10/ServerSessionDelegate.java  | 24 +-
 .../qpid/server/protocol/v0_8/AMQChannel.java  | 22 
 3 files changed, 48 insertions(+), 9 deletions(-)

diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java 
b/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java
index eb54c75..800f57c 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java
@@ -52,6 +52,17 @@ public interface Exchange> extends 
ConfiguredObject, Me
 REJECT, DISCARD
 }
 
+enum BehaviourOnUnknownDeclareArgument
+{
+IGNORE, LOG, FAIL
+}
+
+String UNKNOWN_EXCHANGE_DECLARE_ARGUMENT_BEHAVIOUR_NAME = 
"exchange.behaviourOnUnknownDeclareArgument";
+@ManagedContextDefault(name= 
UNKNOWN_EXCHANGE_DECLARE_ARGUMENT_BEHAVIOUR_NAME)
+BehaviourOnUnknownDeclareArgument
+ON_UNKNOWN_EXCHANGE_DECLARE_OPTION = 
BehaviourOnUnknownDeclareArgument.FAIL;
+
+
 // Attributes
 
 @ManagedAttribute(description = "Provides an alternate destination that, 
depending on behaviour requested by the "
diff --git 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
index d97f1c6..06c1690 100644
--- 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
+++ 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
@@ -938,7 +938,7 @@ public class ServerSessionDelegate extends 
MethodDelegate impleme
 
attributes.put(org.apache.qpid.server.model.Exchange.ALTERNATE_BINDING,

Collections.singletonMap(AlternateBinding.DESTINATION, alternateExchangeName));
 }
-validateExchangeDeclareArguments(attributes, 
session.getAMQPConnection().getModel());
+validateAndSanitizeExchangeDeclareArguments(attributes, 
session.getAMQPConnection());
 addressSpace.createMessageDestination(Exchange.class, 
attributes);;
 }
 catch(ReservedExchangeNameException e)
@@ -997,8 +997,9 @@ public class ServerSessionDelegate extends 
MethodDelegate impleme
 }
 }
 
-private void validateExchangeDeclareArguments(final Map 
attributes, final Model model)
+private void validateAndSanitizeExchangeDeclareArguments(final Map attributes, final AMQPConnection_0_10 connection)
 {
+final Model model = connection.getModel();
 final ConfiguredObjectTypeRegistry typeRegistry = 
model.getTypeRegistry();
 final List> types = new 
ArrayList<>(typeRegistry.getAttributeTypes(Exchange.class).values());
 typeRegistry.getTypeSpecialisations(Exchange.class).forEach(type -> 
types.addAll(typeRegistry.getTypeSpecificAttributes(type)));
@@ -1007,11 +1008,24 @@ public class ServerSessionDelegate extends 
MethodDelegate impleme
   .filter(name -> 
types.stream().noneMatch(a -> Objects.equals(name, a.getName())

 && !a.isDerived()))
   .collect(Collectors.toSet());
-
 if (!unsupported.isEmpty())
 {
-throw new IllegalArgumentException(String.format(
-"Unsupported exchange declare arguments : %s", 
String.join(",", unsupported)));
+Exchange.BehaviourOnUnknownDeclareArgument 
unknownArgumentBehaviour =
+
connection.getContextValue(Exchange.BehaviourOnUnknownDeclareArgument.class,
+   
Exchange.UNKNOWN_EXCHANGE_DECLARE_ARGUMENT_BEHAVIOUR_NAME);
+switch(unknownArgumentBehaviour)
+{
+case LOG:
+LOGGER.warn("Unsupported exchange declare arguments : {}", 
String.join

[qpid-broker-j] branch master updated: QPID-8376 : Report Process CPU usage in Broker Stats

[rgodfrey]

This is an automated email from the ASF dual-hosted git repository.

rgodfrey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git


The following commit(s) were added to refs/heads/master by this push:
 new b8d24fc  QPID-8376 : Report Process CPU usage in Broker Stats
b8d24fc is described below

commit b8d24fc93ba41d3a4b4b5b74c04ea444a78e7943
Author: Robert Godfrey 
AuthorDate: Sun Nov 17 13:14:50 2019 +0100

QPID-8376 : Report Process CPU usage in Broker Stats
---
 .../qpid/server/model/BrokerAttributeInjector.java | 105 +
 1 file changed, 105 insertions(+)

diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerAttributeInjector.java
 
b/broker-core/src/main/java/org/apache/qpid/server/model/BrokerAttributeInjector.java
index 42d108e..a2d5278 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerAttributeInjector.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/model/BrokerAttributeInjector.java
@@ -23,13 +23,18 @@ package org.apache.qpid.server.model;
 import java.lang.management.GarbageCollectorMXBean;
 import java.lang.management.ManagementFactory;
 import java.lang.management.MemoryPoolMXBean;
+import java.lang.management.OperatingSystemMXBean;
 import java.lang.management.PlatformManagedObject;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
+import java.util.function.ToLongFunction;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -197,6 +202,95 @@ public class BrokerAttributeInjector implements 
ConfiguredObjectAttributeInjecto
 LOGGER.warn("Failed to inject statistic '{}'", 
jvmGCCollectionCountStatisticName, e);
 }
 }
+
+OperatingSystemMXBean osMXBean = 
ManagementFactory.getOperatingSystemMXBean();
+try
+{
+Method method = 
osMXBean.getClass().getDeclaredMethod("getProcessCpuTime");
+method.setAccessible(true);
+ToLongFunction supplier  = broker -> {
+try
+{
+final Object returnValue = method.invoke(osMXBean);
+
+if(returnValue instanceof Number)
+{
+return ((Number)returnValue).longValue();
+}
+}
+catch (IllegalAccessException | InvocationTargetException e)
+{
+LOGGER.warn("Unable to get cumulative process CPU time");
+}
+return -1L;
+};
+
+Method getLongValue = 
BrokerAttributeInjector.class.getDeclaredMethod("getLongValue",
+   
   Broker.class,
+   
   ToLongFunction.class);
+
+final ConfiguredObjectInjectedStatistic injectedStatistic =
+new ConfiguredObjectInjectedStatistic<>("processCpuTime",
+getLongValue,
+new 
Object[]{supplier},
+"Cumulative 
process CPU time",
+_typeValidator,
+
StatisticUnit.TIME_DURATION,
+
StatisticType.CUMULATIVE,
+osMXBean.getName()
++ " Process CPU 
Time");
+statistics.add(injectedStatistic);
+
+}
+catch (NoSuchMethodException e)
+{
+LOGGER.warn("Failed to inject statistic 'getProcessCpuTime'", e);
+}
+
+try
+{
+Method method = 
osMXBean.getClass().getDeclaredMethod("getProcessCpuLoad");
+method.setAccessible(true);
+Function supplier  = broker -> {
+try
+{
+final Object returnValue = method.invoke(osMXBean);
+
+if(returnValue instanceof Number)
+{
+return BigDecimal.valueOf(((Number) 
returnValue).doubleValue()).setScale(4,
+   
  RoundingMode.HALF_UP);
+}
+}
+catch (IllegalAccessException | InvocationTargetEx

[qpid-broker-j] branch master updated: QPID-8318 : Fix system test

[rgodfrey]

This is an automated email from the ASF dual-hosted git repository.

rgodfrey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git


The following commit(s) were added to refs/heads/master by this push:
 new dcffe40  QPID-8318 : Fix system test
dcffe40 is described below

commit dcffe40f54366cb585344d0ec2d57e9dde6d62c8
Author: rgodfrey 
AuthorDate: Mon May 27 11:50:30 2019 +0200

QPID-8318 : Fix system test
---
 .../src/test/java/org/apache/qpid/tests/protocol/v0_8/QueueTest.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git 
a/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/QueueTest.java
 
b/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/QueueTest.java
index 54a8f20..a5b5c26 100644
--- 
a/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/QueueTest.java
+++ 
b/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/QueueTest.java
@@ -430,15 +430,14 @@ public class QueueTest extends BrokerAdminUsingTestBase

.queue().purgeName(BrokerAdmin.TEST_QUEUE_NAME).purge()

.consumeResponse().getLatestResponse(QueuePurgeOkBody.class);
 
-/* TODO purge currently always returns 0 */
-//assertThat(response.getMessageCount(), is(equalTo(1L)));
+assertThat(response.getMessageCount(), is(equalTo(1L)));
 
 QueueDeclareOkBody passive = interaction.queue()
 
.declareName(BrokerAdmin.TEST_QUEUE_NAME)
 
.declarePassive(true).declare()
 
.consumeResponse().getLatestResponse(QueueDeclareOkBody.class);
 assertThat(passive.getQueue(), 
is(equalTo(AMQShortString.valueOf(BrokerAdmin.TEST_QUEUE_NAME;
-assertThat(response.getMessageCount(), is(equalTo(0L)));
+assertThat(passive.getMessageCount(), is(equalTo(0L)));
 }
 }
 


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

[qpid-broker-j] branch master updated: QPID-8318 : Queue.Purge does not return deleted count

[rgodfrey]

This is an automated email from the ASF dual-hosted git repository.

rgodfrey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git


The following commit(s) were added to refs/heads/master by this push:
 new 9ded8db  QPID-8318 : Queue.Purge does not return deleted count
9ded8db is described below

commit 9ded8dbcc69cd3ae07d095c05ad29ee6db3dfbd5
Author: rgodfrey 
AuthorDate: Mon May 27 11:26:45 2019 +0200

QPID-8318 : Queue.Purge does not return deleted count
---
 .../main/java/org/apache/qpid/server/queue/AbstractQueue.java | 11 ++-
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java 
b/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
index d0f2f30..375732b 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
@@ -1748,20 +1748,13 @@ public abstract class AbstractQueue>
 while (queueListIterator.advance())
 {
 final QueueEntry node = queueListIterator.getNode();
-boolean acquired = node.acquireOrSteal(new Runnable()
-{
-@Override
-public void run()
-{
-dequeueEntry(node);
-}
-});
+boolean acquired = node.acquireOrSteal(() -> dequeueEntry(node));
 
 if (acquired)
 {
 dequeueEntry(node, txn);
+count++;
 }
-
 }
 
 txn.commit();


-
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-8242 : JDBC store should remove message content/metadata asynchronously

[rgodfrey]

Repository: qpid-broker-j
Updated Branches:
  refs/heads/master 7a99cdc98 -> bb57b5159


QPID-8242 : JDBC store should remove message content/metadata asynchronously


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

Branch: refs/heads/master
Commit: bb57b51593128b31c796f80cba249f9a3e126177
Parents: 7a99cdc
Author: rgodfrey 
Authored: Mon Oct 29 21:58:29 2018 +0100
Committer: rgodfrey 
Committed: Mon Oct 29 21:58:29 2018 +0100

--
 .../store/jdbc/AbstractJDBCMessageStore.java| 124 +--
 1 file changed, 87 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/bb57b515/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCMessageStore.java
--
diff --git 
a/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCMessageStore.java
 
b/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCMessageStore.java
index 4ad0fe6..e92aa73 100644
--- 
a/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCMessageStore.java
+++ 
b/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCMessageStore.java
@@ -38,8 +38,11 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
 
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -83,6 +86,10 @@ public abstract class AbstractJDBCMessageStore implements 
MessageStore
 
 private final AtomicLong _messageId = new AtomicLong(0);
 
+private static final List EMPTY_LIST = Collections.emptyList();
+private final AtomicReference> _messagesToDelete = new 
AtomicReference<>(EMPTY_LIST);
+private final AtomicBoolean _messageRemovalScheduled = new AtomicBoolean();
+
 
 protected final EventManager _eventManager = new EventManager();
 private ConfiguredObject _parent;
@@ -409,57 +416,100 @@ public abstract class AbstractJDBCMessageStore 
implements MessageStore
 return _messageId.incrementAndGet();
 }
 
-private void removeMessage(long messageId)
+private void removeMessageAsync(long messageId)
+{
+List orig;
+List updated;
+do
+{
+orig = _messagesToDelete.get();
+updated = new ArrayList<>(orig.size()+1);
+updated.addAll(orig);
+updated.add(messageId);
+updated = Collections.unmodifiableList(updated);
+} while (! _messagesToDelete.compareAndSet(orig, updated));
+scheduleMessageRemoval();
+}
+
+private void scheduleMessageRemoval()
 {
-try(Connection conn = newConnection())
+if(_messageRemovalScheduled.compareAndSet(false, true))
 {
-try
-{
-try(PreparedStatement stmt = conn.prepareStatement("DELETE 
FROM " + getMetaDataTableName()
-   + " WHERE 
message_id = ?"))
+_executor.submit(() -> {
+List messageIds;
+do
 {
-stmt.setLong(1, messageId);
-int results = stmt.executeUpdate();
-stmt.close();
+messageIds = _messagesToDelete.getAndSet(EMPTY_LIST);
+removeMessages(messageIds);
+} while(!messageIds.isEmpty());
+
+_messageRemovalScheduled.set(false);
+if(!_messagesToDelete.get().isEmpty())
+{
+scheduleMessageRemoval();
+}
 
-if (results == 0)
+});
+}
+}
+
+boolean isMessageRemovalScheduled()
+{
+return _messageRemovalScheduled.get();
+}
+
+private void removeMessages(List messageIds)
+{
+if(messageIds != null && !messageIds.isEmpty())
+{
+String inpart = 
messageIds.stream().map(Object::toString).collect(Collectors.joining(", ", "(", 
")"));
+   

qpid-broker-j git commit: QPID-8240 : Detect idle connections

[rgodfrey]

Repository: qpid-broker-j
Updated Branches:
  refs/heads/master c8c820330 -> 339a57f6f


QPID-8240 : Detect idle connections


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

Branch: refs/heads/master
Commit: 339a57f6faf0edad685e9d72be105ca76d8ac9bb
Parents: c8c8203
Author: Robert Godfrey 
Authored: Tue Sep 18 20:18:02 2018 +0200
Committer: Robert Godfrey 
Committed: Tue Sep 18 20:18:02 2018 +0200

--
 .../server/consumer/AbstractConsumerTarget.java |   2 +-
 .../server/model/AbstractConfiguredObject.java  |   6 +-
 .../apache/qpid/server/model/Connection.java|  20 ++-
 .../qpid/server/transport/AMQPConnection.java   |   4 +
 .../transport/AbstractAMQPConnection.java   |  98 +++---
 .../protocol/v0_10/AMQPConnection_0_10Impl.java |  34 ++---
 .../protocol/v0_8/AMQPConnection_0_8Impl.java   |  42 ++
 .../protocol/v1_0/AMQPConnection_1_0Impl.java   | 128 +++
 .../protocol/v1_0/FrameOutputHandler.java   |  33 -
 .../server/protocol/v1_0/framing/AMQFrame.java  |  10 --
 .../protocol/v1_0/framing/TransportFrame.java   |   1 +
 .../protocol/v1_0/ProtocolEngine_1_0_0Test.java |  10 +-
 12 files changed, 182 insertions(+), 206 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/339a57f6/broker-core/src/main/java/org/apache/qpid/server/consumer/AbstractConsumerTarget.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/consumer/AbstractConsumerTarget.java
 
b/broker-core/src/main/java/org/apache/qpid/server/consumer/AbstractConsumerTarget.java
index c590eca..7b5429e 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/consumer/AbstractConsumerTarget.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/consumer/AbstractConsumerTarget.java
@@ -208,7 +208,7 @@ public abstract class AbstractConsumerTarget
 public final void send(final MessageInstanceConsumer consumer, 
MessageInstance entry, boolean batch)
 {
 doSend(consumer, entry, batch);
-
+getSession().getAMQPConnection().updateLastMessageOutboundTime();
 if (consumer.acquires())
 {
 entry.makeAcquisitionStealable();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/339a57f6/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 3bc6c84..f7b77f1 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
@@ -3433,7 +3433,11 @@ public abstract class AbstractConfiguredObject> im
 {
 if(allStats || statistics.contains(stat.getName()))
 {
-map.put(stat.getName(), stat.getValue(this));
+Object value = stat.getValue(this);
+if(value != null)
+{
+map.put(stat.getName(), value);
+}
 }
 }
 return map;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/339a57f6/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java 
b/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java
index 14ee17a..62cefc1 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java
@@ -120,7 +120,7 @@ public interface Connection> 
extends ConfiguredObject
   description = "Total size of all messages received by 
this connection.")
 long getBytesIn();
 
-// currently this reports outbound  message content size without header.
+// currently this reports outbound message content size without header.
 // See also QPID-7689: 
https://issues.apache.org/jira/browse/QPID-7689?focusedCommentId=16022923#comment-16022923
 @SuppressWarnings("unused")
 @ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units = 
StatisticUnit.BYTES, label = "Outbound",
@@ -143,6 +143,24 @@ public interface Connection> 
extends ConfiguredObject
 Date getLastIoTime();
 
 @SuppressWarnings("unused")
+

[3/3] qpid-broker-j git commit: QPID-8241 : Remove use of javax.xml.bind.DatatypeConverter

[rgodfrey]

QPID-8241 : Remove use of javax.xml.bind.DatatypeConverter


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

Branch: refs/heads/master
Commit: c8c82033021fb8b0ebfea5bd6367832780a3a8c4
Parents: b770054
Author: Robert Godfrey 
Authored: Tue Sep 18 16:14:55 2018 +0200
Committer: Robert Godfrey 
Committed: Tue Sep 18 16:14:55 2018 +0200

--
 .../berkeleydb/BDBAMQP10V0UpgradeTest.java  |   4 +-
 .../server/model/AttributeValueConverter.java   |  45 +-
 .../AutoGeneratedSelfSignedKeyStoreImpl.java|   8 +-
 .../security/SiteSpecificTrustStoreImpl.java|   4 +-
 .../security/auth/database/HashedUser.java  |   5 +-
 .../AbstractScramAuthenticationManager.java |  12 +-
 .../manager/AuthenticationResultCacher.java |   4 +-
 .../auth/manager/MD5AuthenticationProvider.java |   5 +-
 .../OAuth2AuthenticationProviderImpl.java   |   5 +-
 ...oudFoundryOAuth2IdentityResolverService.java |   5 +-
 .../auth/sasl/scram/ScramSaslServer.java|   6 +-
 .../encryption/AESKeyFileEncrypter.java |   4 +-
 .../apache/qpid/server/util/DataUrlUtils.java   |   4 +-
 .../org/apache/qpid/server/util/StringUtil.java |  16 +-
 .../org/apache/qpid/server/util/Strings.java|   6 +-
 .../model/AttributeValueConverterTest.java  |   2 +-
 .../singleton/AbstractConfiguredObjectTest.java |   2 +-
 .../server/security/NonJavaKeyStoreTest.java|   6 +-
 ...e64MD5PasswordFilePrincipalDatabaseTest.java |   4 +-
 .../auth/manager/oauth2/OAuth2MockEndpoint.java |   4 +-
 .../sasl/crammd5/CramMd5NegotiatorTest.java |   7 +-
 .../auth/sasl/scram/ScramNegotiatorTest.java|   8 +-
 .../transport/TCPandSSLTransportTest.java   |   4 +-
 .../network/security/ssl/SSLUtilTest.java   | 754 +--
 .../servlet/ServletConnectionPrincipal.java |   4 +-
 .../ConfiguredObjectExpressionFactory.java  |  54 +-
 .../plugin/servlet/rest/SaslServlet.java|   6 +-
 .../plugin/GunzipOutputStreamTest.java  |   7 +-
 .../query/ConfiguredObjectQueryTest.java|  15 +-
 .../client/MessageVerifier.java |   7 +-
 .../apache/qpid/tests/protocol/SaslUtils.java   |  15 +-
 .../apache/qpid/tests/http/HttpTestHelper.java  |   4 +-
 .../tests/http/authentication/SaslTest.java |  17 +-
 .../jms_1_1/extensions/tls/TlsTest.java |   8 +-
 .../apache/qpid/tools/RestStressTestClient.java |   8 +-
 35 files changed, 580 insertions(+), 489 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c8c82033/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBAMQP10V0UpgradeTest.java
--
diff --git 
a/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBAMQP10V0UpgradeTest.java
 
b/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBAMQP10V0UpgradeTest.java
index 2d8fd16..c8c5e9a 100644
--- 
a/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBAMQP10V0UpgradeTest.java
+++ 
b/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBAMQP10V0UpgradeTest.java
@@ -42,7 +42,6 @@ import javax.jms.Message;
 import javax.jms.MessageConsumer;
 import javax.jms.Queue;
 import javax.jms.Session;
-import javax.xml.bind.DatatypeConverter;
 
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -50,6 +49,7 @@ import org.junit.Test;
 
 import org.apache.qpid.server.model.Protocol;
 import org.apache.qpid.server.util.FileUtils;
+import org.apache.qpid.server.util.StringUtil;
 import org.apache.qpid.server.virtualhostnode.berkeleydb.BDBVirtualHostNode;
 import org.apache.qpid.systests.JmsTestBase;
 import org.apache.qpid.tests.utils.ConfigItem;
@@ -117,7 +117,7 @@ public class BDBAMQP10V0UpgradeTest extends UpgradeTestBase
 {
 MessageDigest digest = MessageDigest.getInstance("SHA-256");
 byte[] hash = digest.digest(content);
-return DatatypeConverter.printHexBinary(hash);
+return StringUtil.toHex(hash);
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c8c82033/broker-core/src/main/java/org/apache/qpid/server/model/AttributeValueConverter.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/model/AttributeValueConverter.java
 
b/broker-core/src/main/java/org/apache/qpid/server/model/AttributeValueConverter.java
index a335fd1..b0f50ab 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/model/AttributeValueConverter.java
+++ 

[2/3] qpid-broker-j git commit: QPID-8241 : Remove use of javax.xml.bind.DatatypeConverter

[rgodfrey]

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c8c82033/broker-core/src/test/java/org/apache/qpid/server/transport/network/security/ssl/SSLUtilTest.java
--
diff --git 
a/broker-core/src/test/java/org/apache/qpid/server/transport/network/security/ssl/SSLUtilTest.java
 
b/broker-core/src/test/java/org/apache/qpid/server/transport/network/security/ssl/SSLUtilTest.java
index 85833c0..7498b6a 100644
--- 
a/broker-core/src/test/java/org/apache/qpid/server/transport/network/security/ssl/SSLUtilTest.java
+++ 
b/broker-core/src/test/java/org/apache/qpid/server/transport/network/security/ssl/SSLUtilTest.java
@@ -36,6 +36,7 @@ import java.security.cert.Certificate;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 import java.util.Arrays;
+import java.util.Base64;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
@@ -45,7 +46,6 @@ import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLEngineResult;
 import javax.net.ssl.TrustManagerFactory;
-import javax.xml.bind.DatatypeConverter;
 
 import org.junit.Test;
 
@@ -382,376 +382,376 @@ public class SSLUtilTest extends UnitTestBase
 return clientEngine;
 }
 
-private static byte[] TRUSTSTORE = 
DatatypeConverter.parseBase64Binary("/u3+7QINAgAPa2V5c3RvcmUyLWFsaWFzAAABVutBZIkABVguNTA5AAAGHzCCBhsw"
-   
+"ggQDoAMCAQICCQCrOvhXap7bYTANBgkqhkiG9w0BAQUFADBcMQswCQYDVQQGEwJVUzEQMA4GA1UE"
-   
+"CBMHcHJpdmF0ZTERMA8GA1UEBxMIcHJvdmluY2UxDTALBgNVBAoTBGNpdHkxGTAXBgNVBAMTEGFt"
-   
+"cXAuZXhhbXBsZS5jb20wHhcNMTYwOTAyMTQxNTE1WhcNMjYwNzEyMTQxNTE1WjBcMQswCQYDVQQG"
-   
+"EwJVUzEQMA4GA1UECBMHcHJpdmF0ZTERMA8GA1UEBxMIcHJvdmluY2UxDTALBgNVBAoTBGNpdHkx"
-   
+"GTAXBgNVBAMTEGFtcXAuZXhhbXBsZS5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC"
-   
+"AQCwc7RdXSWaFrtNp7RQ1YEh0n2S8VjtBosY5FB6BoNe2B14LyIVQqA/bmbgZJAfn2RTKnEcxyHL"
-   
+"qM1PZThj2lyb9/mtvt2k4gRviP4/ZYbcrtByParZPERu7gmxe7eaJn7ghpqVY5zaJ96XQFSiSzNK"
-   
+"6jBNswx2zMhMnLEzegXFbLL125K8B/++1dJNK2gB3o/M9692mygrJSvGwuPmDYcWQnzsyLPTYx0/"
-   
+"Y+eNtnaBx+4NjsSLCvlp9G7pKqHiKb4agatLHNPyMubt600eV56xWeZ4ujvZgPuPmNhO0ogtZpFW"
-   
+"tF7NrPSCbEXEMVhSgh9mrR1dyR5amEFWCvs23kSDtQZl895Z5CXm2GRAc10HYu5NJym4UE1utsAP"
-   
+"nRhcJ7lOl/lnMfXG+rbn0fnBbh5zoXi32UcCkldNLbXn9fBSn17hRZ5TmXmGOpBxa7By8k+GRkGD"
-   
+"ntQrWHIJdalI73c5Jne4W9NOkWKvTw5wKOUB9HGispvbrOXH9/Qfx/techw9qlK6WL3v7h9VE5w0"
-   
+"+DXiDy4CGq19g9L+XAQq73AvROOTruiDFsPg5rqi4cZVEAhZbHAfe+s59ZOzGIgU5BXVtsmIyiK3"
-   
+"wqQxOlsi6NNpdpv6FM8pQaOnq3tQr67R2xFmRQX6VBD+8X5xrpHNXVUR5VUJC3bc8d98J6Khi3RK"
-   
+"uQIDAQABo4HfMIHcMB0GA1UdDgQWBBQdgOTsHaTNceb+faB5aBhus4mDyDCBjgYDVR0jBIGGMIGD"
-   
+"gBQdgOTsHaTNceb+faB5aBhus4mDyKFgpF4wXDELMAkGA1UEBhMCVVMxEDAOBgNVBAgTB3ByaXZh"
-   
+"dGUxETAPBgNVBAcTCHByb3ZpbmNlMQ0wCwYDVQQKEwRjaXR5MRkwFwYDVQQDExBhbXFwLmV4YW1w"
-   
+"bGUuY29tggkAqzr4V2qe22EwDAYDVR0TBAUwAwEB/zAcBgNVHREEFTATghFhbXFwMS5leGFtcGxl"
-   
+"LmNvbTANBgkqhkiG9w0BAQUFAAOCAgEAMR8mKY7ml9KrhnSMbvTauvuXNXT5hp0NRpmQc6Wt/Vyw"
-   
+"V4BPVAPOz/KCmMj0tkz/LOSk5MbLxXfDDhQHA1zKPxYLM4DfObUhbJcsNo+HlC2EQ8vN4srqgNFv"
-   
+"rY8yvfIgTILDUv02381njrz+GOLClSbLB7hcXvrIILENb72BwMv4QTIvXxYaJRa++s89I1OWe4f6"
-   
+"CzseEIBQ2ezMsU4Qjgv6tfvgsn6K4tfpVLT4jeJkv7xZ6WAW6XKgEcDreVGm8E0/7B0E5IBFgfA3"
-  

[1/3] qpid-broker-j git commit: QPID-8241 : Remove use of javax.xml.bind.DatatypeConverter

[rgodfrey]

Repository: qpid-broker-j
Updated Branches:
  refs/heads/master b770054f4 -> c8c820330


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c8c82033/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/ServletConnectionPrincipal.java
--
diff --git 
a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/ServletConnectionPrincipal.java
 
b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/ServletConnectionPrincipal.java
index 6d442a8..543e7df 100644
--- 
a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/ServletConnectionPrincipal.java
+++ 
b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/ServletConnectionPrincipal.java
@@ -26,10 +26,10 @@ import java.net.SocketAddress;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.util.Base64;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
-import javax.xml.bind.DatatypeConverter;
 
 import org.apache.qpid.server.management.plugin.HttpManagementUtil;
 import org.apache.qpid.server.model.Port;
@@ -66,7 +66,7 @@ public class ServletConnectionPrincipal implements 
ManagementConnectionPrincipal
 throw new RuntimeException("Cannot create SHA-256 hash", e);
 }
 byte[] digest = md.digest();
-_sessionId = 
DatatypeConverter.printBase64Binary(digest).substring(0, 
HASH_TRUNCATION_LENGTH);
+_sessionId = 
Base64.getEncoder().encodeToString(digest).substring(0, HASH_TRUNCATION_LENGTH);
 }
 else
 {

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c8c82033/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectExpressionFactory.java
--
diff --git 
a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectExpressionFactory.java
 
b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectExpressionFactory.java
index 85e3a34..de8eb5a 100644
--- 
a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectExpressionFactory.java
+++ 
b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectExpressionFactory.java
@@ -20,6 +20,18 @@
  */
 package org.apache.qpid.server.management.plugin.servlet.query;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.chrono.IsoChronology;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.time.format.DateTimeParseException;
+import java.time.temporal.ChronoField;
+import java.time.temporal.TemporalAccessor;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Collection;
@@ -31,7 +43,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TimeZone;
 
-import javax.xml.bind.DatatypeConverter;
 import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.Duration;
@@ -48,6 +59,22 @@ public class ConfiguredObjectExpressionFactory
 private static final TimeZone UTC = TimeZone.getTimeZone("UTC");
 private static final DatatypeFactory DATATYPE_FACTORY;
 
+private static final DateTimeFormatter ISO_DATE_TIME_FORMAT =  new 
DateTimeFormatterBuilder()
+.parseCaseInsensitive()
+.append(DateTimeFormatter.ISO_LOCAL_DATE)
+.optionalStart()
+.appendLiteral('T')
+.append(DateTimeFormatter.ISO_LOCAL_TIME)
+.optionalStart()
+.appendOffsetId()
+.optionalStart()
+.appendLiteral('[')
+.parseCaseSensitive()
+.appendZoneRegionId()
+.appendLiteral(']')
+.toFormatter()
+.withChronology(IsoChronology.INSTANCE);
+
 static
 {
 try
@@ -122,13 +149,28 @@ public class ConfiguredObjectExpressionFactory
 }
 try
 {
-final Calendar calendar = 
DatatypeConverter.parseDateTime((String) dateTime);
-return calendar.getTime();
+
+return 
DateTimeFormatter.ISO_ZONED_DATE_TIME.parse((String)dateTime)
+.query(this::convertToDate);

qpid-broker-j git commit: QPID-7153: [Broker-J] Allow expired messages to be sent to DLQ

[rgodfrey]

Repository: qpid-broker-j
Updated Branches:
  refs/heads/master 97caecc13 -> c7b3d189f


QPID-7153: [Broker-J] Allow expired messages to be sent to DLQ

This closes #12


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

Branch: refs/heads/master
Commit: c7b3d189f5d4c1f5a9dcd8f1170480eb3cce75d9
Parents: 97caecc1
Author: Alex Rudyy 
Authored: Tue Aug 7 14:39:30 2018 +0100
Committer: Robert Godfrey 
Committed: Wed Aug 8 11:37:21 2018 +0200

--
 .../server/consumer/AbstractConsumerTarget.java |   2 +-
 .../qpid/server/message/MessageInstance.java|   7 +-
 .../qpid/server/message/RoutingResult.java  |  16 +++
 .../org/apache/qpid/server/model/Queue.java |  22 
 .../apache/qpid/server/queue/AbstractQueue.java | 129 +++
 .../qpid/server/queue/QueueEntryImpl.java   |  22 +++-
 .../AbstractSystemMessageSource.java|   5 +-
 .../consumer/AbstractConsumerTargetTest.java|  10 +-
 .../server/queue/AbstractQueueTestBase.java |  30 +
 .../qpid/server/queue/MockMessageInstance.java  |   5 +-
 .../server/queue/QueueEntryImplTestBase.java|   2 +-
 .../protocol/v0_10/ConsumerTarget_0_10.java |   4 +-
 .../qpid/server/protocol/v0_8/AMQChannel.java   |   2 +-
 .../protocol/v1_0/ConsumerTarget_1_0.java   |   2 +-
 .../server/management/amqp/ManagementNode.java  |   4 +-
 .../management/amqp/ManagementResponse.java |   6 +-
 16 files changed, 218 insertions(+), 50 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c7b3d189/broker-core/src/main/java/org/apache/qpid/server/consumer/AbstractConsumerTarget.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/consumer/AbstractConsumerTarget.java
 
b/broker-core/src/main/java/org/apache/qpid/server/consumer/AbstractConsumerTarget.java
index 76d4652..c590eca 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/consumer/AbstractConsumerTarget.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/consumer/AbstractConsumerTarget.java
@@ -280,7 +280,7 @@ public abstract class AbstractConsumerTarget
 case ROUTE_TO_ALTERNATE:
 if (consumer.acquires())
 {
-int enqueues = entry.routeToAlternate(null, 
null);
+int enqueues = entry.routeToAlternate(null, 
null, null);
 if (enqueues == 0)
 {
 LOGGER.info("Failed to convert message {} 
for this consumer because '{}'."

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c7b3d189/broker-core/src/main/java/org/apache/qpid/server/message/MessageInstance.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/message/MessageInstance.java 
b/broker-core/src/main/java/org/apache/qpid/server/message/MessageInstance.java
index d077d0c..e92adbc 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/message/MessageInstance.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/message/MessageInstance.java
@@ -21,7 +21,10 @@
 package org.apache.qpid.server.message;
 
 
+import java.util.function.Predicate;
+
 import org.apache.qpid.server.filter.Filterable;
+import org.apache.qpid.server.queue.BaseQueue;
 import org.apache.qpid.server.store.MessageEnqueueRecord;
 import org.apache.qpid.server.store.TransactionLogResource;
 import org.apache.qpid.server.txn.ServerTransaction;
@@ -73,7 +76,9 @@ public interface MessageInstance
 
 int getMaximumDeliveryCount();
 
-int routeToAlternate(Action action, 
ServerTransaction txn);
+int routeToAlternate(Action action,
+ ServerTransaction txn,
+ Predicate predicate);
 
 Filterable asFilterable();
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c7b3d189/broker-core/src/main/java/org/apache/qpid/server/message/RoutingResult.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/message/RoutingResult.java 
b/broker-core/src/main/java/org/apache/qpid/server/message/RoutingResult.java
index 5231679..9175465 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/message/RoutingResult.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/message/RoutingResult.java
@@ -25,8 +25,10 @@ import java.util.Collection;
 import java.util.Collections;
 

qpid-broker-j git commit: QPID-8225 : Fix incorrect implementation of infinite credit

[rgodfrey]

Repository: qpid-broker-j
Updated Branches:
  refs/heads/master c03452289 -> cf40fdea3


QPID-8225 : Fix incorrect implementation of infinite credit


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

Branch: refs/heads/master
Commit: cf40fdea39d9633702ee286d94e950a19ec7be74
Parents: c034522
Author: Robert Godfrey 
Authored: Mon Aug 6 19:02:03 2018 +0200
Committer: Robert Godfrey 
Committed: Mon Aug 6 19:02:03 2018 +0200

--
 .../protocol/v0_10/ConsumerTarget_0_10.java |  3 +-
 .../protocol/v0_10/CreditCreditManager.java | 45 +---
 .../protocol/v0_10/FlowCreditManager_0_10.java  |  2 +
 .../protocol/v0_10/WindowCreditManager.java | 35 ++-
 4 files changed, 66 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/cf40fdea/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java
--
diff --git 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java
 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java
index 8d42d2b..c58f897 100644
--- 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java
+++ 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java
@@ -513,11 +513,10 @@ public class ConsumerTarget_0_10 extends 
AbstractConsumerTargethttp://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/cf40fdea/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/CreditCreditManager.java
--
diff --git 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/CreditCreditManager.java
 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/CreditCreditManager.java
index 698351c..6cee5dd 100644
--- 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/CreditCreditManager.java
+++ 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/CreditCreditManager.java
@@ -21,8 +21,12 @@
 package org.apache.qpid.server.protocol.v0_10;
 
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class CreditCreditManager implements FlowCreditManager_0_10
 {
+private static final Logger LOG = 
LoggerFactory.getLogger(CreditCreditManager.class);
 private volatile long _bytesCredit;
 private volatile long _messageCredit;
 
@@ -41,22 +45,51 @@ public class CreditCreditManager implements 
FlowCreditManager_0_10
 @Override
 public synchronized void addCredit(final long messageCredit, final long 
bytesCredit)
 {
-if(_messageCredit >= 0L && messageCredit > 0L)
+
+if(_messageCredit >= 0L)
 {
-_messageCredit += messageCredit;
+if(messageCredit == INFINITE_CREDIT)
+{
+_messageCredit = -1L;
+}
+else
+{
+_messageCredit += messageCredit;
+if (_messageCredit < 0L)
+{
+LOG.warn("Message credit wraparound: attempt to add {} 
message credit to existing total of {}",
+ messageCredit,
+ _messageCredit - messageCredit);
+_messageCredit = Long.MAX_VALUE;
+}
+}
 }
 
-if(_bytesCredit >= 0L && bytesCredit > 0L)
+if(_bytesCredit >= 0L)
 {
-_bytesCredit += bytesCredit;
+if(bytesCredit == INFINITE_CREDIT)
+{
+_bytesCredit = -1L;
+}
+else
+{
+_bytesCredit += bytesCredit;
+if (_bytesCredit < 0L)
+{
+LOG.warn("Bytes credit wraparound: attempt to add {} bytes 
credit to existing total of {}",
+ bytesCredit,
+ _bytesCredit - bytesCredit);
+_bytesCredit = Long.MAX_VALUE;
+}
+}
 }
 }
 
 @Override
 public synchronized void clearCredit()
 {
-_bytesCredit = 0l;
-_messageCredit = 0l;
+_bytesCredit = 0L;
+_messageCredit = 0L;
 }
 
 

qpid-broker-j git commit: QPID-8150 : Prevent test failures due to slow initialisation of hostname resolution in HostnameAliasImpl

[rgodfrey]

Repository: qpid-broker-j
Updated Branches:
  refs/heads/master eef93a82a -> fa471435e


QPID-8150 : Prevent test failures due to slow initialisation of hostname 
resolution in HostnameAliasImpl


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

Branch: refs/heads/master
Commit: fa471435e76f21d3687ee964ba144f4e5dffb506
Parents: eef93a8
Author: Robert Godfrey 
Authored: Sat Mar 31 01:30:13 2018 +0200
Committer: Robert Godfrey 
Committed: Sat Mar 31 01:30:44 2018 +0200

--
 .../virtualhostalias/HostNameAliasImpl.java | 55 +++-
 .../resources/config-protocol-tests-0-8.json|  8 +--
 .../main/resources/config-protocol-tests.json   | 11 
 3 files changed, 55 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fa471435/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/HostNameAliasImpl.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/HostNameAliasImpl.java
 
b/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/HostNameAliasImpl.java
index a3b100d..16a904b 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/HostNameAliasImpl.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/HostNameAliasImpl.java
@@ -20,6 +20,7 @@
  */
 package org.apache.qpid.server.virtualhostalias;
 
+import java.net.Inet4Address;
 import java.net.InetAddress;
 import java.net.InterfaceAddress;
 import java.net.NetworkInterface;
@@ -27,9 +28,11 @@ import java.net.SocketException;
 import java.net.UnknownHostException;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeSet;
 import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.Lock;
@@ -79,6 +82,10 @@ public class HostNameAliasImpl
 @Override
 protected boolean matches(final String host)
 {
+if(_localAddressNames.contains(host))
+{
+return true;
+}
 while(!_addressesComputed.get())
 {
 Lock lock = _addressLock;
@@ -166,7 +173,7 @@ public class HostNameAliasImpl
 
 private Collection getAllInetAddresses() throws 
SocketException
 {
-Set addresses = new HashSet<>();
+Set addresses = new 
TreeSet<>(HostNameAliasImpl::compareAddresses);
 for (NetworkInterface networkInterface : 
Collections.list(NetworkInterface.getNetworkInterfaces()))
 {
 for (InterfaceAddress inetAddress : 
networkInterface.getInterfaceAddresses())
@@ -182,4 +189,50 @@ public class HostNameAliasImpl
 {
 return bindingAddress == null || bindingAddress.trim().equals("") || 
bindingAddress.trim().equals("*");
 }
+
+private static int compareAddresses(final InetAddress left, final 
InetAddress right)
+{
+byte[] leftBytes;
+byte[] rightBytes;
+if(left.isLoopbackAddress() != right.isLoopbackAddress())
+{
+return left.isLoopbackAddress() ? -1 : 1;
+}
+else if(left.isSiteLocalAddress() != right.isSiteLocalAddress())
+{
+return left.isSiteLocalAddress() ? -1 : 1;
+}
+else if(left.isLinkLocalAddress() != right.isLinkLocalAddress())
+{
+return left.isLinkLocalAddress() ? 1 : -1;
+}
+else if(left.isMulticastAddress() != right.isMulticastAddress())
+{
+return left.isMulticastAddress() ? 1 : -1;
+}
+else if(left instanceof Inet4Address && !(right instanceof 
Inet4Address))
+{
+return -1;
+}
+else if(right instanceof Inet4Address && !(left instanceof 
Inet4Address))
+{
+return 1;
+}
+else if((leftBytes = left.getAddress()).length == (rightBytes = 
right.getAddress()).length)
+{
+for(int i = 0; i < left.getAddress().length; i++)
+{
+int compare = Byte.compare(leftBytes[i], rightBytes[i]);
+if(compare != 0)
+{
+return compare;
+}
+}
+return 0;
+}
+else
+{
+return Integer.compare(left.getAddress().length, 
right.getAddress().length);
+}
+}
 }

qpid-broker-j git commit: QPID-8143 : Properly validate @ManagedAttributeValueTypes, and allow for factory methods

[rgodfrey]

Repository: qpid-broker-j
Updated Branches:
  refs/heads/master 9f82a4d33 -> d20599e22


QPID-8143 : Properly validate @ManagedAttributeValueTypes, and allow for 
factory methods


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

Branch: refs/heads/master
Commit: d20599e222727ce1c58e11fd9c398a9a22ddf250
Parents: 9f82a4d
Author: rgodfrey <rgodf...@apache.org>
Authored: Thu Mar 29 12:44:55 2018 +0200
Committer: rgodfrey <rgodf...@apache.org>
Committed: Thu Mar 29 12:45:35 2018 +0200

--
 .../ManagedAttributeValueTypeValidator.java | 126 +++
 .../javax.annotation.processing.Processor   |   1 +
 .../qpid/server/logging/LogFileDetails.java |   2 +-
 .../server/model/AttributeValueConverter.java   |  33 -
 .../org/apache/qpid/server/model/Content.java   |   2 +-
 .../ManagedAttributeValueTypeFactoryMethod.java |  32 +
 .../model/AttributeValueConverterTest.java  |  47 +++
 .../ConfiguredObjectJacksonModuleTest.java  |   4 +-
 .../qpid/server/logging/logback/LogRecord.java  |   2 +-
 9 files changed, 216 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d20599e2/broker-codegen/src/main/java/org/apache/qpid/server/model/validation/ManagedAttributeValueTypeValidator.java
--
diff --git 
a/broker-codegen/src/main/java/org/apache/qpid/server/model/validation/ManagedAttributeValueTypeValidator.java
 
b/broker-codegen/src/main/java/org/apache/qpid/server/model/validation/ManagedAttributeValueTypeValidator.java
index 9c692e1..c0272eb 100644
--- 
a/broker-codegen/src/main/java/org/apache/qpid/server/model/validation/ManagedAttributeValueTypeValidator.java
+++ 
b/broker-codegen/src/main/java/org/apache/qpid/server/model/validation/ManagedAttributeValueTypeValidator.java
@@ -23,15 +23,19 @@ package org.apache.qpid.server.model.validation;
 
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.RoundEnvironment;
 import javax.annotation.processing.SupportedAnnotationTypes;
 import javax.lang.model.SourceVersion;
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.AnnotationValue;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.Modifier;
 import javax.lang.model.element.Name;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.TypeMirror;
@@ -62,18 +66,30 @@ public class ManagedAttributeValueTypeValidator extends 
AbstractProcessor
 
 for (Element e : roundEnv.getElementsAnnotatedWith(annotationElement))
 {
-checkAnnotationIsOnInterface(annotationElement, e);
-checkAllMethodsAreAccessors(e);
+boolean isAbstract = isAbstract(annotationElement, e);
+if(!isAbstract)
+{
+checkAnnotationIsOnInterface(annotationElement, e);
+}
+if(!isContent(e))
+{
+checkAllMethodsAreAccessors(e, isAbstract);
+}
 }
 return false;
 }
 
-private void checkAllMethodsAreAccessors(final Element e)
+private boolean isContent(final Element e)
 {
-checkAllMethodsAreAccessors(e, new HashSet());
+return 
e.equals(processingEnv.getElementUtils().getTypeElement("org.apache.qpid.server.model.Content"));
 }
 
-private void checkAllMethodsAreAccessors(final Element e, Set 
checked)
+private void checkAllMethodsAreAccessors(final Element e, final boolean 
isAbstract)
+{
+checkAllMethodsAreAccessors(e, new HashSet(), isAbstract);
+}
+
+private void checkAllMethodsAreAccessors(final Element e, Set 
checked, final boolean isAbstract)
 {
 
 if(!checked.add(e))
@@ -91,12 +107,9 @@ public class ManagedAttributeValueTypeValidator extends 
AbstractProcessor
 {
 final ExecutableElement methodElement = (ExecutableElement) 
memberElement;
 AttributeAnnotationValidator.isValidType(processingEnv, 
methodElement.getReturnType(), false);
-String methodName = methodElement.getSimpleName().toString();
-
-if (methodName.length() < 3
-|| (methodName.length() < 4 && 
!methodName.startsWith("is"))
-|| !(methodName.startsWith("is"

qpid-jms git commit: QPIDJMS-367 : Add support for XOAUTH2 Sasl Autentication

[rgodfrey]

Repository: qpid-jms
Updated Branches:
  refs/heads/master 7e7cebe50 -> 3d2ec9c5f


QPIDJMS-367 : Add support for XOAUTH2 Sasl Autentication


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

Branch: refs/heads/master
Commit: 3d2ec9c5fc65d512418b21086ee6a59a00bb2df4
Parents: 7e7cebe
Author: rgodfrey <rgodf...@apache.org>
Authored: Wed Mar 14 15:11:38 2018 +0100
Committer: rgodfrey <rgodf...@apache.org>
Committed: Wed Mar 14 15:21:55 2018 +0100

--
 .../provider/amqp/AmqpSaslAuthenticator.java|  18 +--
 .../org/apache/qpid/jms/sasl/Mechanism.java |  10 ++
 .../apache/qpid/jms/sasl/XOauth2Mechanism.java  |  96 +
 .../qpid/jms/sasl/XOauth2MechanismFactory.java  |  28 
 .../services/org/apache/qpid/jms/sasl/XOAUTH2   |  17 +++
 .../jms/integration/SaslIntegrationTest.java|  57 +---
 .../qpid/jms/sasl/XOauth2MechanismTest.java | 134 +++
 .../qpid/jms/test/testpeer/TestAmqpPeer.java|  20 +++
 qpid-jms-docs/Configuration.md  |   2 +-
 9 files changed, 358 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/3d2ec9c5/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpSaslAuthenticator.java
--
diff --git 
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpSaslAuthenticator.java
 
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpSaslAuthenticator.java
index 41dc259..d7c8d1d 100644
--- 
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpSaslAuthenticator.java
+++ 
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpSaslAuthenticator.java
@@ -16,15 +16,14 @@
  */
 package org.apache.qpid.jms.provider.amqp;
 
-import java.util.function.Function;
-
-import javax.jms.JMSSecurityException;
-import javax.jms.JMSSecurityRuntimeException;
-
 import org.apache.qpid.jms.sasl.Mechanism;
 import org.apache.qpid.proton.engine.Sasl;
 import org.apache.qpid.proton.engine.Transport;
 
+import java.util.function.Function;
+import javax.jms.JMSSecurityException;
+import javax.jms.JMSSecurityRuntimeException;
+
 /**
  * Manage the SASL authentication process
  */
@@ -121,11 +120,14 @@ public class AmqpSaslAuthenticator {
 //- Internal support methods 
-//
 
 private void handleSaslFail() {
+StringBuilder message = new StringBuilder("Client failed to 
authenticate");
 if (mechanism != null) {
-recordFailure("Client failed to authenticate using SASL: " + 
mechanism.getName(), null);
-} else {
-recordFailure("Client failed to authenticate", null);
+message.append(" using SASL: ").append(mechanism.getName());
+if (mechanism.getAdditionalFailureInformation() != null) {
+message.append(" 
(").append(mechanism.getAdditionalFailureInformation()).append(")");
+}
 }
+recordFailure(message.toString(), null);
 }
 
 private void handleSaslCompletion(Sasl sasl) {

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/3d2ec9c5/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/Mechanism.java
--
diff --git 
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/Mechanism.java 
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/Mechanism.java
index 53e71f2..7f8c47e 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/Mechanism.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/Mechanism.java
@@ -155,4 +155,14 @@ public interface Mechanism extends Comparable {
  * @return true if this Mechanism is enabled by default.
  */
 boolean isEnabledByDefault();
+
+/**
+ * Allows a mechanism to report additional information on the reason for
+ * authentication failure (e.g. provided in a challenge from the server)
+ *
+ * @return information on the reason for failure, or null if no such 
information is available
+ */
+default String getAdditionalFailureInformation() {
+return null;
+}
 }

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/3d2ec9c5/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/XOauth2Mechanism.java
--
diff --git 
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/XOauth2Mechanism.java 
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl

qpid-broker-j git commit: QPID-8054 : [Broker-J] KeyStore type and algorithm defaults should be materialised on creation

[rgodfrey]

Repository: qpid-broker-j
Updated Branches:
  refs/heads/master 09d7d8a19 -> 031e00611


QPID-8054 : [Broker-J] KeyStore type and algorithm defaults should be 
materialised on creation


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

Branch: refs/heads/master
Commit: 031e00611a8e2a682281ce617266c090d670a1d8
Parents: 09d7d8a
Author: rgodfrey <rgodf...@apache.org>
Authored: Sun Nov 26 18:21:36 2017 +0100
Committer: rgodfrey <rgodf...@apache.org>
Committed: Sun Nov 26 18:21:36 2017 +0100

--
 .../java/org/apache/qpid/server/security/FileKeyStore.java | 6 --
 .../java/org/apache/qpid/server/security/FileTrustStore.java   | 6 --
 2 files changed, 8 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/031e0061/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStore.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStore.java 
b/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStore.java
index 4051ddb..216dbad 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStore.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStore.java
@@ -20,6 +20,8 @@
  */
 package org.apache.qpid.server.security;
 
+import static org.apache.qpid.server.model.Initialization.materialize;
+
 import javax.net.ssl.KeyManagerFactory;
 
 import org.apache.qpid.server.model.DerivedAttribute;
@@ -57,10 +59,10 @@ public interface FileKeyStore> 
extends KeyStore
 @ManagedAttribute
 String getCertificateAlias();
 
-@ManagedAttribute( defaultValue = 
"${keyStoreFile.keyManagerFactoryAlgorithm}" )
+@ManagedAttribute( defaultValue = 
"${keyStoreFile.keyManagerFactoryAlgorithm}" , initialization = materialize)
 String getKeyManagerFactoryAlgorithm();
 
-@ManagedAttribute( defaultValue = "${keyStoreFile.keyStoreType}" )
+@ManagedAttribute( defaultValue = "${keyStoreFile.keyStoreType}", 
initialization = materialize)
 String getKeyStoreType();
 
 @ManagedAttribute( secure = true, mandatory = true )

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/031e0061/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStore.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStore.java 
b/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStore.java
index 40d8eef..a8e1975 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStore.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStore.java
@@ -20,6 +20,8 @@
  */
 package org.apache.qpid.server.security;
 
+import static org.apache.qpid.server.model.Initialization.materialize;
+
 import javax.net.ssl.KeyManagerFactory;
 
 import org.apache.qpid.server.model.DerivedAttribute;
@@ -52,10 +54,10 @@ public interface FileTrustStore> extends TrustStore<
 @DerivedAttribute
 String getPath();
 
-@ManagedAttribute( defaultValue = 
"${trustStoreFile.trustManagerFactoryAlgorithm}")
+@ManagedAttribute( defaultValue = 
"${trustStoreFile.trustManagerFactoryAlgorithm}", initialization = materialize )
 String getTrustManagerFactoryAlgorithm();
 
-@ManagedAttribute( defaultValue = "${trustStoreFile.trustStoreType}")
+@ManagedAttribute( defaultValue = "${trustStoreFile.trustStoreType}", 
initialization = materialize)
 String getTrustStoreType();
 
 @ManagedAttribute( defaultValue = "false",


-
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-7567 : Use SNI to select appropriate keystore alias

[rgodfrey]

Repository: qpid-broker-j
Updated Branches:
  refs/heads/master ebe2fcae1 -> 09d7d8a19


QPID-7567 : Use SNI to select appropriate keystore alias


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

Branch: refs/heads/master
Commit: 09d7d8a19ed4e35d99c1b82e5e86aa135ea63c50
Parents: ebe2fca
Author: rgodfrey <rgodf...@apache.org>
Authored: Wed Nov 8 17:48:20 2017 +0100
Committer: rgodfrey <rgodf...@apache.org>
Committed: Sun Nov 26 16:10:05 2017 +0100

--
 .../AutoGeneratedSelfSignedKeyStoreImpl.java|  95 +-
 .../qpid/server/security/FileKeyStore.java  |   4 +
 .../qpid/server/security/FileKeyStoreImpl.java  |  25 +-
 .../AuthIdentityConnectionPropertyEnricher.java |  71 +
 .../NonBlockingConnectionTLSDelegate.java   |   5 +
 .../security/ssl/QpidBestFitX509KeyManager.java | 202 +
 .../security/ssl/QpidClientX509KeyManager.java  | 125 
 .../security/ssl/QpidServerX509KeyManager.java  | 107 +++
 .../transport/network/security/ssl/SSLUtil.java | 301 ---
 .../qpid/systest/keystore/FileKeyStoreTest.java | 234 ++
 10 files changed, 912 insertions(+), 257 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/09d7d8a1/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java
 
b/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java
index 66d66e8..4757904 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java
@@ -25,9 +25,7 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
-import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.net.InetAddress;
 import java.net.InterfaceAddress;
 import java.net.NetworkInterface;
@@ -84,22 +82,6 @@ public class AutoGeneratedSelfSignedKeyStoreImpl
 
 private static final SecureRandom RANDOM = new SecureRandom();
 
-
-private static Constructor CONSTRUCTOR;
-private static Method GENERATE_METHOD;
-private static Method GET_PRIVATE_KEY_METHOD;
-private static Method GET_SELF_CERTIFICATE_METHOD;
-private static Constructor X500_NAME_CONSTRUCTOR;
-private static Constructor DNS_NAME_CONSTRUCTOR;
-private static Constructor IP_ADDR_NAME_CONSTRUCTOR;
-private static Constructor GENERAL_NAMES_CONSTRUCTOR;
-private static Constructor GENERAL_NAME_CONSTRUCTOR;
-private static Method ADD_NAME_TO_NAMES_METHOD;
-private static Constructor ALT_NAMES_CONSTRUCTOR;
-private static Constructor CERTIFICATE_EXTENSIONS_CONSTRUCTOR;
-private static Method SET_EXTENSION_METHOD;
-private static Method EXTENSION_GET_NAME_METHOD;
-
 private final Broker _broker;
 private final EventLogger _eventLogger;
 
@@ -290,11 +272,7 @@ public class AutoGeneratedSelfSignedKeyStoreImpl
 {
 try
 {
-Object certAndKeyGen = CONSTRUCTOR.newInstance(_keyAlgorithm, 
_signatureAlgorithm);
-GENERATE_METHOD.invoke(certAndKeyGen, _keyLength);
-_privateKey = (PrivateKey) 
GET_PRIVATE_KEY_METHOD.invoke(certAndKeyGen);
 
-Object generalNames = GENERAL_NAMES_CONSTRUCTOR.newInstance();
 
 Set addresses = new HashSet<>();
 for (NetworkInterface networkInterface : 
Collections.list(NetworkInterface.getNetworkInterfaces()))
@@ -321,23 +299,6 @@ public class AutoGeneratedSelfSignedKeyStoreImpl
 dnsNames.add(canonicalHostName);
 }
 }
-for(String dnsName : dnsNames)
-{
-if(dnsName.matches("[\\w&&[^\\d]][\\w\\d.-]*"))
-{
-ADD_NAME_TO_NAMES_METHOD.invoke(generalNames,
-
GENERAL_NAME_CONSTRUCTOR.newInstance(DNS_NAME_CONSTRUCTOR.newInstance(
-dnsName)));
-}
-}
-
-for(InetAddress inetAddress : addresses)
-{
-ADD_NAME_TO_NAMES_METHOD.invoke(generalNames, 
GENERAL_NAME_CONSTRUCTOR.newInstance(IP_ADDR_NAME_CONSTRUCTOR

qpid-broker-j git commit: QPID-8049 : Strip ICC profiles with copyright from PNG images

[rgodfrey]

Repository: qpid-broker-j
Updated Branches:
  refs/heads/master 4eb2ea6df -> 612c2cb6c


QPID-8049 : Strip ICC profiles with copyright from PNG images


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

Branch: refs/heads/master
Commit: 612c2cb6c0857f3ca4344bbb47005d10dad156d8
Parents: 4eb2ea6
Author: Robert Godfrey 
Authored: Tue Nov 21 23:50:18 2017 +0100
Committer: Robert Godfrey 
Committed: Tue Nov 21 23:50:18 2017 +0100

--
 .../src/docbkx/images/JMX-Connect-MBeans.png| Bin 66586 -> 54557 bytes
 .../src/docbkx/images/JMX-Connect-Remote.png| Bin 66411 -> 55060 bytes
 .../images/Management-Web-Add-Dialogue.png  | Bin 70733 -> 92422 bytes
 .../docbkx/images/Management-Web-ContextVar.png | Bin 29470 -> 33453 bytes
 .../images/Management-Web-Edit-Dialogue.png | Bin 27262 -> 31643 bytes
 .../Management-Web-Logging-FileLogger.png   | Bin 136172 -> 107458 bytes
 .../Management-Web-Logging-InclusionRule.png| Bin 149497 -> 118676 bytes
 .../Management-Web-Logging-MemoryLogger.png | Bin 229299 -> 190563 bytes
 8 files changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/612c2cb6/doc/java-broker/src/docbkx/images/JMX-Connect-MBeans.png
--
diff --git a/doc/java-broker/src/docbkx/images/JMX-Connect-MBeans.png 
b/doc/java-broker/src/docbkx/images/JMX-Connect-MBeans.png
index f766197..94b032a 100644
Binary files a/doc/java-broker/src/docbkx/images/JMX-Connect-MBeans.png and 
b/doc/java-broker/src/docbkx/images/JMX-Connect-MBeans.png differ

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/612c2cb6/doc/java-broker/src/docbkx/images/JMX-Connect-Remote.png
--
diff --git a/doc/java-broker/src/docbkx/images/JMX-Connect-Remote.png 
b/doc/java-broker/src/docbkx/images/JMX-Connect-Remote.png
index 5fcf9dd..ecab94e 100644
Binary files a/doc/java-broker/src/docbkx/images/JMX-Connect-Remote.png and 
b/doc/java-broker/src/docbkx/images/JMX-Connect-Remote.png differ

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/612c2cb6/doc/java-broker/src/docbkx/images/Management-Web-Add-Dialogue.png
--
diff --git a/doc/java-broker/src/docbkx/images/Management-Web-Add-Dialogue.png 
b/doc/java-broker/src/docbkx/images/Management-Web-Add-Dialogue.png
index b476060..293ee26 100644
Binary files 
a/doc/java-broker/src/docbkx/images/Management-Web-Add-Dialogue.png and 
b/doc/java-broker/src/docbkx/images/Management-Web-Add-Dialogue.png differ

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/612c2cb6/doc/java-broker/src/docbkx/images/Management-Web-ContextVar.png
--
diff --git a/doc/java-broker/src/docbkx/images/Management-Web-ContextVar.png 
b/doc/java-broker/src/docbkx/images/Management-Web-ContextVar.png
index 3c62bc9..e5952b0 100644
Binary files a/doc/java-broker/src/docbkx/images/Management-Web-ContextVar.png 
and b/doc/java-broker/src/docbkx/images/Management-Web-ContextVar.png differ

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/612c2cb6/doc/java-broker/src/docbkx/images/Management-Web-Edit-Dialogue.png
--
diff --git a/doc/java-broker/src/docbkx/images/Management-Web-Edit-Dialogue.png 
b/doc/java-broker/src/docbkx/images/Management-Web-Edit-Dialogue.png
index 92626e0..5ac7e20 100644
Binary files 
a/doc/java-broker/src/docbkx/images/Management-Web-Edit-Dialogue.png and 
b/doc/java-broker/src/docbkx/images/Management-Web-Edit-Dialogue.png differ

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/612c2cb6/doc/java-broker/src/docbkx/images/Management-Web-Logging-FileLogger.png
--
diff --git 
a/doc/java-broker/src/docbkx/images/Management-Web-Logging-FileLogger.png 
b/doc/java-broker/src/docbkx/images/Management-Web-Logging-FileLogger.png
index f1a1729..b1b69ce 100644
Binary files 
a/doc/java-broker/src/docbkx/images/Management-Web-Logging-FileLogger.png and 
b/doc/java-broker/src/docbkx/images/Management-Web-Logging-FileLogger.png differ

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/612c2cb6/doc/java-broker/src/docbkx/images/Management-Web-Logging-InclusionRule.png
--
diff --git 

qpid-broker-j git commit: QPID-8025 : [Java Broker] Improve detach error message on unsubscribing from JMS shared subs

[rgodfrey]

Repository: qpid-broker-j
Updated Branches:
  refs/heads/master 3943978d0 -> e3aa40d97


QPID-8025 : [Java Broker] Improve detach error message on unsubscribing from 
JMS shared subs


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

Branch: refs/heads/master
Commit: e3aa40d97b8b79b9a7540d5055930c7a525c48d1
Parents: 3943978
Author: rgodfrey <rgodf...@apache.org>
Authored: Wed Nov 8 19:15:29 2017 +0100
Committer: rgodfrey <rgodf...@apache.org>
Committed: Wed Nov 8 19:15:29 2017 +0100

--
 .../server/protocol/v1_0/SendingLinkEndpoint.java | 18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/e3aa40d9/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLinkEndpoint.java
--
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLinkEndpoint.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLinkEndpoint.java
index 9c783b8..23df75e 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLinkEndpoint.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLinkEndpoint.java
@@ -842,7 +842,23 @@ public class SendingLinkEndpoint extends 
AbstractLinkEndpoint<Source, Target>
 }
 catch (IllegalStateException e)
 {
-closingError = new Error(AmqpError.RESOURCE_LOCKED, 
e.getMessage());
+String message;
+
if(sourceCapabilities.contains(Session_1_0.SHARED_CAPABILITY)
+   && 
sourceCapabilities.contains(ExchangeSendingDestination.TOPIC_CAPABILITY))
+{
+String subscriptionName = getLinkName();
+int separator = subscriptionName.indexOf("|");
+if (separator > 0)
+{
+subscriptionName = subscriptionName.substring(0, 
separator);
+}
+message = "There are active consumers on the shared 
subscription '"+subscriptionName+"'";
+}
+else
+{
+message = e.getMessage();
+}
+closingError = new Error(AmqpError.RESOURCE_LOCKED, 
message);
 }
 catch (NotFoundException e)
 {


-
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-7974 : Fix the logic I broker in Adel's commit

[rgodfrey]

Repository: qpid-broker-j
Updated Branches:
  refs/heads/master fa9f46abf -> 955a79b7d


QPID-7974 : Fix the logic I broker in Adel's commit


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

Branch: refs/heads/master
Commit: 955a79b7dfde570dc7d7a6cc9d89b2e6dd1ff137
Parents: fa9f46a
Author: rgodfrey <rgodf...@apache.org>
Authored: Wed Oct 18 16:19:15 2017 +0200
Committer: rgodfrey <rgodf...@apache.org>
Committed: Wed Oct 18 16:20:09 2017 +0200

--
 .../main/java/org/apache/qpid/server/store/jdbc/JdbcUtils.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/955a79b7/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JdbcUtils.java
--
diff --git 
a/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JdbcUtils.java
 
b/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JdbcUtils.java
index 795bed3..9e7710c 100644
--- 
a/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JdbcUtils.java
+++ 
b/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JdbcUtils.java
@@ -65,8 +65,9 @@ public class JdbcUtils
 // Some databases are not case sensitive in their table names and/or 
report back a different case for the
 // name of the table than the one originally used to create it
 return tableExistsCase(tableName.toUpperCase(), metaData) || 
tableExistsCase(tableName.toLowerCase(), metaData)
-   || tableName.equals(tableName.toUpperCase()) || 
tableName.equals(tableName.toLowerCase())
-   || tableExistsCase(tableName, metaData);
+   || (!tableName.equals(tableName.toUpperCase())
+   && !tableName.equals(tableName.toLowerCase())
+   && tableExistsCase(tableName, metaData));
 
 }
 


-
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-7974: Only search for the needed table instead of querying the whole database tables This closes #3

[rgodfrey]

Repository: qpid-broker-j
Updated Branches:
  refs/heads/master d68c89705 -> 3a6bb20dc


QPID-7974: Only search for the needed table instead of querying the whole 
database tables
This closes #3


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

Branch: refs/heads/master
Commit: 3a6bb20dc037a88d528045eae4bcc2daacf955ae
Parents: d68c897
Author: aboutros <about...@murex.com>
Authored: Wed Oct 18 14:41:42 2017 +0200
Committer: rgodfrey <rgodf...@apache.org>
Committed: Wed Oct 18 15:10:56 2017 +0200

--
 .../qpid/server/store/jdbc/JdbcUtils.java   | 25 
 1 file changed, 10 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/3a6bb20d/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JdbcUtils.java
--
diff --git 
a/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JdbcUtils.java
 
b/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JdbcUtils.java
index aa9c8f9..795bed3 100644
--- 
a/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JdbcUtils.java
+++ 
b/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JdbcUtils.java
@@ -62,24 +62,19 @@ public class JdbcUtils
 public static boolean tableExists(final String tableName, final Connection 
conn) throws SQLException
 {
 DatabaseMetaData metaData = conn.getMetaData();
-ResultSet rs = metaData.getTables(null, null, "%", null);
+// Some databases are not case sensitive in their table names and/or 
report back a different case for the
+// name of the table than the one originally used to create it
+return tableExistsCase(tableName.toUpperCase(), metaData) || 
tableExistsCase(tableName.toLowerCase(), metaData)
+   || tableName.equals(tableName.toUpperCase()) || 
tableName.equals(tableName.toLowerCase())
+   || tableExistsCase(tableName, metaData);
 
-try
-{
+}
 
-while(rs.next())
-{
-final String table = rs.getString(3);
-if(tableName.equalsIgnoreCase(table))
-{
-return true;
-}
-}
-return false;
-}
-finally
+private static boolean tableExistsCase(final String tableName, final 
DatabaseMetaData metaData) throws SQLException
+{
+try (ResultSet rs = metaData.getTables(null, null, tableName, null))
 {
-rs.close();
+return rs.next();
 }
 }
 }


-
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-7973: Table Name Prefix is set to NULL if no prefix is provided instead of empty String This closes #2

[rgodfrey]

Repository: qpid-broker-j
Updated Branches:
  refs/heads/master 4cfa7c30f -> d68c89705


QPID-7973: Table Name Prefix is set to NULL if no prefix is provided instead of 
empty String
This closes #2


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

Branch: refs/heads/master
Commit: d68c897052ca3e7a07f7ca4fccfd1f4d6832b6d7
Parents: 4cfa7c3
Author: aboutros <about...@murex.com>
Authored: Wed Oct 18 12:34:14 2017 +0200
Committer: rgodfrey <rgodf...@apache.org>
Committed: Wed Oct 18 14:48:47 2017 +0200

--
 .../qpid/server/store/jdbc/AbstractJDBCConfigurationStore.java | 2 +-
 .../apache/qpid/server/store/jdbc/AbstractJDBCMessageStore.java| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d68c8970/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCConfigurationStore.java
--
diff --git 
a/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCConfigurationStore.java
 
b/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCConfigurationStore.java
index 4f82077..e10935a 100644
--- 
a/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCConfigurationStore.java
+++ 
b/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCConfigurationStore.java
@@ -70,7 +70,7 @@ public abstract class AbstractJDBCConfigurationStore 
implements MessageStoreProv
 
 protected void setTableNamePrefix(final String tableNamePrefix)
 {
-_tableNamePrefix = tableNamePrefix;
+_tableNamePrefix = tableNamePrefix == null ? "" : tableNamePrefix;
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d68c8970/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCMessageStore.java
--
diff --git 
a/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCMessageStore.java
 
b/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCMessageStore.java
index a30451d..099029c 100644
--- 
a/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCMessageStore.java
+++ 
b/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCMessageStore.java
@@ -708,7 +708,7 @@ public abstract class AbstractJDBCMessageStore implements 
MessageStore
 
 protected void setTablePrefix(final String tablePrefix)
 {
-_tablePrefix = tablePrefix;
+_tablePrefix = tablePrefix == null ? "" : tablePrefix;
 }
 
 private String getDbVersionTableName()


-
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-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 <rgodf...@apache.org>
Authored: Thu Oct 12 16:02:39 2017 +0200
Committer: rgodfrey <rgodf...@apache.org>
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<String, Object> addConnectionProperties(final AMQPConnection 
connection,
+   final Map<String, 
Object> existingProperties)
+{
+Map<String,Object> 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(ConnectionStartPrope

qpid-broker-j git commit: QPID-7947 : [Java Broker] [AMQP 1.0] Improve handling of empty and overlarge frames

[rgodfrey]

Repository: qpid-broker-j
Updated Branches:
  refs/heads/master 526019c75 -> 66cef783f


QPID-7947 : [Java Broker] [AMQP 1.0] Improve handling of empty and overlarge 
frames


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

Branch: refs/heads/master
Commit: 66cef783f63ceb0252fbf236ae0577aa5e14b23d
Parents: 526019c
Author: Rob Godfrey 
Authored: Mon Oct 2 23:45:33 2017 +0200
Committer: Rob Godfrey 
Committed: Mon Oct 2 23:45:33 2017 +0200

--
 .../protocol/v1_0/framing/FrameHandler.java | 52 +---
 1 file changed, 34 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/66cef783/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/FrameHandler.java
--
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/FrameHandler.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/FrameHandler.java
index 523aec1..6dd69bd 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/FrameHandler.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/FrameHandler.java
@@ -72,12 +72,6 @@ public class FrameHandler implements ProtocolHandler
 {
 
 size = in.getInt();
-if(remaining < size)
-{
-in.position(in.position()-4);
-break;
-}
-int dataOffset = (in.get() << 2) & 0x3FF;
 
 if (size < 8)
 {
@@ -97,6 +91,13 @@ public class FrameHandler implements ProtocolHandler
 break;
 }
 
+if(remaining < size)
+{
+in.position(in.position()-4);
+break;
+}
+int dataOffset = (in.get() << 2) & 0x3FF;
+
 if (dataOffset < 8)
 {
 frameParsingError = createFramingError(
@@ -154,25 +155,40 @@ public class FrameHandler implements ProtocolHandler
 
 try
 {
-Object val = dup.hasRemaining() ? _valueHandler.parse(dup) 
: null;
-
-if (dup.hasRemaining())
+final boolean hasFrameBody = dup.hasRemaining();
+Object frameBody;
+if (hasFrameBody)
 {
-if (val instanceof Transfer)
+frameBody = _valueHandler.parse(dup);
+if (dup.hasRemaining())
 {
-final QpidByteBuffer payload = dup.slice();
-((Transfer) 
val).setPayload(Collections.singletonList(payload));
-payload.dispose();
+if (frameBody instanceof Transfer)
+{
+final QpidByteBuffer payload = dup.slice();
+((Transfer) 
frameBody).setPayload(Collections.singletonList(payload));
+payload.dispose();
+}
+else
+{
+frameParsingError = createFramingError(
+"Frame length %d larger than contained 
frame body %s.",
+size,
+frameBody);
+break;
+}
 }
-else
+}
+else
+{
+frameBody = null;
+if(_isSasl)
 {
 frameParsingError = createFramingError(
-"Frame length %d larger than contained 
frame body %s.",
-size,
-val);
+"Empty (heartbeat) frames are not 
permitted during SASL negotiation");
 break;
 }
 }
+
 channelFrameBodies.add(new ChannelFrameBody()
 {
 

qpid-broker-j git commit: QPID-7946 : Fix ProtocolNegotiationTest for AMQP 1.0 and Windows

[rgodfrey]

Repository: qpid-broker-j
Updated Branches:
  refs/heads/master 8abda0619 -> 526019c75


QPID-7946 : Fix ProtocolNegotiationTest for AMQP 1.0 and Windows


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

Branch: refs/heads/master
Commit: 526019c750fed803ccd16a01177009cc0bfee1ff
Parents: 8abda06
Author: Rob Godfrey 
Authored: Mon Oct 2 23:41:28 2017 +0200
Committer: Rob Godfrey 
Committed: Mon Oct 2 23:41:28 2017 +0200

--
 .../qpid/transport/ProtocolNegotiationTest.java   | 14 --
 1 file changed, 12 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/526019c7/systests/src/test/java/org/apache/qpid/transport/ProtocolNegotiationTest.java
--
diff --git 
a/systests/src/test/java/org/apache/qpid/transport/ProtocolNegotiationTest.java 
b/systests/src/test/java/org/apache/qpid/transport/ProtocolNegotiationTest.java
index c86f944..dcffc95 100644
--- 
a/systests/src/test/java/org/apache/qpid/transport/ProtocolNegotiationTest.java
+++ 
b/systests/src/test/java/org/apache/qpid/transport/ProtocolNegotiationTest.java
@@ -49,6 +49,7 @@ import org.apache.qpid.server.model.Port;
 import org.apache.qpid.server.model.Protocol;
 import org.apache.qpid.server.model.port.AmqpPort;
 import org.apache.qpid.server.protocol.v0_10.ServerDisassembler;
+import org.apache.qpid.server.util.SystemUtils;
 import org.apache.qpid.test.utils.QpidBrokerTestCase;
 import org.apache.qpid.test.utils.TestBrokerConfiguration;
 import org.apache.qpid.server.protocol.v0_10.transport.Frame;
@@ -198,6 +199,9 @@ public class ProtocolNegotiationTest extends 
QpidBrokerTestCase
 int len = inputStream.read(receivedHeader);
 assertEquals("Unexpected number of bytes available from socket", 
receivedHeader.length, len);
 
+// read the server start / sasl mechanisms
+inputStream.read(new byte[1024]);
+
 // Send heartbeat frames to simulate a client that, although 
active, fails to
 // authenticate within the allowed period
 
@@ -212,6 +216,13 @@ public class ProtocolNegotiationTest extends 
QpidBrokerTestCase
 }
 Thread.sleep(100);
 }
+// If AMQP 1.0 we won't have sent anything (heartbeats not valid 
until after SASL)
+// Windows also seems to allow writes to a socket which has 
actually been closed.
+if(!brokenPipe && (SystemUtils.isWindows() || isBroker10()))
+{
+final int read = inputStream.read(new byte[10]);
+brokenPipe = -1 == read;
+}
 assertTrue("Expected pipe to become broken within "
+ Port.CONNECTION_MAXIMUM_AUTHENTICATION_DELAY + " 
timeout", brokenPipe);
 }
@@ -300,10 +311,9 @@ public class ProtocolNegotiationTest extends 
QpidBrokerTestCase
 ServerDisassembler serverDisassembler = new 
ServerDisassembler(sender, Frame.HEADER_SIZE + 1);
 serverDisassembler.command(null, heartbeat);
 }
-else
+else if(isBroker08())
 {
 HeartbeatBody.FRAME.writePayload(sender);
-
 }
 
 return sender.hasSuccess();


-
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-7945 : SpawnedBrokerHolder does not work well on windows

[rgodfrey]

Repository: qpid-broker-j
Updated Branches:
  refs/heads/master 0e2f1e003 -> 8abda0619


QPID-7945 : SpawnedBrokerHolder does not work well on windows


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

Branch: refs/heads/master
Commit: 8abda0619a91762581cb669a00174bc89a273c03
Parents: 0e2f1e0
Author: Rob Godfrey 
Authored: Mon Oct 2 21:37:54 2017 +0200
Committer: Rob Godfrey 
Committed: Mon Oct 2 21:37:54 2017 +0200

--
 .../apache/qpid/test/utils/SpawnedBrokerHolder.java   | 14 ++
 1 file changed, 14 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/8abda061/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
--
diff --git 
a/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java 
b/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
index bce8ba8..788f10f 100644
--- a/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
+++ b/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
@@ -27,6 +27,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -95,6 +96,19 @@ public class SpawnedBrokerHolder extends AbstractBrokerHolder
 cmd = newCmd;
 }
 
+// bat files will treat = as an argument separator, so if an argument 
contains = it needs to be quoted
+if(cmd[0].endsWith(".bat"))
+{
+for(int i = 1 ; i < cmd.length; i++)
+{
+String orig = cmd[i];
+if(orig.contains("=") && !orig.contains("\""))
+{
+cmd[i] = "\"" + orig + "\"";
+}
+}
+}
+
 ProcessBuilder pb = new ProcessBuilder(cmd);
 pb.redirectErrorStream(true);
 Map processEnv = pb.environment();


-
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-7942 : [Java Broker] AppenderUtilsTest does not work on Windows ... and this time update the right test

[rgodfrey]

Repository: qpid-broker-j
Updated Branches:
  refs/heads/master 2978c1288 -> 0e2f1e003


QPID-7942 : [Java Broker] AppenderUtilsTest does not work on Windows
... and this time update the right test


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

Branch: refs/heads/master
Commit: 0e2f1e003e1e8d2e653453587de83d192991ca40
Parents: 2978c12
Author: Rob Godfrey 
Authored: Mon Oct 2 17:34:02 2017 +0200
Committer: Rob Godfrey 
Committed: Mon Oct 2 17:34:02 2017 +0200

--
 .../logging/logback/AppenderUtilsTest.java  | 22 +---
 1 file changed, 10 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/0e2f1e00/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java
--
diff --git 
a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java
 
b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java
index 142d7fb..99b26f8 100644
--- 
a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java
+++ 
b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java
@@ -38,7 +38,6 @@ import ch.qos.logback.core.rolling.RollingPolicy;
 import ch.qos.logback.core.rolling.TimeBasedRollingPolicy;
 import ch.qos.logback.core.rolling.TriggeringPolicy;
 import ch.qos.logback.core.rolling.helper.CompressionMode;
-import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -154,15 +153,8 @@ public class AppenderUtilsTest extends QpidTestCase
 
 try
 {
-if(unwriteableFile.setWritable(false))
-{
-doValidateLogTarget(unwriteableFile);
-}
-else
-{
-_logger.warn("could not set permissions on temporary directory 
- test skipped");
-
-}
+assertTrue("could not set log target permissions for test", 
unwriteableFile.setWritable(false));
+doValidateLogTarget(unwriteableFile);
 }
 finally
 {
@@ -177,8 +169,14 @@ public class AppenderUtilsTest extends QpidTestCase
 
 try
 {
-assumeTrue(unwriteableLogTarget.setWritable(false));
-doValidateLogTarget(new 
File(unwriteableLogTarget.getAbsolutePath(), "nonExistingFile.log"));
+if(unwriteableLogTarget.setWritable(false))
+{
+doValidateLogTarget(new 
File(unwriteableLogTarget.getAbsolutePath(), "nonExistingFile.log"));
+}
+else
+{
+_logger.warn("could not set permissions on temporary directory 
- test skipped");
+}
 }
 finally
 {


-
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-7942 - Fix typo

[rgodfrey]

Repository: qpid-broker-j
Updated Branches:
  refs/heads/master 556fa10dc -> 2978c1288


QPID-7942 - Fix typo


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

Branch: refs/heads/master
Commit: 2978c12887fbe5b816911362003c98157d659d95
Parents: 556fa10
Author: Rob Godfrey 
Authored: Mon Oct 2 17:20:38 2017 +0200
Committer: Rob Godfrey 
Committed: Mon Oct 2 17:20:38 2017 +0200

--
 .../org/apache/qpid/server/logging/logback/AppenderUtilsTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/2978c128/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java
--
diff --git 
a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java
 
b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java
index 2ad1ef5..142d7fb 100644
--- 
a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java
+++ 
b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java
@@ -148,7 +148,7 @@ public class AppenderUtilsTest extends QpidTestCase
 }
 }
 
-\public void testUnwritableLogFileTarget() throws Exception
+public void testUnwritableLogFileTarget() throws Exception
 {
 File unwriteableFile = File.createTempFile(getTestName(), null);
 


-
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-7942 : [Java Broker] AppenderUtilsTest does not work on Windows assumeThat does not work on old-style (JUnit 3) test cases

[rgodfrey]

Repository: qpid-broker-j
Updated Branches:
  refs/heads/master b9409b6c6 -> 556fa10dc


QPID-7942 : [Java Broker] AppenderUtilsTest does not work on Windows
assumeThat does not work on old-style (JUnit 3) test cases


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

Branch: refs/heads/master
Commit: 556fa10dc7279c2d60d14362da90163d20fcdefa
Parents: b9409b6
Author: Rob Godfrey 
Authored: Mon Oct 2 17:16:43 2017 +0200
Committer: Rob Godfrey 
Committed: Mon Oct 2 17:19:47 2017 +0200

--
 .../server/logging/logback/AppenderUtilsTest.java | 18 +++---
 1 file changed, 15 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/556fa10d/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java
--
diff --git 
a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java
 
b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java
index aee727d..2ad1ef5 100644
--- 
a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java
+++ 
b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java
@@ -38,12 +38,17 @@ import ch.qos.logback.core.rolling.RollingPolicy;
 import ch.qos.logback.core.rolling.TimeBasedRollingPolicy;
 import ch.qos.logback.core.rolling.TriggeringPolicy;
 import ch.qos.logback.core.rolling.helper.CompressionMode;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
 import org.apache.qpid.test.utils.QpidTestCase;
 
 public class AppenderUtilsTest extends QpidTestCase
 {
+private static final Logger _logger = 
LoggerFactory.getLogger(AppenderUtilsTest.class);
+
 public static final String LAYOUT = "%d %-5p [%t] \\(%c{2}\\) # %m%n";
 public static final int MAX_FILE_SIZE = 101;
 public static final int MAX_HISTORY = 13;
@@ -143,14 +148,21 @@ public class AppenderUtilsTest extends QpidTestCase
 }
 }
 
-public void testUnwritableLogFileTarget() throws Exception
+\public void testUnwritableLogFileTarget() throws Exception
 {
 File unwriteableFile = File.createTempFile(getTestName(), null);
 
 try
 {
-assertTrue("could not set log target permissions for test", 
unwriteableFile.setWritable(false));
-doValidateLogTarget(unwriteableFile);
+if(unwriteableFile.setWritable(false))
+{
+doValidateLogTarget(unwriteableFile);
+}
+else
+{
+_logger.warn("could not set permissions on temporary directory 
- test skipped");
+
+}
 }
 finally
 {


-
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-7942 : [Java Broker] AppenderUtilsTest does not work on Windows Address comments from [~gemmellr]

[rgodfrey]

Repository: qpid-broker-j
Updated Branches:
  refs/heads/master 97647160d -> af10b7e4b


QPID-7942 : [Java Broker] AppenderUtilsTest does not work on Windows
Address comments from [~gemmellr]


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

Branch: refs/heads/master
Commit: af10b7e4b57f058ab94a439e0a899fe7f1f6a3b2
Parents: 9764716
Author: Robert Godfrey 
Authored: Mon Oct 2 12:08:10 2017 +0200
Committer: Robert Godfrey 
Committed: Mon Oct 2 12:08:10 2017 +0200

--
 .../server/logging/logback/AppenderUtilsTest.java  | 17 -
 1 file changed, 8 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/af10b7e4/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java
--
diff --git 
a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java
 
b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java
index e73fafd..aee727d 100644
--- 
a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java
+++ 
b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java
@@ -20,6 +20,7 @@
  */
 package org.apache.qpid.server.logging.logback;
 
+import static org.junit.Assume.assumeTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -162,16 +163,14 @@ public class AppenderUtilsTest extends QpidTestCase
 Path unwriteableLogTargetPath = 
Files.createTempDirectory(getTestName());
 File unwriteableLogTarget = unwriteableLogTargetPath.toFile();
 
-if(unwriteableLogTarget.setWritable(false))
+try
 {
-try
-{
-doValidateLogTarget(new 
File(unwriteableLogTarget.getAbsolutePath(), "nonExistingFile.log"));
-}
-finally
-{
-unwriteableLogTarget.delete();
-}
+assumeTrue(unwriteableLogTarget.setWritable(false));
+doValidateLogTarget(new 
File(unwriteableLogTarget.getAbsolutePath(), "nonExistingFile.log"));
+}
+finally
+{
+unwriteableLogTarget.delete();
 }
 }
 


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

[4/4] qpid-broker-j git commit: QPID-7937 : Define message grouping policy with an enum (default NONE), if messageGroupKey is not supplied in Queue attributes, use the message property "group-id"

[rgodfrey]

QPID-7937 : Define message grouping policy with an enum (default NONE), if 
messageGroupKey is not supplied in Queue attributes, use the message property 
"group-id"


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

Branch: refs/heads/master
Commit: 3745dd952e998b59f27699ad208a80a7c9ffe90e
Parents: 9d5a825
Author: rgodfrey <rgodf...@apache.org>
Authored: Sat Sep 30 22:10:58 2017 +0200
Committer: rgodfrey <rgodf...@apache.org>
Committed: Sat Sep 30 22:30:17 2017 +0200

--
 .../qpid/server/message/AMQMessageHeader.java   |   2 +
 .../message/internal/InternalMessageHeader.java |   7 ++
 .../org/apache/qpid/server/model/Queue.java |  18 ++-
 .../apache/qpid/server/queue/AbstractQueue.java |  31 +++--
 .../AssignedConsumerMessageGroupManager.java|  15 ++-
 .../queue/DefinedGroupMessageGroupManager.java  |  25 +++--
 .../qpid/server/queue/MessageGroupType.java |  28 +
 .../server/queue/QueueArgumentsConverter.java   |  75 +++--
 .../VirtualHostStoreUpgraderAndRecoverer.java   |  56 ++
 .../server/virtualhost/AbstractVirtualHost.java |   7 ++
 .../server/exchange/HeadersBindingTest.java |   7 +-
 .../VirtualHostQueueCreationTest.java   |   5 +-
 .../MessageConverter_v0_10_to_Internal.java |   6 +
 .../protocol/v0_10/MessageTransferHeader.java   |   8 +-
 .../v0_8/MessageConverter_v0_8_to_Internal.java |   7 +-
 .../server/protocol/v0_8/MessageMetaData.java   |   7 ++
 .../protocol/v1_0/MessageMetaData_1_0.java  |  13 +++
 .../server/management/amqp/ManagementNode.java  |   6 +
 .../src/main/java/resources/addQueue.html   |  25 +++--
 .../java/resources/js/qpid/management/Queue.js  |   8 +-
 .../resources/js/qpid/management/addQueue.js|  13 ++-
 .../src/main/java/resources/showQueue.html  |  16 +--
 .../org/apache/qpid/systest/rest/Asserts.java   |   2 +-
 .../server/queue/MessageGroupQueueTest.java | 112 ++-
 24 files changed, 341 insertions(+), 158 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/3745dd95/broker-core/src/main/java/org/apache/qpid/server/message/AMQMessageHeader.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/message/AMQMessageHeader.java
 
b/broker-core/src/main/java/org/apache/qpid/server/message/AMQMessageHeader.java
index a920d89..c7d28d1 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/message/AMQMessageHeader.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/message/AMQMessageHeader.java
@@ -33,6 +33,8 @@ public interface AMQMessageHeader
 
 String getAppId();
 
+String getGroupId();
+
 String getMessageId();
 
 String getMimeType();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/3745dd95/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessageHeader.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessageHeader.java
 
b/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessageHeader.java
index 374e3df..a353a93 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessageHeader.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessageHeader.java
@@ -132,6 +132,13 @@ public final class InternalMessageHeader implements 
AMQMessageHeader, Serializab
 }
 
 @Override
+public String getGroupId()
+{
+final Object jmsxGroupId = _headers.get("JMSXGroupID");
+return jmsxGroupId == null ? null : String.valueOf(jmsxGroupId);
+}
+
+@Override
 public String getMessageId()
 {
 return _messageId;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/3745dd95/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
--
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java 
b/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
index 855603e..e48c54a 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
@@ -33,13 +33,7 @@ import org.apache.qpid.server.message.MessageDestination;
 import org.apache.qpid.server.message.MessageInfo;
 import org.apache.qpid.server.message.MessageSource;
 import org.apache.qpid.server.message.ServerMessage;
-import org.ap

[2/4] qpid-broker-j git commit: QPID-7940 : [Java Broker] JSON context substitution does not work with nested variables

[rgodfrey]

QPID-7940 : [Java Broker] JSON context substitution does not work with nested 
variables


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

Branch: refs/heads/master
Commit: 03c357718525711c2e3cb5ce6f68841beefe63b9
Parents: 3745dd9
Author: rgodfrey <rgodf...@apache.org>
Authored: Sat Sep 30 22:17:29 2017 +0200
Committer: rgodfrey <rgodf...@apache.org>
Committed: Sat Sep 30 22:30:17 2017 +0200

--
 .../server/model/AttributeValueConverter.java   |  2 +-
 .../org/apache/qpid/server/util/Strings.java|  5 +++-
 .../apache/qpid/server/util/StringsTest.java| 24 
 3 files changed, 29 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/03c35771/broker-core/src/main/java/org/apache/qpid/server/model/AttributeValueConverter.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/model/AttributeValueConverter.java
 
b/broker-core/src/main/java/org/apache/qpid/server/model/AttributeValueConverter.java
index 9b2df6e..c8a9177 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/model/AttributeValueConverter.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/model/AttributeValueConverter.java
@@ -1359,7 +1359,7 @@ abstract class AttributeValueConverter
 }
 catch (IOException e)
 {
-
+throw new IllegalArgumentException("Cannot convert type " 
+ value.getClass() + " to a " + _klazz.getName(), e);
 }
 
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/03c35771/broker-core/src/main/java/org/apache/qpid/server/util/Strings.java
--
diff --git a/broker-core/src/main/java/org/apache/qpid/server/util/Strings.java 
b/broker-core/src/main/java/org/apache/qpid/server/util/Strings.java
index 7a8692a..60edbd0 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/util/Strings.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/util/Strings.java
@@ -404,7 +404,10 @@ public final class Strings
 if (variable.startsWith(_prefix))
 {
 currentStack.add(variable);
-String expanded = 
resolver.resolve(variable.substring(_prefix.length()), resolver);
+final Stack stack = new Stack<>();
+stack.add(variable);
+String expanded = Strings.expand("${" + 
variable.substring(_prefix.length()) + "}", resolver,
+ stack, false);
 currentStack.remove(variable);
 if(expanded != null)
 {

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/03c35771/broker-core/src/test/java/org/apache/qpid/server/util/StringsTest.java
--
diff --git 
a/broker-core/src/test/java/org/apache/qpid/server/util/StringsTest.java 
b/broker-core/src/test/java/org/apache/qpid/server/util/StringsTest.java
index 2b0d3f1..4047d6a 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/util/StringsTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/util/StringsTest.java
@@ -21,7 +21,9 @@
 package org.apache.qpid.server.util;
 
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.Map;
 
 import org.apache.qpid.test.utils.QpidTestCase;
 
@@ -45,4 +47,26 @@ public class StringsTest extends QpidTestCase
  Strings.expand("{ \"path\" : \"${json:test}\\foo\" 
}",Strings.chain(jsonResolver,mapResolver)));
 
 }
+
+public void testNestedSubstitutionResolver()
+{
+Map<String,String> context = new HashMap<>();
+context.put("test", "C:\\TEMP\\\"Hello World\"");
+context.put("nestedTest", "${test}");
+Strings.MapResolver mapResolver =
+new Strings.MapResolver(context);
+
+Strings.Resolver jsonResolver = 
Strings.createSubstitutionResolver("json:",
+   new 
LinkedHashMap<String, String>()
+   {
+

[3/4] qpid-broker-j git commit: QPID-7941 : [Java Broker] DerbyUtils MEMORY_STORE_LOCATION is incorrect

[rgodfrey]

QPID-7941 : [Java Broker] DerbyUtils MEMORY_STORE_LOCATION is incorrect


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

Branch: refs/heads/master
Commit: 69baf06b410f37f730f6fde1ad4cc92d144da929
Parents: 03c3577
Author: rgodfrey <rgodf...@apache.org>
Authored: Sat Sep 30 22:25:09 2017 +0200
Committer: rgodfrey <rgodf...@apache.org>
Committed: Sat Sep 30 22:30:17 2017 +0200

--
 .../main/java/org/apache/qpid/server/store/derby/DerbyUtils.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/69baf06b/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyUtils.java
--
diff --git 
a/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyUtils.java
 
b/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyUtils.java
index 4d856ed..9af478d 100644
--- 
a/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyUtils.java
+++ 
b/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyUtils.java
@@ -40,7 +40,7 @@ import org.apache.qpid.server.store.StoreException;
 
 public class DerbyUtils
 {
-static final String MEMORY_STORE_LOCATION = ":memory:";
+static final String MEMORY_STORE_LOCATION = "memory:";
 private static final String DERBY_SINGLE_DB_SHUTDOWN_CODE = "08006";
 private static final String SQL_DRIVER_NAME = 
"org.apache.derby.jdbc.EmbeddedDriver";
 private static final String TABLE_EXISTENCE_QUERY = "SELECT 1 FROM 
SYS.SYSTABLES WHERE TABLENAME = ?";


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

[1/4] qpid-broker-j git commit: QPID-7942 : [Java Broker] AppenderUtilsTest does not work on Windows

[rgodfrey]

Repository: qpid-broker-j
Updated Branches:
  refs/heads/master 9d5a8254c -> b2cc03f22


QPID-7942 : [Java Broker] AppenderUtilsTest does not work on Windows


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

Branch: refs/heads/master
Commit: b2cc03f227c8cd342b1b860eb84f387768e07104
Parents: 69baf06
Author: rgodfrey <rgodf...@apache.org>
Authored: Sat Sep 30 22:28:53 2017 +0200
Committer: rgodfrey <rgodf...@apache.org>
Committed: Sat Sep 30 22:30:17 2017 +0200

--
 .../server/logging/logback/AppenderUtilsTest.java   | 16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/b2cc03f2/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java
--
diff --git 
a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java
 
b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java
index f97a58c..e73fafd 100644
--- 
a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java
+++ 
b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java
@@ -162,14 +162,16 @@ public class AppenderUtilsTest extends QpidTestCase
 Path unwriteableLogTargetPath = 
Files.createTempDirectory(getTestName());
 File unwriteableLogTarget = unwriteableLogTargetPath.toFile();
 
-try
+if(unwriteableLogTarget.setWritable(false))
 {
-assertTrue("could not set log target permissions for test", 
unwriteableLogTarget.setWritable(false));
-doValidateLogTarget(new 
File(unwriteableLogTarget.getAbsolutePath(), "nonExistingFile.log"));
-}
-finally
-{
-unwriteableLogTarget.delete();
+try
+{
+doValidateLogTarget(new 
File(unwriteableLogTarget.getAbsolutePath(), "nonExistingFile.log"));
+}
+finally
+{
+unwriteableLogTarget.delete();
+}
 }
 }
 


-
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-7866 : [Java Broker] AMQP 1.0 publishing links do not register themselves with queues

[rgodfrey]

Repository: qpid-broker-j
Updated Branches:
  refs/heads/master 83eb7addd -> f2bce8185


QPID-7866 : [Java Broker] AMQP 1.0 publishing links do not register themselves 
with queues


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

Branch: refs/heads/master
Commit: f2bce81856864b0c4833f3a538f5e5d729d58184
Parents: 83eb7ad
Author: rgodfrey <rgodf...@apache.org>
Authored: Wed Jul 19 16:44:55 2017 +0200
Committer: rgodfrey <rgodf...@apache.org>
Committed: Wed Jul 19 16:45:01 2017 +0200

--
 .../apache/qpid/server/queue/AbstractQueue.java | 10 ++-
 .../v1_0/StandardReceivingLinkEndpoint.java | 70 +++-
 2 files changed, 77 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/f2bce818/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java 
b/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
index 21d24f2..5f9bd40 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
@@ -3512,7 +3512,10 @@ public abstract class AbstractQueue>
 {
 _linkedSenders.put(sender, oldValue+1);
 }
-_bindingCount++;
+if(Binding.TYPE.equals(link.getType()))
+{
+_bindingCount++;
+}
 }
 
 @Override
@@ -3523,7 +3526,10 @@ public abstract class AbstractQueue>
 {
 _linkedSenders.put(sender, oldValue-1);
 }
-_bindingCount--;
+if(Binding.TYPE.equals(link.getType()))
+{
+_bindingCount--;
+}
 }
 
 private void validateOrCreateAlternateBinding(final Queue queue, final 
boolean mayCreate)

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/f2bce818/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/StandardReceivingLinkEndpoint.java
--
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/StandardReceivingLinkEndpoint.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/StandardReceivingLinkEndpoint.java
index e08399c..0a5915a 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/StandardReceivingLinkEndpoint.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/StandardReceivingLinkEndpoint.java
@@ -22,6 +22,8 @@ package org.apache.qpid.server.protocol.v1_0;
 import java.security.AccessControlException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -30,8 +32,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.message.MessageDestination;
 import org.apache.qpid.server.message.MessageReference;
+import org.apache.qpid.server.message.MessageSender;
 import org.apache.qpid.server.message.ServerMessage;
+import org.apache.qpid.server.model.PublishingLink;
 import org.apache.qpid.server.plugin.MessageFormat;
 import org.apache.qpid.server.protocol.MessageFormatRegistry;
 import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException;
@@ -60,9 +65,49 @@ import org.apache.qpid.server.txn.ServerTransaction;
 public class StandardReceivingLinkEndpoint extends 
AbstractReceivingLinkEndpoint
 {
 private static final Logger LOGGER = 
LoggerFactory.getLogger(StandardReceivingLinkEndpoint.class);
+private static final String LINK = "link";
 
 private ReceivingDestination _receivingDestination;
 
+private final PublishingLink _publishingLink = new PublishingLink()
+{
+@Override
+public String getName()
+{
+return getLinkName();
+}
+
+@Override
+public String getType()
+{
+return LINK;
+}
+
+@Override
+public String getDestination()
+{
+final ReceivingDestination receivingDestination = 
_receivingDestination;
+return receivingDestination == null ? "" : 
_receivingDestination.getAddress();
+}
+};
+
+private final Message

[1/2] qpid-broker-j git commit: QPID-7865 : Tidy-up AMQP 1.0 'Destination' classes

[rgodfrey]

Repository: qpid-broker-j
Updated Branches:
  refs/heads/master 4e0acb2d8 -> de42f5304


QPID-7865 : Tidy-up AMQP 1.0 'Destination' classes


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

Branch: refs/heads/master
Commit: f6b5925186a1f40a790b398cee2cde5336633f00
Parents: ec1bd82
Author: rgodfrey <rgodf...@apache.org>
Authored: Tue Jul 18 22:02:36 2017 +0200
Committer: rgodfrey <rgodf...@apache.org>
Committed: Tue Jul 18 22:02:36 2017 +0200

--
 .../v1_0/AnonymousRelayDestination.java |  38 +-
 .../qpid/server/protocol/v1_0/Destination.java  |  30 --
 .../protocol/v1_0/ExchangeDestination.java  | 231 --
 .../v1_0/ExchangeSendingDestination.java| 435 +++
 .../protocol/v1_0/MessageSourceDestination.java |  85 
 .../protocol/v1_0/NodeReceivingDestination.java |  10 +-
 .../server/protocol/v1_0/QueueDestination.java  | 110 -
 .../protocol/v1_0/ReceivingDestination.java |   3 +-
 .../protocol/v1_0/SendingDestination.java   |   5 +-
 .../protocol/v1_0/SendingLinkEndpoint.java  |  19 +-
 .../qpid/server/protocol/v1_0/Session_1_0.java  | 380 ++--
 .../v1_0/StandardSendingDestination.java|  79 
 12 files changed, 604 insertions(+), 821 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/f6b59251/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AnonymousRelayDestination.java
--
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AnonymousRelayDestination.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AnonymousRelayDestination.java
index 9d8c819..4ae80f3 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AnonymousRelayDestination.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AnonymousRelayDestination.java
@@ -22,7 +22,6 @@ package org.apache.qpid.server.protocol.v1_0;/*
 import static 
org.apache.qpid.server.protocol.v1_0.Session_1_0.DELAYED_DELIVERY;
 
 import java.util.Arrays;
-import java.util.Collections;
 
 import org.apache.qpid.server.logging.EventLogger;
 import org.apache.qpid.server.logging.messages.ExchangeMessages;
@@ -83,14 +82,12 @@ public class AnonymousRelayDestination implements 
ReceivingDestination
 MessageDestination exchangeDestination = 
_addressSpace.getAttainedMessageDestination(parts[0]);
 if (exchangeDestination instanceof Exchange)
 {
-Symbol[] capabilities = _target.getCapabilities();
-destination = new ExchangeDestination(((Exchange) 
exchangeDestination),
-  null,
-  _target.getDurable(),
-  
_target.getExpiryPolicy(),
-  parts[0],
-  parts[1],
-  capabilities != null ? 
Arrays.asList(capabilities) : Collections.emptyList());
+destination = new NodeReceivingDestination(exchangeDestination,
+   
_target.getDurable(),
+   
_target.getExpiryPolicy(),
+   parts[0],
+   
_target.getCapabilities(),
+   _eventLogger);
 }
 else
 {
@@ -100,6 +97,19 @@ public class AnonymousRelayDestination implements 
ReceivingDestination
 else
 {
 MessageDestination messageDestination = 
_addressSpace.getAttainedMessageDestination(routingAddress);
+if(messageDestination == null)
+{
+// TODO - should we do this... if the queue is not being 
advertised as a destination, shouldn't we
+//respect that?
+
+// Covers the unlikely case where there is no attained 
destination with the given address, but there is
+// a queue with that address
+MessageSource source = 
_addressSpace.getAttainedMessageSource(routingAddress);
+if (source i

[2/2] qpid-broker-j git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/qpid-broker-j

[rgodfrey]

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/qpid-broker-j


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

Branch: refs/heads/master
Commit: de42f53048210c3f76a65344f3a3637de4d92b6a
Parents: f6b5925 4e0acb2
Author: rgodfrey <rgodf...@apache.org>
Authored: Tue Jul 18 22:06:17 2017 +0200
Committer: rgodfrey <rgodf...@apache.org>
Committed: Tue Jul 18 22:06:17 2017 +0200

--
 .../server/virtualhost/AbstractVirtualHost.java |  10 +-
 .../management/plugin/HttpManagement.java   |   1 -
 .../auth/UsernamePasswordInteractiveLogin.java  |   4 +-
 .../plugin/servlet/rest/SaslServlet.java|   2 +-
 .../main/java/resources/common/LoginForm.html   |  47 
 .../src/main/java/resources/css/common.css  |   6 +-
 .../src/main/java/resources/index.html  | 144 +-
 .../resources/js/qpid/common/ConsoleHelper.js   |  78 --
 .../java/resources/js/qpid/common/LoginForm.js  | 130 +
 .../resources/js/qpid/management/Management.js  |  42 +--
 .../resources/js/qpid/sasl/Authenticator.js | 251 +++--
 .../js/qpid/sasl/CredentialBasedSaslClient.js   | 102 +--
 .../java/resources/js/qpid/sasl/SaslClient.js   |  35 ++-
 .../js/qpid/sasl/ScramShaSaslClient.js  | 244 +
 .../resources/js/qpid/sasl/ShaSaslClient.js | 269 ---
 .../js/qpid/sasl/UsernamePasswordProvider.js|  41 ---
 .../js/qpid/sasl/cram-md5-hex/SaslClient.js |  11 +-
 .../js/qpid/sasl/cram-md5/SaslClient.js |  55 ++--
 .../resources/js/qpid/sasl/plain/SaslClient.js  |  31 +--
 .../js/qpid/sasl/scram-sha-1/SaslClient.js  |   6 +-
 .../js/qpid/sasl/scram-sha-256/SaslClient.js|   6 +-
 .../src/main/java/resources/login.html  | 178 
 .../src/main/java/resources/logout.html |   2 +-
 pom.xml |   2 +-
 24 files changed, 823 insertions(+), 874 deletions(-)
--



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

[02/12] qpid-broker-j git commit: NO-JIRA : Add missing @Overrides

[rgodfrey]

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslMechanismsConstructor.java
--
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslMechanismsConstructor.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslMechanismsConstructor.java
index 64cb975..7af4d03 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslMechanismsConstructor.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslMechanismsConstructor.java
@@ -48,6 +48,7 @@ public class SaslMechanismsConstructor extends 
AbstractDescribedTypeConstructor<
 }
 }
 
+@Override
 public SaslMechanisms construct(Object underlying)
 {
 if(underlying instanceof List)

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslOutcomeConstructor.java
--
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslOutcomeConstructor.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslOutcomeConstructor.java
index 8626732..eb8b0fd 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslOutcomeConstructor.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslOutcomeConstructor.java
@@ -48,6 +48,7 @@ public class SaslOutcomeConstructor extends 
AbstractDescribedTypeConstructorhttp://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslResponseConstructor.java
--
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslResponseConstructor.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslResponseConstructor.java
index 5b5787e..14ab4aa 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslResponseConstructor.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslResponseConstructor.java
@@ -48,6 +48,7 @@ public class SaslResponseConstructor extends 
AbstractDescribedTypeConstructorhttp://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/TransactionErrors.java
--
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/TransactionErrors.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/TransactionErrors.java
index 9e9757c..b065585 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/TransactionErrors.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/TransactionErrors.java
@@ -50,11 +50,13 @@ public class TransactionErrors
 _val = val;
 }
 
+@Override
 public Symbol getValue()
 {
 return _val;
 }
 
+@Override
 public String toString()
 {
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/TxnCapabilities.java
--
diff --git 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/TxnCapabilities.java
 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/TxnCapabilities.java
index b8afe0b..3759fce 100644
--- 
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/TxnCapabilities.java
+++ 
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/TxnCapabilities.java
@@ -57,11 +57,13 @@ public class TxnCapabilities
 _val = val;
 }
 
+@Override
 public 

[06/12] qpid-broker-j git commit: NO-JIRA : Add missing @Overrides

[rgodfrey]

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeUnbind.java
--
diff --git 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeUnbind.java
 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeUnbind.java
index 30b738c..781e8d1 100644
--- 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeUnbind.java
+++ 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeUnbind.java
@@ -30,26 +30,32 @@ public final class ExchangeUnbind extends Method {
 
 public static final int TYPE = 1797;
 
+@Override
 public final int getStructType() {
 return TYPE;
 }
 
+@Override
 public final int getSizeWidth() {
 return 0;
 }
 
+@Override
 public final int getPackWidth() {
 return 2;
 }
 
+@Override
 public final boolean hasPayload() {
 return false;
 }
 
+@Override
 public final byte getEncodedTrack() {
 return Frame.L4;
 }
 
+@Override
 public final boolean isConnectionControl()
 {
 return false;
@@ -87,6 +93,7 @@ public final class ExchangeUnbind extends Method {
 
 }
 
+@Override
 public  void dispatch(C context, MethodDelegate delegate) {
 delegate.exchangeUnbind(context, this);
 }
@@ -173,6 +180,7 @@ public final class ExchangeUnbind extends Method {
 
 
 
+@Override
 public void write(Encoder enc)
 {
 enc.writeUint16(packing_flags);
@@ -191,6 +199,7 @@ public final class ExchangeUnbind extends Method {
 
 }
 
+@Override
 public void read(Decoder dec)
 {
 packing_flags = (short) dec.readUint16();
@@ -209,6 +218,7 @@ public final class ExchangeUnbind extends Method {
 
 }
 
+@Override
 public Map getFields()
 {
 Map result = new LinkedHashMap();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExecutionException.java
--
diff --git 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExecutionException.java
 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExecutionException.java
index 513bedf..f8e14b7 100644
--- 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExecutionException.java
+++ 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExecutionException.java
@@ -30,26 +30,32 @@ public final class ExecutionException extends Method {
 
 public static final int TYPE = 771;
 
+@Override
 public final int getStructType() {
 return TYPE;
 }
 
+@Override
 public final int getSizeWidth() {
 return 0;
 }
 
+@Override
 public final int getPackWidth() {
 return 2;
 }
 
+@Override
 public final boolean hasPayload() {
 return false;
 }
 
+@Override
 public final byte getEncodedTrack() {
 return Frame.L4;
 }
 
+@Override
 public final boolean isConnectionControl()
 {
 return false;
@@ -95,6 +101,7 @@ public final class ExecutionException extends Method {
 
 }
 
+@Override
 public  void dispatch(C context, MethodDelegate delegate) {
 delegate.executionException(context, this);
 }
@@ -285,6 +292,7 @@ public final class ExecutionException extends Method {
 
 
 
+@Override
 public void write(Encoder enc)
 {
 enc.writeUint16(packing_flags);
@@ -319,6 +327,7 @@ public final class ExecutionException extends Method {
 
 }
 
+@Override
 public void read(Decoder dec)
 {
 packing_flags = (short) dec.readUint16();
@@ -353,6 +362,7 @@ public final class ExecutionException extends Method {
 
 }
 
+@Override
 public Map getFields()
 {
 Map result = new LinkedHashMap();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExecutionResult.java
--
diff --git 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExecutionResult.java
 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExecutionResult.java

[12/12] qpid-broker-j git commit: NO-JIRA : Add missing @Overrides

[rgodfrey]

NO-JIRA : Add missing @Overrides


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

Branch: refs/heads/master
Commit: ec1bd825ae5b70e5b181c3fa9e5529ce5c011422
Parents: ae444b1
Author: rgodfrey <rgodf...@apache.org>
Authored: Tue Jul 18 12:02:11 2017 +0200
Committer: rgodfrey <rgodf...@apache.org>
Committed: Tue Jul 18 12:02:11 2017 +0200

--
 .../berkeleydb/AbstractBDBMessageStore.java |  3 +
 .../qpid/server/store/berkeleydb/BDBBackup.java |  1 +
 .../berkeleydb/BDBConfiguredObjectRecord.java   |  3 +
 .../store/berkeleydb/BDBSystemConfig.java   |  4 ++
 .../store/berkeleydb/CoalescingCommiter.java|  3 +
 .../tuple/ConfiguredObjectBinding.java  |  2 +
 .../berkeleydb/tuple/HierarchyKeyBinding.java   |  2 +
 .../tuple/PreparedTransactionBinding.java   |  5 ++
 .../berkeleydb/tuple/StringMapBinding.java  |  2 +
 .../berkeleydb/tuple/UUIDTupleBinding.java  |  2 +
 .../berkeleydb/upgrade/UpgradeFrom4To5.java |  9 +++
 .../berkeleydb/upgrade/UpgradeFrom5To6.java | 15 
 .../upgrade/UpgradeInteractionHandler.java  |  1 +
 .../berkeleydb/BDBHAVirtualHost.java|  2 +
 .../virtualhost/berkeleydb/BDBVirtualHost.java  |  3 +
 .../berkeleydb/BDBHAVirtualHostNode.java|  7 ++
 .../berkeleydb/BDBHAVirtualHostNodeImpl.java|  2 +
 .../berkeleydb/BDBVirtualHostNode.java  |  2 +
 .../berkeleydb/BDBStoreUpgradeTestPreparer.java |  3 +
 .../StandardEnvironmentFacadeFactoryTest.java   |  1 +
 .../StandardEnvironmentFacadeTest.java  |  2 +
 .../upgrade/MapJsonSerializerTest.java  |  1 +
 .../berkeleydb/replication/GroupCreator.java|  1 +
 .../org/apache/qpid/server/QpidException.java   |  1 +
 .../server/consumer/AbstractConsumerTarget.java |  4 ++
 .../qpid/server/exchange/AbstractExchange.java  |  1 +
 .../server/exchange/HeadersExchangeImpl.java|  1 +
 .../exchange/topic/TopicMatcherDFAState.java|  2 +
 .../qpid/server/exchange/topic/TopicWord.java   |  1 +
 .../server/filter/ArithmeticExpression.java | 11 +++
 .../qpid/server/filter/BinaryExpression.java|  3 +
 .../server/filter/ComparisonExpression.java | 16 +
 .../qpid/server/filter/ConstantExpression.java  |  5 ++
 .../qpid/server/filter/FilterSupport.java   |  1 +
 .../apache/qpid/server/filter/Filterable.java   |  2 +
 .../filter/JMSMessagePropertyExpression.java| 14 
 .../qpid/server/filter/JMSSelectorFilter.java   |  1 +
 .../server/filter/JMSSelectorFilterFactory.java |  1 +
 .../qpid/server/filter/LogicExpression.java |  6 ++
 .../qpid/server/filter/UnaryExpression.java | 13 
 .../qpid/server/filter/selector/Token.java  |  1 +
 .../server/filter/selector/TokenMgrError.java   |  1 +
 .../server/logging/AbstractMessageLogger.java   |  4 ++
 .../qpid/server/logging/NullMessageLogger.java  |  2 +
 .../server/logging/SystemOutMessageLogger.java  |  2 +
 .../logging/messages/AccessControlMessages.java | 16 +
 .../AuthenticationProviderMessages.java | 12 
 .../logging/messages/BindingMessages.java   |  6 ++
 .../server/logging/messages/BrokerMessages.java | 30 
 .../logging/messages/ChannelMessages.java   | 28 
 .../logging/messages/ConfigStoreMessages.java   | 10 +++
 .../logging/messages/ConnectionMessages.java| 18 +
 .../logging/messages/ExchangeMessages.java  |  8 +++
 .../messages/HighAvailabilityMessages.java  | 28 
 .../logging/messages/KeyStoreMessages.java  | 12 
 .../messages/ManagementConsoleMessages.java | 14 
 .../logging/messages/MessageStoreMessages.java  | 16 +
 .../server/logging/messages/PortMessages.java   | 20 ++
 .../server/logging/messages/QueueMessages.java  | 12 
 .../logging/messages/SubscriptionMessages.java  |  8 +++
 .../messages/TransactionLogMessages.java| 16 +
 .../logging/messages/TrustStoreMessages.java| 10 +++
 .../logging/messages/VirtualHostMessages.java   | 16 +
 .../logging/subjects/AbstractLogSubject.java|  1 +
 .../logging/subjects/ConnectionLogSubject.java  |  1 +
 .../message/AbstractServerMessageImpl.java  |  5 ++
 .../qpid/server/message/MessageDestination.java |  3 +-
 .../qpid/server/message/MessageInstance.java|  8 +++
 .../qpid/server/message/MessageReference.java   |  1 +
 .../qpid/server/message/RoutingResult.java  |  2 +
 .../qpid/server/message/ServerMessage.java  |  3 +
 .../server/model/AbstractConfiguredObject.java  | 14 
 .../qpid/server/model/AbstractContainer.java|  2 +
 .../qpid/server/model/AbstractSystemConfig.java |  5 ++
 .../server/model/AbstractUnresolvedObject.java  |  1 +
 .../server/model/AccessControlP

[11/12] qpid-broker-j git commit: NO-JIRA : Add missing @Overrides

[rgodfrey]

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java
 
b/broker-core/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java
index 0a1a2b4..95f7da6 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java
@@ -38,6 +38,7 @@ public class ConstantExpression implements Expression
 super(value);
 }
 
+@Override
 public boolean matches(E message)
 {
 Object object = evaluate(message);
@@ -134,6 +135,7 @@ public class ConstantExpression implements Expression
 this._value = value;
 }
 
+@Override
 public Object evaluate(T message)
 {
 return _value;
@@ -147,6 +149,7 @@ public class ConstantExpression implements Expression
 /**
  * @see java.lang.Object#toString()
  */
+@Override
 public String toString()
 {
 if (_value == null)
@@ -172,6 +175,7 @@ public class ConstantExpression implements Expression
  *
  * @see java.lang.Object#hashCode()
  */
+@Override
 public int hashCode()
 {
 return toString().hashCode();
@@ -182,6 +186,7 @@ public class ConstantExpression implements Expression
  *
  * @see java.lang.Object#equals(java.lang.Object)
  */
+@Override
 public boolean equals(Object o)
 {
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/filter/FilterSupport.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/filter/FilterSupport.java 
b/broker-core/src/main/java/org/apache/qpid/server/filter/FilterSupport.java
index 9b5dc93..873eb35 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/filter/FilterSupport.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/filter/FilterSupport.java
@@ -130,6 +130,7 @@ public class FilterSupport
 return AMQPFilterTypes.NO_LOCAL.toString();
 }
 
+@Override
 public boolean matches(Filterable message)
 {
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/filter/Filterable.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/filter/Filterable.java 
b/broker-core/src/main/java/org/apache/qpid/server/filter/Filterable.java
index 892b7b9..a15bdc1 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/filter/Filterable.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/filter/Filterable.java
@@ -29,8 +29,10 @@ public interface Filterable extends FilterableMessage
 {
 AMQMessageHeader getMessageHeader();
 
+@Override
 boolean isPersistent();
 
+@Override
 boolean isRedelivered();
 
 Object getConnectionReference();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/filter/JMSMessagePropertyExpression.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/filter/JMSMessagePropertyExpression.java
 
b/broker-core/src/main/java/org/apache/qpid/server/filter/JMSMessagePropertyExpression.java
index 953c5e6..9fcf645 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/filter/JMSMessagePropertyExpression.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/filter/JMSMessagePropertyExpression.java
@@ -55,6 +55,7 @@ public class JMSMessagePropertyExpression implements 
PropertyExpression()
  {
+ @Override
  public Object 
evaluate(FilterableMessage message)
  {
  //TODO
@@ -81,6 +82,7 @@ public class JMSMessagePropertyExpression implements 
PropertyExpression()
  {
+ @Override
  public Object 
evaluate(FilterableMessage message)
  {
  return message.isRedelivered();
@@ -103,6 +105,7 @@ public class JMSMessagePropertyExpression implements 
PropertyExpression
 {
+@Override
 public Object evaluate(FilterableMessage message)
 {
 String replyTo = message.getReplyTo();
@@ -164,6 +171,7 @@ public class JMSMessagePropertyExpression implements 

[05/12] qpid-broker-j git commit: NO-JIRA : Add missing @Overrides

[rgodfrey]

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionDetached.java
--
diff --git 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionDetached.java
 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionDetached.java
index 50c9a3c..dda97e8 100644
--- 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionDetached.java
+++ 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionDetached.java
@@ -30,26 +30,32 @@ public final class SessionDetached extends Method {
 
 public static final int TYPE = 516;
 
+@Override
 public final int getStructType() {
 return TYPE;
 }
 
+@Override
 public final int getSizeWidth() {
 return 0;
 }
 
+@Override
 public final int getPackWidth() {
 return 2;
 }
 
+@Override
 public final boolean hasPayload() {
 return false;
 }
 
+@Override
 public final byte getEncodedTrack() {
 return Frame.L2;
 }
 
+@Override
 public final boolean isConnectionControl()
 {
 return false;
@@ -83,6 +89,7 @@ public final class SessionDetached extends Method {
 
 }
 
+@Override
 public  void dispatch(C context, MethodDelegate delegate) {
 delegate.sessionDetached(context, this);
 }
@@ -143,6 +150,7 @@ public final class SessionDetached extends Method {
 
 
 
+@Override
 public void write(Encoder enc)
 {
 enc.writeUint16(packing_flags);
@@ -157,6 +165,7 @@ public final class SessionDetached extends Method {
 
 }
 
+@Override
 public void read(Decoder dec)
 {
 packing_flags = (short) dec.readUint16();
@@ -171,6 +180,7 @@ public final class SessionDetached extends Method {
 
 }
 
+@Override
 public Map getFields()
 {
 Map result = new LinkedHashMap();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionExpected.java
--
diff --git 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionExpected.java
 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionExpected.java
index b5e86c1..6e74632 100644
--- 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionExpected.java
+++ 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionExpected.java
@@ -30,26 +30,32 @@ public final class SessionExpected extends Method {
 
 public static final int TYPE = 520;
 
+@Override
 public final int getStructType() {
 return TYPE;
 }
 
+@Override
 public final int getSizeWidth() {
 return 0;
 }
 
+@Override
 public final int getPackWidth() {
 return 2;
 }
 
+@Override
 public final boolean hasPayload() {
 return false;
 }
 
+@Override
 public final byte getEncodedTrack() {
 return Frame.L3;
 }
 
+@Override
 public final boolean isConnectionControl()
 {
 return false;
@@ -83,6 +89,7 @@ public final class SessionExpected extends Method {
 
 }
 
+@Override
 public  void dispatch(C context, MethodDelegate delegate) {
 delegate.sessionExpected(context, this);
 }
@@ -143,6 +150,7 @@ public final class SessionExpected extends Method {
 
 
 
+@Override
 public void write(Encoder enc)
 {
 enc.writeUint16(packing_flags);
@@ -157,6 +165,7 @@ public final class SessionExpected extends Method {
 
 }
 
+@Override
 public void read(Decoder dec)
 {
 packing_flags = (short) dec.readUint16();
@@ -171,6 +180,7 @@ public final class SessionExpected extends Method {
 
 }
 
+@Override
 public Map getFields()
 {
 Map result = new LinkedHashMap();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionFlush.java
--
diff --git 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionFlush.java
 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionFlush.java
index 4341efa..2f79651 100644

[08/12] qpid-broker-j git commit: NO-JIRA : Add missing @Overrides

[rgodfrey]

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLogger.java
--
diff --git 
a/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLogger.java
 
b/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLogger.java
index 285072b..3acd6b5 100644
--- 
a/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLogger.java
+++ 
b/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLogger.java
@@ -38,11 +38,13 @@ public class UnitTestMessageLogger extends 
AbstractMessageLogger
 super(statusUpdatesEnabled);
 }
 
+@Override
 public void rawMessage(String message, String logHierarchy)
 {
 _log.add(message);
 }
 
+@Override
 public void rawMessage(String message, Throwable throwable, String 
logHierarchy)
 {
 _log.add(message);

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
--
diff --git 
a/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
 
b/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
index 801ecfa..e6b65c6 100644
--- 
a/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
+++ 
b/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
@@ -109,6 +109,7 @@ public class AMQPConnectionActorTest extends 
BaseConnectionActorTestCase
 {
 getEventLogger().message(new LogSubject()
   {
+  @Override
   public String toLogString()
   {
   return "[AMQPActorTest]";
@@ -116,11 +117,13 @@ public class AMQPConnectionActorTest extends 
BaseConnectionActorTestCase
 
   }, new LogMessage()
   {
+  @Override
   public String toString()
   {
   return message;
   }
 
+  @Override
   public String getLogHierarchy()
   {
   return "test.hierarchy";

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
--
diff --git 
a/broker-core/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
 
b/broker-core/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
index 896127c..b817953 100644
--- 
a/broker-core/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
+++ 
b/broker-core/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
@@ -62,6 +62,7 @@ public abstract class BaseActorTestCase extends QpidTestCase
 {
 getEventLogger().message(new LogSubject()
   {
+  @Override
   public String toLogString()
   {
   return message;
@@ -69,11 +70,13 @@ public abstract class BaseActorTestCase extends QpidTestCase
 
   }, new LogMessage()
   {
+  @Override
   public String toString()
   {
   return message;
   }
 
+  @Override
   public String getLogHierarchy()
   {
   return "test.hierarchy";

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/logging/actors/HttpManagementActorTest.java
--
diff --git 
a/broker-core/src/test/java/org/apache/qpid/server/logging/actors/HttpManagementActorTest.java
 
b/broker-core/src/test/java/org/apache/qpid/server/logging/actors/HttpManagementActorTest.java
index c06cc39..63af555 100644
--- 
a/broker-core/src/test/java/org/apache/qpid/server/logging/actors/HttpManagementActorTest.java
+++ 

[10/12] qpid-broker-j git commit: NO-JIRA : Add missing @Overrides

[rgodfrey]

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/message/RoutingResult.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/message/RoutingResult.java 
b/broker-core/src/main/java/org/apache/qpid/server/message/RoutingResult.java
index 55c63e6..bb18bcc 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/message/RoutingResult.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/message/RoutingResult.java
@@ -108,6 +108,7 @@ public class RoutingResulthttp://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/message/ServerMessage.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/message/ServerMessage.java 
b/broker-core/src/main/java/org/apache/qpid/server/message/ServerMessage.java
index d648b63..dcd307d 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/message/ServerMessage.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/message/ServerMessage.java
@@ -32,10 +32,13 @@ public interface ServerMessage extends Enqueu
 
 AMQMessageHeader getMessageHeader();
 
+@Override
 StoredMessage getStoredMessage();
 
+@Override
 boolean isPersistent();
 
+@Override
 long getSize();
 
 long getSizeIncludingHeader();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/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 1e75b20..8856be0 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
@@ -569,6 +569,7 @@ public abstract class AbstractConfiguredObject> im
 }
 
 
+@Override
 public final ListenableFuture openAsync()
 {
 return doOnConfigThread(new Task()
@@ -1607,16 +1608,19 @@ public abstract class AbstractConfiguredObject> im
 {
 }
 
+@Override
 public final UUID getId()
 {
 return _id;
 }
 
+@Override
 public final String getName()
 {
 return _name;
 }
 
+@Override
 public final boolean isDurable()
 {
 return _durable;
@@ -1652,11 +1656,13 @@ public abstract class AbstractConfiguredObject> im
 return _managesChildStorage;
 }
 
+@Override
 public Map getContext()
 {
 return _context == null ? Collections.emptyMap() : 
Collections.unmodifiableMap(_context);
 }
 
+@Override
 public State getDesiredState()
 {
 return _desiredState;
@@ -1801,6 +1807,7 @@ public abstract class AbstractConfiguredObject> im
 }
 }
 
+@Override
 public void addChangeListener(final ConfigurationChangeListener listener)
 {
 if(listener == null)
@@ -1816,6 +1823,7 @@ public abstract class AbstractConfiguredObject> im
 }
 }
 
+@Override
 public boolean removeChangeListener(final ConfigurationChangeListener 
listener)
 {
 if(listener == null)
@@ -1963,6 +1971,7 @@ public abstract class AbstractConfiguredObject> im
 return getModel().getAncestor(clazz, this);
 }
 
+@Override
 public final Collection getAttributeNames()
 {
 return getTypeRegistry().getAttributeNames(getClass());
@@ -1974,6 +1983,7 @@ public abstract class AbstractConfiguredObject> im
 return getCategoryClass().getSimpleName() + "[id=" + _id + ", name=" + 
getName() + ", type=" + getType() + "]";
 }
 
+@Override
 public final ConfiguredObjectRecord asObjectRecord()
 {
 return new ConfiguredObjectRecord()
@@ -2165,6 +2175,7 @@ public abstract class AbstractConfiguredObject> im
 doSync(setDesiredState(State.STOPPED));
 }
 
+@Override
 public final void delete()
 {
 doSync(deleteAsync());
@@ -2236,6 +2247,7 @@ public abstract class AbstractConfiguredObject> im
 }
 }
 
+@Override
 public final ListenableFuture deleteAsync()
 {
 return setDesiredState(State.DELETED);
@@ -3019,6 +3031,7 @@ public abstract class AbstractConfiguredObject> im
 return AccessController.doPrivileged
 (new PrivilegedAction()
 {
+@Override
 public AccessControlContext run()
 {
 return new AccessControlContext
@@ -3162,6 +3175,7 @@ public abstract class AbstractConfiguredObject> 

[04/12] qpid-broker-j git commit: NO-JIRA : Add missing @Overrides

[rgodfrey]

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRecoverSyncBody.java
--
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRecoverSyncBody.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRecoverSyncBody.java
index 7e29589..0fa8ba8 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRecoverSyncBody.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRecoverSyncBody.java
@@ -54,11 +54,13 @@ public class BasicRecoverSyncBody extends AMQMethodBodyImpl 
implements Encodable
 _bitfield0 = bitfield0;
 }
 
+@Override
 public int getClazz()
 {
 return CLASS_ID;
 }
 
+@Override
 public int getMethod()
 {
 return _methodId;
@@ -69,22 +71,26 @@ public class BasicRecoverSyncBody extends AMQMethodBodyImpl 
implements Encodable
 return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
 }
 
+@Override
 protected int getBodySize()
 {
 int size = 1;
 return size;
 }
 
+@Override
 public void writeMethodPayload(QpidByteBuffer buffer)
 {
 writeBitfield( buffer, _bitfield0 );
 }
 
+@Override
 public boolean execute(MethodDispatcher dispatcher, int channelId) throws 
QpidException
{
 return dispatcher.dispatchBasicRecoverSync(this, channelId);
}
 
+@Override
 public String toString()
 {
 StringBuilder buf = new StringBuilder("[BasicRecoverSyncBodyImpl: ");

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRecoverSyncOkBody.java
--
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRecoverSyncOkBody.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRecoverSyncOkBody.java
index f87498d..03dd957 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRecoverSyncOkBody.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRecoverSyncOkBody.java
@@ -53,31 +53,37 @@ public class BasicRecoverSyncOkBody extends 
AMQMethodBodyImpl implements Encodab
 }
 
 
+@Override
 public int getClazz()
 {
 return CLASS_ID;
 }
 
+@Override
 public int getMethod()
 {
 return _ownMethodId;
 }
 
 
+@Override
 protected int getBodySize()
 {
 return 0;
 }
 
+@Override
 public void writeMethodPayload(QpidByteBuffer buffer)
 {
 }
 
+@Override
 public boolean execute(MethodDispatcher dispatcher, int channelId) throws 
QpidException
{
 return dispatcher.dispatchBasicRecoverSyncOk(this, channelId);
}
 
+@Override
 public String toString()
 {
  return "[BasicRecoverSyncOkBody]";

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRejectBody.java
--
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRejectBody.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRejectBody.java
index 4db69d1..365ebf4 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRejectBody.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRejectBody.java
@@ -54,11 +54,13 @@ public class BasicRejectBody extends AMQMethodBodyImpl 
implements EncodableAMQDa
 _bitfield0 = bitfield0;
 }
 
+@Override
 public int getClazz()
 {
 return CLASS_ID;
 }
 
+@Override
 public int getMethod()
 {
 return METHOD_ID;
@@ -73,23 +75,27 @@ public class BasicRejectBody extends AMQMethodBodyImpl 
implements EncodableAMQDa
 return (((int)(_bitfield0)) & ( 1 << 0)) != 0;
 }
 
+@Override
 protected int getBodySize()
 {
 int size = 9;
 return size;
 }
 
+@Override
 public void writeMethodPayload(QpidByteBuffer buffer)
 {
 writeLong( buffer, _deliveryTag );
 writeBitfield( buffer, _bitfield0 );
 }
 
+@Override
 public boolean 

[03/12] qpid-broker-j git commit: NO-JIRA : Add missing @Overrides

[rgodfrey]

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/TxSelectOkBody.java
--
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/TxSelectOkBody.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/TxSelectOkBody.java
index 1d6258e..5ff04f2 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/TxSelectOkBody.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/TxSelectOkBody.java
@@ -42,31 +42,37 @@ public class TxSelectOkBody extends AMQMethodBodyImpl 
implements EncodableAMQDat
 {
 }
 
+@Override
 public int getClazz()
 {
 return CLASS_ID;
 }
 
+@Override
 public int getMethod()
 {
 return METHOD_ID;
 }
 
 
+@Override
 protected int getBodySize()
 {
 return 0;
 }
 
+@Override
 public void writeMethodPayload(QpidByteBuffer buffer)
 {
 }
 
+@Override
 public boolean execute(MethodDispatcher dispatcher, int channelId) throws 
QpidException
{
 return dispatcher.dispatchTxSelectOk(this, channelId);
}
 
+@Override
 public String toString()
 {
 return "[TxSelectOkBody]";

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/url/BindingURL.java
--
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/url/BindingURL.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/url/BindingURL.java
index 3a9dcd5..df8df42 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/url/BindingURL.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/url/BindingURL.java
@@ -94,5 +94,6 @@ public interface BindingURL
 
 String[] getBindingKeys();
 
+@Override
 String toString();
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/url/URLSyntaxException.java
--
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/url/URLSyntaxException.java
 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/url/URLSyntaxException.java
index 0b55cd2..6fbc2eb 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/url/URLSyntaxException.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/url/URLSyntaxException.java
@@ -54,6 +54,7 @@ public class URLSyntaxException extends URISyntaxException
 }
 
 
+@Override
 public String toString()
 {
 StringBuffer sb = new StringBuffer();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQDecoderTest.java
--
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQDecoderTest.java
 
b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQDecoderTest.java
index 51d789f..c96ee58 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQDecoderTest.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQDecoderTest.java
@@ -51,6 +51,7 @@ public class AMQDecoderTest extends QpidTestCase
 private FrameCreatingMethodProcessor _methodProcessor;
 
 
+@Override
 public void setUp() throws Exception
 {
 super.setUp();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java
--
diff --git 
a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java
 
b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java
index 68fc9e9..33140f0 100644
--- 
a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java
+++ 
b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java
@@ -44,6 +44,7 @@ public class ReferenceCountingTest extends QpidTestCase
 private TestMemoryMessageStore _store;
 
 
+

[01/12] qpid-broker-j git commit: NO-JIRA : Add missing @Overrides

[rgodfrey]

Repository: qpid-broker-j
Updated Branches:
  refs/heads/master ae444b112 -> ec1bd825a


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/systests/src/test/java/org/apache/qpid/server/queue/DeepQueueConsumeWithSelector.java
--
diff --git 
a/systests/src/test/java/org/apache/qpid/server/queue/DeepQueueConsumeWithSelector.java
 
b/systests/src/test/java/org/apache/qpid/server/queue/DeepQueueConsumeWithSelector.java
index fe64393..2b03b08 100644
--- 
a/systests/src/test/java/org/apache/qpid/server/queue/DeepQueueConsumeWithSelector.java
+++ 
b/systests/src/test/java/org/apache/qpid/server/queue/DeepQueueConsumeWithSelector.java
@@ -136,6 +136,7 @@ public class DeepQueueConsumeWithSelector extends 
QpidBrokerTestCase implements
 return message;
 }
 
+@Override
 public void onMessage(Message message)
 {
 _receviedLatch.countDown();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/systests/src/test/java/org/apache/qpid/server/queue/DefaultFiltersTest.java
--
diff --git 
a/systests/src/test/java/org/apache/qpid/server/queue/DefaultFiltersTest.java 
b/systests/src/test/java/org/apache/qpid/server/queue/DefaultFiltersTest.java
index 28d1f13..1590ee3 100644
--- 
a/systests/src/test/java/org/apache/qpid/server/queue/DefaultFiltersTest.java
+++ 
b/systests/src/test/java/org/apache/qpid/server/queue/DefaultFiltersTest.java
@@ -46,6 +46,7 @@ public class DefaultFiltersTest extends QpidBrokerTestCase
 private Session _session;
 private Queue _queue;
 
+@Override
 protected void setUp() throws Exception
 {
 super.setUp();

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/systests/src/test/java/org/apache/qpid/server/queue/MessageGroupQueueTest.java
--
diff --git 
a/systests/src/test/java/org/apache/qpid/server/queue/MessageGroupQueueTest.java
 
b/systests/src/test/java/org/apache/qpid/server/queue/MessageGroupQueueTest.java
index 07d05f2..f44ffe6 100644
--- 
a/systests/src/test/java/org/apache/qpid/server/queue/MessageGroupQueueTest.java
+++ 
b/systests/src/test/java/org/apache/qpid/server/queue/MessageGroupQueueTest.java
@@ -626,6 +626,7 @@ public class MessageGroupQueueTest extends 
QpidBrokerTestCase
 _count = new CountDownLatch(numMessages);
 }
 
+@Override
 public void onMessage(Message message)
 {
 try

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/systests/src/test/java/org/apache/qpid/server/queue/MultipleTransactedBatchProducerTest.java
--
diff --git 
a/systests/src/test/java/org/apache/qpid/server/queue/MultipleTransactedBatchProducerTest.java
 
b/systests/src/test/java/org/apache/qpid/server/queue/MultipleTransactedBatchProducerTest.java
index d1a9e3c..ac26495 100644
--- 
a/systests/src/test/java/org/apache/qpid/server/queue/MultipleTransactedBatchProducerTest.java
+++ 
b/systests/src/test/java/org/apache/qpid/server/queue/MultipleTransactedBatchProducerTest.java
@@ -170,6 +170,7 @@ public class MultipleTransactedBatchProducerTest extends 
QpidBrokerTestCase
 _desc = desc;
 }
 
+@Override
 public void onMessage(Message message)
 {
 _receivedLatch.countDown();
@@ -213,6 +214,7 @@ public class MultipleTransactedBatchProducerTest extends 
QpidBrokerTestCase
 _desc = desc;
 }
 
+@Override
 public void run()
 {
 try
@@ -237,6 +239,7 @@ public class MultipleTransactedBatchProducerTest extends 
QpidBrokerTestCase
 _desc = description;
 }
 
+@Override
 public void onException(JMSException e)
 {
 _logger.error(_desc + " received exception: " + e.getMessage(), e);

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/systests/src/test/java/org/apache/qpid/server/queue/NodeAutoCreationPolicyTest.java
--
diff --git 
a/systests/src/test/java/org/apache/qpid/server/queue/NodeAutoCreationPolicyTest.java
 
b/systests/src/test/java/org/apache/qpid/server/queue/NodeAutoCreationPolicyTest.java
index 2e471c6..336ea74 100644
--- 
a/systests/src/test/java/org/apache/qpid/server/queue/NodeAutoCreationPolicyTest.java
+++ 
b/systests/src/test/java/org/apache/qpid/server/queue/NodeAutoCreationPolicyTest.java
@@ -58,6 +58,7 @@ public class NodeAutoCreationPolicyTest extends 
QpidBrokerTestCase
 private Session _session;
 
 
+@Override
 public String getTestProfileVirtualHostNodeBlueprint()
 {
 String blueprint = super.getTestProfileVirtualHostNodeBlueprint();
@@ -210,6 +211,7 @@ public class 

[07/12] qpid-broker-j git commit: NO-JIRA : Add missing @Overrides

[rgodfrey]

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
--
diff --git 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
index 735ccb5..087d853 100644
--- 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
+++ 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
@@ -1814,11 +1814,13 @@ public class ServerSessionDelegate extends 
MethodDelegate impleme
 closed(session);
 }
 
+@Override
 public void init(ServerSession ssn, ProtocolHeader hdr)
 {
 LOGGER.warn("INIT: [{}] {}", ssn, hdr);
 }
 
+@Override
 public void control(ServerSession ssn, Method method)
 {
 method.dispatch(ssn, this);
@@ -1834,11 +1836,13 @@ public class ServerSessionDelegate extends 
MethodDelegate impleme
 }
 }
 
+@Override
 public void error(ServerSession ssn, ProtocolError error)
 {
 LOGGER.warn("ERROR: [{}] {}", ssn, error);
 }
 
+@Override
 public void handle(ServerSession ssn, Method method)
 {
 LOGGER.warn("UNHANDLED: [{}] {}", ssn, method);
@@ -1964,11 +1968,13 @@ public class ServerSessionDelegate extends 
MethodDelegate impleme
 _method = xfr;
 }
 
+@Override
 public void postCommit()
 {
 _serverSession.processed(_method);
 }
 
+@Override
 public void onRollback()
 {
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Session_0_10.java
--
diff --git 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Session_0_10.java
 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Session_0_10.java
index 45a6500..581e4ea 100644
--- 
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Session_0_10.java
+++ 
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Session_0_10.java
@@ -173,6 +173,7 @@ public class Session_0_10 extends 
AbstractAMQPSession _bytesUsed)
 && (_messageCreditLimit < 0L || _messageCreditLimit > 
_messageUsed);
 }
 
+@Override
 public synchronized boolean useCreditForMessage(final long msgSize)
 {
 if(_messageCreditLimit >= 0L)
@@ -134,6 +137,7 @@ public class WindowCreditManager implements 
FlowCreditManager_0_10
 }
 
 
+@Override
 public synchronized void addCredit(long count, long bytes)
 {
 if(bytes > 0)
@@ -156,6 +160,7 @@ public class WindowCreditManager implements 
FlowCreditManager_0_10
 }
 }
 
+@Override
 public synchronized void clearCredit()
 {
 _bytesCreditLimit = 0l;

[09/12] qpid-broker-j git commit: NO-JIRA : Add missing @Overrides

[rgodfrey]

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntry.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntry.java 
b/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntry.java
index f3d91af..70d128a 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntry.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntry.java
@@ -78,6 +78,7 @@ public class SortedQueueEntry extends QueueEntryImpl
 return _left;
 }
 
+@Override
 public SortedQueueEntry getNextNode()
 {
 return _next;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryList.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryList.java
 
b/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryList.java
index 98b1b1e..3babb1b 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryList.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryList.java
@@ -48,11 +48,13 @@ public class SortedQueueEntryList extends 
AbstractQueueEntryList
 _propertyName = queue.getSortKey();
 }
 
+@Override
 public SortedQueueImpl getQueue()
 {
 return _queue;
 }
 
+@Override
 public SortedQueueEntry add(final ServerMessage message, final 
MessageEnqueueRecord enqueueRecord)
 {
 synchronized(_lock)
@@ -283,6 +285,7 @@ public class SortedQueueEntryList extends 
AbstractQueueEntryList
 return (node == null ? Colour.BLACK : node.getColour()) == colour;
 }
 
+@Override
 public SortedQueueEntry next(final QueueEntry entry)
 {
 SortedQueueEntry node = (SortedQueueEntry)entry;
@@ -313,17 +316,20 @@ public class SortedQueueEntryList extends 
AbstractQueueEntryList
 }
 }
 
+@Override
 public QueueEntryIterator iterator()
 {
 return new QueueEntryIteratorImpl(_head);
 }
 
+@Override
 public SortedQueueEntry getHead()
 {
 return _head;
 }
 
 
+@Override
 public SortedQueueEntry getTail()
 {
 SortedQueueEntry current = _head;
@@ -361,6 +367,7 @@ public class SortedQueueEntryList extends 
AbstractQueueEntryList
 return _root;
 }
 
+@Override
 public void entryDeleted(final QueueEntry e)
 {
 SortedQueueEntry entry = (SortedQueueEntry)e;
@@ -459,6 +466,7 @@ public class SortedQueueEntryList extends 
AbstractQueueEntryList
 }
 }
 
+@Override
 public int getPriorities()
 {
 return 0;
@@ -672,16 +680,19 @@ public class SortedQueueEntryList extends 
AbstractQueueEntryList
 _lastNode = startNode;
 }
 
+@Override
 public boolean atTail()
 {
 return next(_lastNode) == null;
 }
 
+@Override
 public SortedQueueEntry getNode()
 {
 return _lastNode;
 }
 
+@Override
 public boolean advance()
 {
 if(!atTail())

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/queue/StandardQueueEntryList.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/queue/StandardQueueEntryList.java
 
b/broker-core/src/main/java/org/apache/qpid/server/queue/StandardQueueEntryList.java
index 435947c..11d5921 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/queue/StandardQueueEntryList.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/queue/StandardQueueEntryList.java
@@ -41,6 +41,7 @@ public class StandardQueueEntryList extends 
OrderedQueueEntryList
 }
 
 
+@Override
 protected StandardQueueEntry createQueueEntry(ServerMessage message,
   final MessageEnqueueRecord 
enqueueRecord)
 {

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStore.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStore.java 
b/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStore.java
index 0cd7f45..884fbc6 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStore.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStore.java
@@ -43,6 +43,7 @@ public interface FileKeyStore> 
extends KeyStore
 @ManagedContextDefault(name = 

qpid-broker-j git commit: QPID-7801 : Remove erroneously committed change

[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 <rgodf...@apache.org>
Authored: Tue May 30 18:33:47 2017 +0200
Committer: rgodfrey <rgodf...@apache.org>
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

[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 <rgodf...@apache.org>
Authored: Tue May 30 18:04:26 2017 +0200
Committer: rgodfrey <rgodf...@apache.org>
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/qp

[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

[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'

[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 <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 Ar

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

[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 <rgodf...@apache.org>
Authored: Tue May 30 14:48:06 2017 +0200
Committer: rgodfrey <rgodf...@apache.org>
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);
+
 }

http://git-wip-us.apache.org/repos

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

[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);
-

qpid-jms-amqp-0-x git commit: QPID-7779 : [Qpid JMS Client 0-x] [0-8..0-91] sasl_mechs and other SASL connection options not supported

[rgodfrey]

Repository: qpid-jms-amqp-0-x
Updated Branches:
  refs/heads/master 65f1b91b4 -> 5df5d1382


QPID-7779 : [Qpid JMS Client 0-x] [0-8..0-91] sasl_mechs and other SASL 
connection options not supported


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/5df5d138
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/tree/5df5d138
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/diff/5df5d138

Branch: refs/heads/master
Commit: 5df5d1382bd89f8d7b53fa5c7a62a22c172d7a45
Parents: 65f1b91
Author: rgodfrey <rgodf...@apache.org>
Authored: Mon May 15 10:34:16 2017 +0200
Committer: rgodfrey <rgodf...@apache.org>
Committed: Mon May 15 10:34:16 2017 +0200

--
 .../handler/ConnectionStartMethodHandler.java   |  2 +-
 .../client/protocol/AMQProtocolSession.java | 36 
 2 files changed, 22 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/5df5d138/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
--
diff --git 
a/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
 
b/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
index 13ac6c6..bb027e9 100644
--- 
a/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
+++ 
b/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
@@ -100,7 +100,7 @@ public class ConnectionStartMethodHandler implements 
StateAwareMethodListenerhttp://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/5df5d138/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
--
diff --git 
a/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java 
b/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
index 895ceb1..1739a78 100644
--- 
a/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
+++ 
b/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
@@ -101,6 +101,7 @@ public class AMQProtocolSession implements 
AMQVersionAwareProtocolSession
 
 private static final int FAST_CHANNEL_ACCESS_MASK = 0xFFF0;
 private volatile ByteBufferSender _sender;
+private ConnectionSettings _connectionSettings;
 
 public AMQProtocolSession(AMQProtocolHandler protocolHandler, 
AMQConnection connection)
 {
@@ -117,23 +118,29 @@ public class AMQProtocolSession implements 
AMQVersionAwareProtocolSession
 
 public void init(ConnectionSettings settings)
 {
+_connectionSettings = settings;
 // start the process of setting up the connection. This is the first 
place that
 // data is written to the server.
-initialiseTuneParameters(settings);
+initialiseTuneParameters();
 
 _protocolHandler.writeFrame(new 
ProtocolInitiation(_connection.getProtocolVersion()));
 }
 
+public ConnectionSettings getConnectionSettings()
+{
+return _connectionSettings;
+}
+
 public ConnectionTuneParameters getConnectionTuneParameters()
 {
 return _connectionTuneParameters;
 }
 
-private void initialiseTuneParameters(ConnectionSettings settings)
+private void initialiseTuneParameters()
 {
 _connectionTuneParameters = new ConnectionTuneParameters();
-
_connectionTuneParameters.setHeartbeat(settings.getHeartbeatInterval08());
-
_connectionTuneParameters.setHeartbeatTimeoutFactor(settings.getHeartbeatTimeoutFactor());
+
_connectionTuneParameters.setHeartbeat(getConnectionSettings().getHeartbeatInterval08());
+
_connectionTuneParameters.setHeartbeatTimeoutFactor(getConnectionSettings().getHeartbeatTimeoutFactor());
 }
 
 public void tuneConnection(ConnectionTuneParameters params)
@@ -148,11 +155,11 @@ public class AMQProtocolSession implements 
AMQVersionAwareProtocolSession
 initHeartbeats(params.getHeartbeat(), 
params.getHeartbeatTimeoutFactor());
 }
 
-void initHeartbeats(int delay, float timeoutFactor)
+private void initHeartbeats(int delay, float timeoutFactor)
 {
 if (delay > 0)
 {
-NetworkConnection network = 
getProtocolHandler().getNetworkConnection();
+NetworkConnection network = 
_protocolHandler.getNetworkConnection();
 network.setMaxWriteIdleMillis(1000L*delay);
 int readerIdle = (int)(delay * timeoutFactor);
 network.setMaxReadIdleMillis(1000L * readerIdle);
@@ -219,6 +226,7 @@ public class AMQProtocol

qpid-jms-amqp-0-x git commit: QPID-7779 : [Qpid JMS Client 0-x] [0-8..0-91] sasl_mechs and other SASL connection options not supported

[rgodfrey]

Repository: qpid-jms-amqp-0-x
Updated Branches:
  refs/heads/master ce8996aeb -> 65f1b91b4


QPID-7779 : [Qpid JMS Client 0-x] [0-8..0-91] sasl_mechs and other SASL 
connection options not supported


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/65f1b91b
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/tree/65f1b91b
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/diff/65f1b91b

Branch: refs/heads/master
Commit: 65f1b91b4f272ce8d2f65d5b69d1219cf2fdd709
Parents: ce8996a
Author: rgodfrey <rgodf...@apache.org>
Authored: Fri May 12 12:46:21 2017 +0200
Committer: rgodfrey <rgodf...@apache.org>
Committed: Fri May 12 12:46:34 2017 +0200

--
 .../handler/ConnectionStartMethodHandler.java   | 29 +--
 .../src/docbkx/JMS-Client-Connection-URL.xml| 17 -
 .../src/docbkx/JMS-Client-System-Properties.xml | 39 ++--
 3 files changed, 52 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/65f1b91b/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
--
diff --git 
a/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
 
b/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
index 56ac655..13ac6c6 100644
--- 
a/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
+++ 
b/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
@@ -21,6 +21,8 @@
 package org.apache.qpid.client.handler;
 
 import java.io.UnsupportedEncodingException;
+import java.util.Collections;
+import java.util.Map;
 import java.util.StringTokenizer;
 
 import javax.security.sasl.Sasl;
@@ -46,6 +48,7 @@ import org.apache.qpid.framing.FieldTableFactory;
 import org.apache.qpid.framing.ProtocolVersion;
 import org.apache.qpid.jms.ConnectionURL;
 import org.apache.qpid.properties.ConnectionStartProperties;
+import org.apache.qpid.transport.ConnectionSettings;
 
 public class ConnectionStartMethodHandler implements 
StateAwareMethodListener
 {
@@ -97,6 +100,7 @@ public class ConnectionStartMethodHandler implements 
StateAwareMethodListenerhttp://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/65f1b91b/doc/jms-client-0-8/src/docbkx/JMS-Client-Connection-URL.xml
--
diff --git a/doc/jms-client-0-8/src/docbkx/JMS-Client-Connection-URL.xml 
b/doc/jms-client-0-8/src/docbkx/JMS-Client-Connection-URL.xml
index 96b9e3a..7bc179f 100644
--- a/doc/jms-client-0-8/src/docbkx/JMS-Client-Connection-URL.xml
+++ b/doc/jms-client-0-8/src/docbkx/JMS-Client-Connection-URL.xml
@@ -243,17 +243,15 @@
supported.


-   

 ssl 
 Boolean 

http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/65f1b91b/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 8c2fb93..59657bc 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
@@ -432,12 +432,13 @@
It is only applicable for 
AMQP 0-8/0-9/0-9-1 clients.


+
+



 
-   
+

Config Options For Security - Using SSL for securing 
connections or using EXTERNAL as
the SASL mechanism.


-
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-7742 : Address review comments

[rgodfrey]

Repository: qpid-broker-j
Updated Branches:
  refs/heads/master 570392ef9 -> 128cbb42b


QPID-7742 : Address review comments


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

Branch: refs/heads/master
Commit: 128cbb42b4b534007bd6bad531746217304168ca
Parents: 570392e
Author: rgodfrey <rgodf...@apache.org>
Authored: Wed Apr 26 17:24:06 2017 +0200
Committer: rgodfrey <rgodf...@apache.org>
Committed: Wed Apr 26 17:24:06 2017 +0200

--
 .../transport/network/security/ssl/SSLUtil.java | 137 ++-
 1 file changed, 74 insertions(+), 63 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/128cbb42/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/SSLUtil.java
--
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/SSLUtil.java
 
b/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/SSLUtil.java
index 189d388..f38ff7e 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/SSLUtil.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/SSLUtil.java
@@ -635,18 +635,18 @@ public class SSLUtil
 
 private static boolean looksLikeSSLv3ClientHello(QpidByteBuffer buffer)
 {
-int first = buffer.get(buffer.position()+0);
-int second = buffer.get(buffer.position()+1);
-int third = buffer.get(buffer.position()+2);
-int sixth = buffer.get(buffer.position()+5);
-
-return first == 22 && // SSL Handshake
-   (second == 3 && // SSL 3.0 / TLS 1.x
-(third == 0 || // SSL 3.0
- third == 1 || // TLS 1.0
- third == 2 || // TLS 1.1
- third == 3)) && // TLS1.2
-   (sixth == 1); // client_hello
+int contentType = buffer.get(buffer.position()+0);
+int majorVersion = buffer.get(buffer.position()+1);
+int minorVersion = buffer.get(buffer.position()+2);
+int messageType = buffer.get(buffer.position()+5);
+
+return contentType == 22 && // SSL Handshake
+   (majorVersion == 3 && // SSL 3.0 / TLS 1.x
+(minorVersion == 0 || // SSL 3.0
+ minorVersion == 1 || // TLS 1.0
+ minorVersion == 2 || // TLS 1.1
+ minorVersion == 3)) && // TLS1.2
+   (messageType == 1); // client_hello
 }
 
 public final static String getServerNameFromTLSClientHello(QpidByteBuffer 
source)
@@ -657,92 +657,103 @@ public class SSLUtil
 {
 
 // Do we have a complete header?
-if (input.remaining() < 5)
+if (!isSufficientToDetermineClientSNIHost(source))
+{
+throw new IllegalArgumentException("Source buffer does not 
contain enough data to determine the SNI name");
+}
+else if(!looksLikeSSLv3ClientHello(source))
 {
 return null;
 }
 
-byte first = input.get();
-byte second = input.get();
-byte third = input.get();
-if (first == 22 && third != 0x01)
+byte contentType = input.get();
+byte majorVersion = input.get();
+byte minorVersion = input.get();
+if (minorVersion != 0x00) // not supported for SSL 3.0
 {
 
 int recordLength = input.getUnsignedShort();
-if (recordLength > input.remaining())
+int messageType = input.get();
+// 24-bit length field
+int length = ((input.get() & 0xFF) << 16) | ((input.get() & 
0xFF) << 8) | (input.get() & 0xFF);
+if(input.remaining() < length)
 {
 return null;
 }
+input.limit(length + input.position());
 
-if (input.get() == 0x01)
+input.position(input.position() + 34);  // hello minor/major 
version + random
+int skip = (int) input.get(); // session-id
+input.position(input.position() + skip);
+skip = input.getUnsignedShort(); // cipher suites
+input.position(input.position() + skip);
+skip = (int) input.get(); // compression methods
+input.position(in

svn commit: r1791269 - /qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java

[rgodfrey]

Author: rgodfrey
Date: Thu Apr 13 15:16:09 2017
New Revision: 1791269

URL: http://svn.apache.org/viewvc?rev=1791269=rev
Log:
QPID-7742 : commit change accidentally omitted in the original checkin

Modified:

qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java

Modified: 
qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java?rev=1791269=1791268=1791269=diff
==
--- 
qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java
 Thu Apr 13 15:16:09 2017
@@ -502,6 +502,12 @@ class WebSocketProvider implements Accep
 return 0;
 }
 
+@Override
+public String getSelectedHost()
+{
+return null;
+}
+
 void setPeerCertificate(final Certificate certificate)
 {
 _certificate = certificate;



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

svn commit: r1791223 - in /qpid/java/trunk: broker-core/src/main/java/org/apache/qpid/server/transport/ broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/ broker-plugins/

[rgodfrey]

Author: rgodfrey
Date: Thu Apr 13 09:22:55 2017
New Revision: 1791223

URL: http://svn.apache.org/viewvc?rev=1791223=rev
Log:
QPID-7742 : Take hostname from SNI and SASL when available

Modified:

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ServerNetworkConnection.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/SSLUtil.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java

Modified: 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java?rev=1791223=1791222=1791223=diff
==
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java
 (original)
+++ 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java
 Thu Apr 13 09:22:55 2017
@@ -76,6 +76,7 @@ public class NonBlockingConnection imple
 private final List 
_schedulingDelayNotificationListeners = new CopyOnWriteArrayList<>();
 private final AtomicBoolean _hasShutdown = new AtomicBoolean();
 private volatile long _bufferedSize;
+private String _selectedHost;
 
 public NonBlockingConnection(SocketChannel socketChannel,
  ProtocolEngine protocolEngine,
@@ -658,4 +659,15 @@ public class NonBlockingConnection imple
 {
 _selectionTask = selectionTask;
 }
+
+public void setSelectedHost(final String selectedHost)
+{
+_selectedHost = selectedHost;
+}
+
+@Override
+public String getSelectedHost()
+{
+return _selectedHost;
+}
 }

Modified: 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java?rev=1791223=1791222=1791223=diff
==
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java
 (original)
+++ 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java
 Thu Apr 13 09:22:55 2017
@@ -55,6 +55,7 @@ public class NonBlockingConnectionTLSDel
 private Principal _principal;
 private Certificate _peerCertificate;
 private boolean _principalChecked;
+private volatile boolean _hostChecked;
 private QpidByteBuffer _netInputBuffer;
 private QpidByteBuffer _netOutputBuffer;
 private QpidByteBuffer _applicationBuffer;
@@ -87,6 +88,31 @@ public class NonBlockingConnectionTLSDel
 @Override
 public boolean processData() throws IOException
 {
+if(!_hostChecked)
+{
+QpidByteBuffer buffer = _netInputBuffer.duplicate();
+try
+{
+buffer.flip();
+if (SSLUtil.isSufficientToDetermineClientSNIHost(buffer))
+{
+String hostName = 
SSLUtil.getServerNameFromTLSClientHello(buffer);
+if (hostName != null)
+{
+_parent.setSelectedHost(hostName);
+}
+_hostChecked = true;
+}
+else
+{
+return false;
+}
+}
+finally
+{
+buffer.dispose();;
+}
+}
 _netInputBuffer.flip();
 boolean readData = false;
 boolean tasksRun;

Modified: 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ServerNetworkConnection.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ServerNetworkConnection.java?rev=1791223=1791222=1791223=diff
==
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ServerNetworkConnection.java
 (original)
+++ 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ServerNetworkConnection.java
 Thu Apr 13 09:22:55 2017
@@ -30,4 +30,6 @@ public interface ServerNetworkConnection
 void 
addSchedulingDelayNotificationListeners(SchedulingDelayNotificationListener 
listener);
 
   

svn commit: r1789938 - /qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java

[rgodfrey]

Author: rgodfrey
Date: Mon Apr  3 09:59:09 2017
New Revision: 1789938

URL: http://svn.apache.org/viewvc?rev=1789938=rev
Log:
QPID-7732 : Fix resolution of global addresses to local nodes

Modified:

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java

Modified: 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java?rev=1789938=1789937=1789938=diff
==
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
 (original)
+++ 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
 Mon Apr  3 09:59:09 2017
@@ -1265,7 +1265,7 @@ public abstract class AbstractVirtualHos
 MessageSource messageSource = _systemNodeSources.get(name);
 if(messageSource == null)
 {
-messageSource = awaitChildClassToAttainState(Queue.class, name);
+messageSource = getAttainedChildFromAddress(Queue.class, name);
 }
 if(messageSource == null)
 {
@@ -1410,7 +1410,7 @@ public abstract class AbstractVirtualHos
 {
 if(address.startsWith(domain + "/"))
 {
-child = awaitChildClassToAttainState(childClass, 
address.substring(domain.length()));
+child = awaitChildClassToAttainState(childClass, 
address.substring(domain.length()+1));
 if(child != null)
 {
 break;



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

qpid-proton-j git commit: PROTON-1447 : Allow CaCertDb file to have multiple certificates

[rgodfrey]

Repository: qpid-proton-j
Updated Branches:
  refs/heads/master b845e479f -> ad6096746


PROTON-1447 : Allow CaCertDb file to have multiple certificates


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

Branch: refs/heads/master
Commit: ad60967463fe697800d24eaf0286dbf9e7d38473
Parents: b845e47
Author: rgodfrey <rgodf...@apache.org>
Authored: Wed Mar 29 17:49:49 2017 +0200
Committer: rgodfrey <rgodf...@apache.org>
Committed: Wed Mar 29 17:49:49 2017 +0200

--
 .../engine/impl/ssl/SslEngineFacadeFactory.java | 37 ++--
 1 file changed, 35 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/ad609674/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java
--
diff --git 
a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java
 
b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java
index 4efc055..e82e1bb 100644
--- 
a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java
+++ 
b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java
@@ -45,6 +45,7 @@ import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -350,8 +351,11 @@ public class SslEngineFacadeFactory
 {
 _logger.log(Level.FINE, "_sslParams.getTrustedCaDb() : " + 
sslDomain.getTrustedCaDb());
 }
-Certificate trustedCaCert = 
readCertificate(sslDomain.getTrustedCaDb());
-keystore.setCertificateEntry(caCertAlias, trustedCaCert);
+int i = 1;
+for(Certificate trustedCaCert : 
readCertificates(sslDomain.getTrustedCaDb()))
+{
+keystore.setCertificateEntry(caCertAlias + (i++), 
trustedCaCert);
+}
 }
 
 if (sslDomain.getCertificateFile() != null
@@ -468,6 +472,35 @@ public class SslEngineFacadeFactory
 }
 }
 
+Collection readCertificates(String pemFile)
+{
+InputStream is = null;
+
+try
+{
+CertificateFactory cFactory = 
CertificateFactory.getInstance("X.509");
+is = new FileInputStream(pemFile);
+return cFactory.generateCertificates(is);
+}
+catch (CertificateException ce)
+{
+String msg = "Failed to load certificates [" + pemFile + "]";
+_logger.log(Level.SEVERE, msg, ce);
+throw new TransportException(msg, ce);
+}
+catch (FileNotFoundException e)
+{
+String msg = "Certificates file not found [" + pemFile + "]";
+_logger.log(Level.SEVERE, msg);
+throw new TransportException(msg, e);
+}
+finally
+{
+closeSafely(is);
+}
+}
+
+
 PrivateKey readPrivateKey(String pemFile, String password)
 {
 if (bouncyCastleSetupException != null)


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

qpid-proton-j git commit: PROTON-1451 : Only register BouncyCastle provider if not already present

[rgodfrey]

Repository: qpid-proton-j
Updated Branches:
  refs/heads/master b49969c1f -> b845e479f


PROTON-1451 : Only register BouncyCastle provider if not already present


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

Branch: refs/heads/master
Commit: b845e479f946cac019fe92327a8bc3ca16263050
Parents: b49969c
Author: rgodfrey <rgodf...@apache.org>
Authored: Wed Mar 29 12:18:31 2017 +0200
Committer: rgodfrey <rgodf...@apache.org>
Committed: Wed Mar 29 12:18:31 2017 +0200

--
 .../engine/impl/ssl/SslEngineFacadeFactory.java | 22 
 .../impl/ssl/SslEngineFacadeFactoryTest.java| 16 ++
 2 files changed, 34 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/b845e479/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java
--
diff --git 
a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java
 
b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java
index 64eb2ca..4efc055 100644
--- 
a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java
+++ 
b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java
@@ -130,10 +130,7 @@ public class SslEngineFacadeFactory
 PrivateKeyInfoClassResult = 
Class.forName("org.bouncycastle.asn1.pkcs.PrivateKeyInfo");
 getPrivateKeyMethodResult = 
jcaPEMKeyConverterClass.getMethod("getPrivateKey", PrivateKeyInfoClassResult);
 
-// Try loading BC as a provider
-Class klass = 
Class.forName("org.bouncycastle.jce.provider.BouncyCastleProvider");
-Provider provider = (Provider) 
klass.getConstructor().newInstance();
-Security.addProvider(provider);
+registerBouncyCastleProvider();
 }
 catch (Exception e)
 {
@@ -155,6 +152,23 @@ public class SslEngineFacadeFactory
 }
 }
 
+static void registerBouncyCastleProvider()
+throws ClassNotFoundException, InstantiationException, 
IllegalAccessException,
+   InvocationTargetException, NoSuchMethodException
+{
+// Try loading BC as a provider
+Class klass = 
Class.forName("org.bouncycastle.jce.provider.BouncyCastleProvider");
+
+Provider bouncyCastleProvider = (Provider) 
klass.getConstructor().newInstance();
+synchronized (Security.class)
+{
+if(Security.getProvider(bouncyCastleProvider.getName()) == null)
+{
+Security.addProvider(bouncyCastleProvider);
+}
+}
+}
+
 SslEngineFacadeFactory()
 {
 }

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/b845e479/proton-j/src/test/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactoryTest.java
--
diff --git 
a/proton-j/src/test/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactoryTest.java
 
b/proton-j/src/test/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactoryTest.java
index 84ba8cb..e43988e 100644
--- 
a/proton-j/src/test/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactoryTest.java
+++ 
b/proton-j/src/test/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactoryTest.java
@@ -18,6 +18,7 @@
  */
 package org.apache.qpid.proton.engine.impl.ssl;
 
+import static junit.framework.TestCase.fail;
 import static org.junit.Assert.assertNotNull;
 
 import java.net.URL;
@@ -29,6 +30,21 @@ public class SslEngineFacadeFactoryTest {
 private static final String PASSWORD = "unittest";
 
 @Test
+public void testDuplicateRegistrationOfSecurityProvider() {
+// ensure the provider is already registered
+SslEngineFacadeFactory factory = new SslEngineFacadeFactory();
+
+try
+{
+SslEngineFacadeFactory.registerBouncyCastleProvider();
+}
+catch (Exception e)
+{
+fail("Exception thrown when re-registering BouncyCastle provider " 
+ e.getMessage());
+}
+}
+
+@Test
 public void testCertifcateLoad() {
 String ipFile = resolveFilename("cert.pem.txt");
 SslEngineFacadeFactory factory = new SslEngineFacadeFactory();


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

qpid-proton-j git commit: PROTON-1441 : Incorrect sizes calculated for arrays of lists/maps using the Data API

[rgodfrey]

Repository: qpid-proton-j
Updated Branches:
  refs/heads/master 8929454ce -> b49969c1f


PROTON-1441 : Incorrect sizes calculated for arrays of lists/maps using the 
Data API


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

Branch: refs/heads/master
Commit: b49969c1ff22ee76d37705c463091b3d935b1c43
Parents: 8929454
Author: rgodfrey <rgodf...@apache.org>
Authored: Tue Mar 21 13:28:03 2017 +0100
Committer: rgodfrey <rgodf...@apache.org>
Committed: Tue Mar 21 13:28:03 2017 +0100

--
 .../qpid/proton/codec/impl/ListElement.java |   5 +-
 .../qpid/proton/codec/impl/MapElement.java  |   6 +-
 .../qpid/proton/codec/impl/DataImplTest.java| 126 +++
 3 files changed, 134 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/b49969c1/proton-j/src/main/java/org/apache/qpid/proton/codec/impl/ListElement.java
--
diff --git 
a/proton-j/src/main/java/org/apache/qpid/proton/codec/impl/ListElement.java 
b/proton-j/src/main/java/org/apache/qpid/proton/codec/impl/ListElement.java
index 6b2dde1..c9eddc8 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/codec/impl/ListElement.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/codec/impl/ListElement.java
@@ -83,7 +83,10 @@ class ListElement extends AbstractElement<List>
 size += 2;
 }
 }
-size += 8;
+else
+{
+size += 8;
+}
 
 }
 else

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/b49969c1/proton-j/src/main/java/org/apache/qpid/proton/codec/impl/MapElement.java
--
diff --git 
a/proton-j/src/main/java/org/apache/qpid/proton/codec/impl/MapElement.java 
b/proton-j/src/main/java/org/apache/qpid/proton/codec/impl/MapElement.java
index 710e9f0..eec3c60 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/codec/impl/MapElement.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/codec/impl/MapElement.java
@@ -76,8 +76,10 @@ class MapElement extends AbstractElement<Map<Object,Object>>
 size += 2;
 }
 }
-size += 8;
-
+else
+{
+size += 8;
+}
 }
 else
 {

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/b49969c1/proton-j/src/test/java/org/apache/qpid/proton/codec/impl/DataImplTest.java
--
diff --git 
a/proton-j/src/test/java/org/apache/qpid/proton/codec/impl/DataImplTest.java 
b/proton-j/src/test/java/org/apache/qpid/proton/codec/impl/DataImplTest.java
index 5799f17..b650aed 100644
--- a/proton-j/src/test/java/org/apache/qpid/proton/codec/impl/DataImplTest.java
+++ b/proton-j/src/test/java/org/apache/qpid/proton/codec/impl/DataImplTest.java
@@ -86,6 +86,132 @@ public class DataImplTest
 }
 
 @Test
+public void testEncodeArrayOfLists()
+{
+// encode an array of two empty lists
+Data data = new DataImpl();
+data.putArray(false, Data.DataType.LIST);
+data.enter();
+data.putList();
+data.putList();
+data.exit();
+
+int expectedEncodedSize = 4; // 1b type + 1b size + 1b length + 1b 
element constructor
+
+
+Binary encoded = data.encode();
+assertEquals("unexpected encoding size", expectedEncodedSize, 
encoded.getLength());
+
+ByteBuffer expectedEncoding = ByteBuffer.allocate(expectedEncodedSize);
+expectedEncoding.put((byte)0xe0);   // constructor
+expectedEncoding.put((byte)2);   // size
+expectedEncoding.put((byte)2);   // count
+expectedEncoding.put((byte)0x45);   // element constructor
+
+assertEquals("unexpected encoding", new 
Binary(expectedEncoding.array()), encoded);
+
+data = new DataImpl();
+data.putArray(false, Data.DataType.LIST);
+data.enter();
+data.putList();
+data.putList();
+data.putList();
+data.enter();
+data.putNull();
+data.exit();
+data.exit();
+
+expectedEncodedSize = 11; // 1b type + 1b size + 1b length + 1b 
element constructor + 3 * (1b size + 1b count) + 1b null elt
+
+encoded = data.encode();
+assertEquals("unexpected encoding size", expectedEncodedSize, 
encoded.getLength());
+
+expectedEncoding = ByteBuff

svn commit: r1786887 - in /qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src: main/java/org/apache/qpid/server/protocol/v1_0/ test/java/org/apache/qpid/server/protocol/v1_0/

[rgodfrey]

Author: rgodfrey
Date: Tue Mar 14 11:49:27 2017
New Revision: 1786887

URL: http://svn.apache.org/viewvc?rev=1786887=rev
Log:
QPID-7708 : Allow session window credit to be set by a context variable

Modified:

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/Session_1_0Test.java

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0.java?rev=1786887=1786886=1786887=diff
==
--- 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0.java
 Tue Mar 14 11:49:27 2017
@@ -25,6 +25,7 @@ import java.util.List;
 
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
 import org.apache.qpid.server.logging.EventLoggerProvider;
+import org.apache.qpid.server.model.ManagedContextDefault;
 import org.apache.qpid.server.model.ManagedObject;
 import org.apache.qpid.server.protocol.v1_0.codec.SectionDecoderRegistry;
 import org.apache.qpid.server.protocol.v1_0.type.FrameBody;
@@ -42,6 +43,11 @@ public interface AMQPConnection_1_0http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java?rev=1786887=1786886=1786887=diff
==
--- 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java
 Tue Mar 14 11:49:27 2017
@@ -603,7 +603,11 @@ public class AMQPConnection_1_0Impl exte
 }
 else
 {
-Session_1_0 session = new Session_1_0(this, begin, 
sendingChannelId, receivingChannelId);
+Session_1_0 session = new Session_1_0(this,
+  begin,
+  sendingChannelId,
+  receivingChannelId,
+  
getContextValue(Integer.class, 
AMQPConnection_1_0.CONNECTION_SESSION_CREDIT_WINDOW_SIZE));
 session.create();
 
 _receivingSessions[receivingChannelId] = session;

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java?rev=1786887=1786886=1786887=diff
==
--- 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
 Tue Mar 14 11:49:27 2017
@@ -141,11 +141,7 @@ public class Session_1_0 extends Abstrac
 private final short _sendingChannel;
 
 
-// has to be a power of two
 private static final int DEFAULT_SESSION_BUFFER_SIZE = 1 << 11;
-private static final int BUFFER_SIZE_MASK = DEFAULT_SESSION_BUFFER_SIZE - 
1;
-
-
 
 private int _nextOutgoingDeliveryId;
 
@@ -157,7 +153,7 @@ public class Session_1_0 extends Abstrac
 private LinkedHashMap<UnsignedInteger,Delivery> _outgoingUnsettled = new 
LinkedHashMap<>(DEFAULT_SESSION_BUFFER_SIZE);
 private LinkedHashMap<UnsignedInteger,Delivery> _incomingUnsettled = new 
LinkedHashMap<>(DEFAULT_SESSION_BUFFER_SIZE);
 
-private int _availableIncomingCredit = DEFAULT_SESSION_BUFFER_SIZE;
+private final int _incomingWindowSize;
 private int _availableOutgoingCredit = DEFAULT_SESSION_BUFFER_SIZE;
 private UnsignedInteger _lastSentIncomingLimit;
 
@@ -175,7 +171,8 @@ public class Session_1_0 extends Abstrac
 public Session_1_0(final AMQPConnection_1_0 connection,
 

svn commit: r1786090 - /qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/mimecontentconverter/MimeContentConverterRegistry.java

[rgodfrey]

Author: rgodfrey
Date: Wed Mar  8 22:50:49 2017
New Revision: 1786090

URL: http://svn.apache.org/viewvc?rev=1786090=rev
Log:
QPID-7683 : Fix typo

Modified:

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/mimecontentconverter/MimeContentConverterRegistry.java

Modified: 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/mimecontentconverter/MimeContentConverterRegistry.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/mimecontentconverter/MimeContentConverterRegistry.java?rev=1786090=1786089=1786090=diff
==
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/mimecontentconverter/MimeContentConverterRegistry.java
 (original)
+++ 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/mimecontentconverter/MimeContentConverterRegistry.java
 Wed Mar  8 22:50:49 2017
@@ -65,8 +65,8 @@ public class MimeContentConverterRegistr
 final Map<String, MimeContentToObjectConverter> 
mimeContentToObjectConverters = new HashMap<>();
 for(MimeContentToObjectConverter converter : (new 
QpidServiceLoader()).instancesOf(MimeContentToObjectConverter.class))
 {
-final String mineType = converter.getMimeType();
-mimeContentToObjectConverters.put(mineType, converter);
+final String mimeType = converter.getMimeType();
+mimeContentToObjectConverters.put(mimeType, converter);
 }
 return Collections.unmodifiableMap(mimeContentToObjectConverters);
 }



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

svn commit: r1782735 - in /qpid/java/trunk/broker-plugins: amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java websocket/src/main/java/org/apache/qpid/serv

[rgodfrey]

Author: rgodfrey
Date: Mon Feb 13 10:14:04 2017
New Revision: 1782735

URL: http://svn.apache.org/viewvc?rev=1782735=rev
Log:
QPID-7670 : WebSocket transport does not respect AMQP idle timeout

Modified:

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java

qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java?rev=1782735=1782734=1782735=diff
==
--- 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java
 Mon Feb 13 10:14:04 2017
@@ -1314,7 +1314,7 @@ public class AMQPConnection_1_0Impl exte
 FRAME_LOGGER.debug("SEND[{}|{}] : {}",
getNetwork().getRemoteAddress(),
amqFrame.getChannel(),
-   amqFrame.getFrameBody());
+   amqFrame.getFrameBody() == null ? "<>" : 
amqFrame.getFrameBody());
 
 int size = _frameWriter.send(amqFrame);
 if (size > getMaxFrameSize())

Modified: 
qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java?rev=1782735=1782734=1782735=diff
==
--- 
qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java
 Mon Feb 13 10:14:04 2017
@@ -32,7 +32,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
@@ -54,20 +55,21 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.server.transport.MultiVersionProtocolEngine;
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.Protocol;
 import org.apache.qpid.server.model.Transport;
 import org.apache.qpid.server.model.port.AmqpPort;
-import org.apache.qpid.server.transport.MultiVersionProtocolEngineFactory;
 import org.apache.qpid.server.transport.AcceptingTransport;
+import org.apache.qpid.server.transport.ByteBufferSender;
+import org.apache.qpid.server.transport.MultiVersionProtocolEngine;
+import org.apache.qpid.server.transport.MultiVersionProtocolEngineFactory;
 import org.apache.qpid.server.transport.ProtocolEngine;
 import org.apache.qpid.server.transport.SchedulingDelayNotificationListener;
 import org.apache.qpid.server.transport.ServerNetworkConnection;
+import org.apache.qpid.server.transport.network.Ticker;
+import org.apache.qpid.server.transport.network.security.ssl.SSLUtil;
 import org.apache.qpid.server.util.Action;
 import org.apache.qpid.server.util.ServerScopedRuntimeException;
-import org.apache.qpid.server.transport.ByteBufferSender;
-import org.apache.qpid.server.transport.network.security.ssl.SSLUtil;
 
 class WebSocketProvider implements AcceptingTransport
 {
@@ -82,6 +84,11 @@ class WebSocketProvider implements Accep
 private final MultiVersionProtocolEngineFactory _factory;
 private Server _server;
 
+private final List _activeConnections = new 
CopyOnWriteArrayList<>();
+
+private final WebSocketIdleTimeoutChecker _idleTimeoutChecker = new 
WebSocketIdleTimeoutChecker();
+private final AtomicBoolean _closed = new AtomicBoolean();
+
 WebSocketProvider(final Transport transport,
   final SSLContext sslContext,
   final AmqpPort port,
@@ -101,11 +108,14 @@ class WebSocketProvider implements Accep
 _port,
 _transport);
 
+
 }
 
 @Override
 public void start()
 {
+_idleTimeoutChecker.start();
+
 _server = new Server();
 
 final AbstractConnector connector;
@@ -238,7 +248,8 @@ class

svn commit: r1782302 - /qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCDetails.java

[rgodfrey]

Author: rgodfrey
Date: Thu Feb  9 10:15:29 2017
New Revision: 1782302

URL: http://svn.apache.org/viewvc?rev=1782302=rev
Log:
QPID-7668 : Add configuration for MySQL to JDBCDetails
This closes #2. 

Modified:

qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCDetails.java

Modified: 
qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCDetails.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCDetails.java?rev=1782302=1782301=1782302=diff
==
--- 
qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCDetails.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCDetails.java
 Thu Feb  9 10:15:29 2017
@@ -62,6 +62,8 @@ public abstract class JDBCDetails
  true);
 private static final JDBCDetails DERBY = new KnownJDBCDetails("derby", 
"blob", "varchar(%d) for bit data", "bigint", false,
   true);
+private static final JDBCDetails MYSQL = new KnownJDBCDetails("mysql", 
"blob", "varbinary(%d)", "bigint", false,
+true);
 
 static
 {
@@ -73,6 +75,7 @@ public abstract class JDBCDetails
 map.put(SYBASE.getVendor(), SYBASE);
 map.put(POSTGRES.getVendor(), POSTGRES);
 map.put(DERBY.getVendor(), DERBY);
+map.put(MYSQL.getVendor(), MYSQL);
 map.put(FALLBACK.getVendor(), FALLBACK);
 }
 finally



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

svn commit: r1782255 - in /qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0: ./ type/transaction/

[rgodfrey]

Author: rgodfrey
Date: Wed Feb  8 20:40:51 2017
New Revision: 1782255

URL: http://svn.apache.org/viewvc?rev=1782255=rev
Log:
QPID-7667 : Implement multi-session spanning transactions

Added:

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/IdentifiedTransaction.java
   (with props)
Modified:

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/StandardReceivingLink_1_0.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorReceivingLink_1_0.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/Coordinator.java

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0.java?rev=1782255=1782254=1782255=diff
==
--- 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0.java
 Wed Feb  8 20:40:51 2017
@@ -20,6 +20,7 @@
 
 package org.apache.qpid.server.protocol.v1_0;
 
+import java.util.Iterator;
 import java.util.List;
 
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
@@ -33,6 +34,7 @@ import org.apache.qpid.server.protocol.v
 import org.apache.qpid.server.protocol.v1_0.type.transport.Error;
 import org.apache.qpid.server.transport.AMQPConnection;
 import org.apache.qpid.server.transport.ProtocolEngine;
+import org.apache.qpid.server.txn.ServerTransaction;
 
 @ManagedObject(category = false, creatable = false, type="AMQP_1_0")
 public interface AMQPConnection_1_0> extends 
AMQPConnection,
@@ -62,4 +64,9 @@ public interface AMQPConnection_1_0 getOpenTransactions();
+IdentifiedTransaction createLocalTransaction();
+ServerTransaction getTransaction(int txnId);
+void removeTransaction(int txnId);
 }

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java?rev=1782255=1782254=1782255=diff
==
--- 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java
 Wed Feb  8 20:40:51 2017
@@ -62,6 +62,7 @@ import org.apache.qpid.server.protocol.v
 import org.apache.qpid.server.protocol.v1_0.codec.FrameWriter;
 import org.apache.qpid.server.protocol.v1_0.codec.ProtocolHandler;
 import org.apache.qpid.server.protocol.v1_0.codec.QpidByteBufferUtils;
+import org.apache.qpid.server.protocol.v1_0.codec.SectionDecoderRegistry;
 import org.apache.qpid.server.protocol.v1_0.codec.ValueWriter;
 import org.apache.qpid.server.protocol.v1_0.framing.AMQFrame;
 import org.apache.qpid.server.protocol.v1_0.framing.FrameHandler;
@@ -76,7 +77,6 @@ import org.apache.qpid.server.protocol.v
 import org.apache.qpid.server.protocol.v1_0.type.UnsignedInteger;
 import org.apache.qpid.server.protocol.v1_0.type.UnsignedShort;
 import 
org.apache.qpid.server.protocol.v1_0.type.codec.AMQPDescribedTypeRegistry;
-import org.apache.qpid.server.protocol.v1_0.codec.SectionDecoderRegistry;
 import org.apache.qpid.server.protocol.v1_0.type.security.SaslChallenge;
 import org.apache.qpid.server.protocol.v1_0.type.security.SaslCode;
 import org.apache.qpid.server.protocol.v1_0.type.security.SaslInit;
@@ -106,14 +106,16 @@ import org.apache.qpid.server.session.AM
 import org.apache.qpid.server.store.StoreException;
 import org.apache.qpid.server.transport.AbstractAMQPConnection;
 import org.apache.qpid.server.transport.AggregateTicker;
+import org.apache.qpid.server.transport.ByteBufferSender;
 import org.apache.qpid.server.transport.ProtocolEn

svn commit: r1778099 - in /qpid/java/trunk/broker-core/src: main/java/org/apache/qpid/server/model/ test/java/org/apache/qpid/server/model/adapter/ test/java/org/apache/qpid/server/security/

[rgodfrey]

Author: rgodfrey
Date: Tue Jan 10 09:29:55 2017
New Revision: 1778099

URL: http://svn.apache.org/viewvc?rev=1778099=rev
Log:
QPID-7612 : Fix mocking and allow parent to be null so that tests pass

Modified:

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

qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java

qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/FileKeyStoreTest.java

qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/FileTrustStoreTest.java

Modified: 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactoryImpl.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactoryImpl.java?rev=1778099=1778098=1778099=diff
==
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactoryImpl.java
 (original)
+++ 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactoryImpl.java
 Tue Jan 10 09:29:55 2017
@@ -111,14 +111,17 @@ public class ConfiguredObjectFactoryImpl
 
 private String getOnlyValidChildTypeIfKnown(final ConfiguredObject 
parent, final String category)
 {
-String foo = null;
-final Collection validChildTypes =
-
_model.getTypeRegistry().getValidChildTypes(parent.getTypeClass(), category);
-if (validChildTypes != null && validChildTypes.size() == 1)
+if(parent != null)
 {
-foo = validChildTypes.iterator().next();
+final Collection validChildTypes =
+
_model.getTypeRegistry().getValidChildTypes(parent.getTypeClass(), category);
+if (validChildTypes != null && validChildTypes.size() == 1)
+{
+return validChildTypes.iterator().next();
+}
 }
-return foo;
+return null;
+
 }
 
 @Override

Modified: 
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java?rev=1778099=1778098=1778099=diff
==
--- 
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
 (original)
+++ 
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
 Tue Jan 10 09:29:55 2017
@@ -87,6 +87,7 @@ public class PortFactoryTest extends Qpi
 when(_broker.getCategoryClass()).thenReturn(Broker.class);
 when(_broker.getEventLogger()).thenReturn(new EventLogger());
 when(_broker.getParent()).thenReturn(systemConfig);
+when(_broker.getTypeClass()).thenReturn(Broker.class);
 
 ConfiguredObjectFactory objectFactory = new 
ConfiguredObjectFactoryImpl(BrokerModel.getInstance());
 when(_broker.getObjectFactory()).thenReturn(objectFactory);

Modified: 
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/FileKeyStoreTest.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/FileKeyStoreTest.java?rev=1778099=1778098=1778099=diff
==
--- 
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/FileKeyStoreTest.java
 (original)
+++ 
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/FileKeyStoreTest.java
 Tue Jan 10 09:29:55 2017
@@ -62,6 +62,7 @@ public class FileKeyStoreTest extends Qp
 when(_broker.getModel()).thenReturn(_model);
 when(_broker.getCategoryClass()).thenReturn(Broker.class);
 when(_broker.getEventLogger()).thenReturn(new EventLogger());
+when(_broker.getTypeClass()).thenReturn(Broker.class);
 }
 
 public void testCreateKeyStoreFromFile_Success() throws Exception

Modified: 
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/FileTrustStoreTest.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/FileTrustStoreTest.java?rev=1778099=1778098=1778099=diff
==
--- 
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/FileTrustStoreTest.java
 (original)
+++ 
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/FileTrustStoreTest.java
 Tue Jan 10 09:29:55 2017
@@ -66,6 +66,7 @@ public class FileTrustStoreTest extends
 when(_broker.getModel()).thenReturn(_model);
 when(_broker.

svn commit: r1778033 - in /qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server: model/ security/auth/manager/

[rgodfrey]

Author: rgodfrey
Date: Mon Jan  9 19:16:16 2017
New Revision: 1778033

URL: http://svn.apache.org/viewvc?rev=1778033=rev
Log:
QPID-7612 : [Java Broker] Where there is only one possibly type for a 
configured object, do not require it to be provided

Modified:

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

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

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

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ConfigModelPasswordManagingAuthenticationProvider.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/MD5AuthenticationProvider.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PlainAuthenticationProvider.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManager.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA256AuthenticationManager.java

Modified: 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactory.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactory.java?rev=1778033=1778032=1778033=diff
==
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactory.java
 (original)
+++ 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactory.java
 Mon Jan  9 19:16:16 2017
@@ -38,11 +38,6 @@ public interface ConfiguredObjectFactory
 
 > ListenableFuture createAsync(Class 
clazz, Map<String, Object> attributes, ConfiguredObject parent);
 
-
-
-> ConfiguredObjectTypeFactory 
getConfiguredObjectTypeFactory(Class categoryClass,
-   
   Map<String, Object> attributes);
-
 > ConfiguredObjectTypeFactory 
getConfiguredObjectTypeFactory(String category,

   String type);
 

Modified: 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactoryImpl.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactoryImpl.java?rev=1778033=1778032=1778033=diff
==
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactoryImpl.java
 (original)
+++ 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactoryImpl.java
 Mon Jan  9 19:16:16 2017
@@ -94,6 +94,11 @@ public class ConfiguredObjectFactoryImpl
 
 String type = (String) 
record.getAttributes().get(ConfiguredObject.TYPE);
 
+if(type == null || "".equals(type))
+{
+type = getOnlyValidChildTypeIfKnown(parent, category);
+}
+
 ConfiguredObjectTypeFactory factory = 
getConfiguredObjectTypeFactory(category, type);
 
 if(factory == null)
@@ -104,12 +109,24 @@ public class ConfiguredObjectFactoryImpl
 return factory.recover(this, record, parent);
 }
 
+private String getOnlyValidChildTypeIfKnown(final ConfiguredObject 
parent, final String category)
+{
+String foo = null;
+final Collection validChildTypes =
+
_model.getTypeRegistry().getValidChildTypes(parent.getTypeClass(), category);
+if (validChildTypes != null && validChildTypes.size() == 1)
+{
+foo = validChildTypes.iterator().next();
+}
+return foo;
+}
+
 @Override
 public > X create(Class clazz,
 final Map<String, Object> 
attributes,
 final ConfiguredObject 
parent)
 {
-ConfiguredObjectTypeFactory factory = 
getConfiguredObjectTypeFactory(clazz, attributes);
+ConfiguredObjectTypeFactory factory = 
getConfiguredObjectTypeFactory(clazz, attributes, parent);
 
 return factory.create(this, attributes, parent);
 }
@@ -120,15 +137,14 @@ public class ConfiguredObjectFactoryImpl
 final Map<String, Object> 
attributes,
 final ConfiguredObject 
parent)
 {
-ConfiguredObjectTypeFactory factory = 
getConfiguredObjectTypeFactory(clazz, attributes);
+ConfiguredObjectTypeF

svn commit: r1777483 - /qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/

[rgodfrey]

Author: rgodfrey
Date: Thu Jan  5 17:19:33 2017
New Revision: 1777483

URL: http://svn.apache.org/viewvc?rev=1777483=rev
Log:
QPID-7568 : Address review comments by [~k-wall]

Modified:

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ExchangeDestination.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/LinkEndpoint.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/NodeReceivingDestination.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/QueueDestination.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingDestination.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ExchangeDestination.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ExchangeDestination.java?rev=1777483=1777482=1777483=diff
==
--- 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ExchangeDestination.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ExchangeDestination.java
 Thu Jan  5 17:19:33 2017
@@ -28,6 +28,7 @@ import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.logging.messages.ExchangeMessages;
 import org.apache.qpid.server.message.InstanceProperties;
+import org.apache.qpid.server.message.MessageDestination;
 import org.apache.qpid.server.message.MessageInstance;
 import org.apache.qpid.server.message.RoutingResult;
 import org.apache.qpid.server.message.ServerMessage;
@@ -134,6 +135,12 @@ public class ExchangeDestination impleme
 }
 
 @Override
+public MessageDestination getMessageDestination()
+{
+return _exchange;
+}
+
+@Override
 public void authorizePublish(final SecurityToken securityToken,
  final String routingAddress)
 {
@@ -232,9 +239,8 @@ public class ExchangeDestination impleme
 @Override
 public Symbol[] getCapabilities()
 {
-Symbol[] capabilities = new Symbol[2];
+Symbol[] capabilities = new Symbol[1];
 capabilities[0] = _discardUnroutable ? DISCARD_UNROUTABLE : 
REJECT_UNROUTABLE;
-capabilities[1] = DELAYED_DELIVERY;
 return capabilities;
 }
 }

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/LinkEndpoint.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/LinkEndpoint.java?rev=1777483=1777482=1777483=diff
==
--- 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/LinkEndpoint.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/LinkEndpoint.java
 Thu Jan  5 17:19:33 2017
@@ -21,15 +21,18 @@
 
 package org.apache.qpid.server.protocol.v1_0;
 
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
+import org.apache.qpid.server.protocol.v1_0.type.BaseSource;
+import org.apache.qpid.server.protocol.v1_0.type.BaseTarget;
 import org.apache.qpid.server.protocol.v1_0.type.Binary;
 import org.apache.qpid.server.protocol.v1_0.type.DeliveryState;
-import org.apache.qpid.server.protocol.v1_0.type.BaseSource;
 import org.apache.qpid.server.protocol.v1_0.type.Symbol;
-import org.apache.qpid.server.protocol.v1_0.type.BaseTarget;
 import org.apache.qpid.server.protocol.v1_0.type.UnsignedInteger;
 import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong;
 import org.apache.qpid.server.protocol.v1_0.type.transport.Attach;
@@ -52,6 +55,7 @@ public abstract class LinkEndpoint getCapabilities()
+{
+return _capabilities == null ? null : 
Collections.unmodifiableList(Arrays.asList(_capabilities));
+}
+
+public void setCapabilities(Collection capabilities)
+{
+_capabilities = capabilities == null ? null : capabilities.toArray(new 
Symbol[capabilities.size()]);
+}
+
 public Map getInitialUnsettledMap()
 {
 return _initialUnsettledMap;

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/NodeReceivingDestination.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker

svn commit: r1776351 - in /qpid/java/trunk: bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/ broker-codegen/src/main/java/org/apache/qpid/server/model/validation/ broker-core/src/

[rgodfrey]

Author: rgodfrey
Date: Wed Dec 28 22:35:18 2016
New Revision: 1776351

URL: http://svn.apache.org/viewvc?rev=1776351=rev
Log:
QPID-7601 : Allow annotations to define ManagedAttributeValueTypes as abstract, 
some methods as derived

Added:

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

qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/ConfiguredObjectBinding.java

qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/MapBinding.java

qpid/java/trunk/broker-codegen/src/main/java/org/apache/qpid/server/model/validation/AttributeAnnotationValidator.java

qpid/java/trunk/broker-codegen/src/main/java/org/apache/qpid/server/model/validation/ManagedAttributeValueTypeValidator.java

qpid/java/trunk/broker-codegen/src/main/java/org/apache/qpid/server/model/validation/OperationAnnotationValidator.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/connection/AmqpConnectionMetaData.java

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

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

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

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

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

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

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

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

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

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

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/SocketConnectionMetaData.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCConfigurationStore.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/preferences/AbstractJDBCPreferenceStore.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/preferences/JsonFilePreferenceStore.java

qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/ConfiguredObjectJacksonModuleTest.java

qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementOutputConverter.java

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

Modified: 
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/ConfiguredObjectBinding.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/ConfiguredObjectBinding.java?rev=1776351=1776350=1776351=diff
==
--- 
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/ConfiguredObjectBinding.java
 (original)
+++ 
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/ConfiguredObjectBinding.java
 Wed Dec 28 22:35:18 2016
@@ -25,13 +25,13 @@ import java.io.StringWriter;
 import java.util.Map;
 import java.util.UUID;
 
-import org.apache.qpid.server.model.ConfiguredObjectJacksonModule;
-import org.apache.qpid.server.store.ConfiguredObjectRecord;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.sleepycat.bind.tuple.TupleBinding;
 import com.sleepycat.bind.tuple.TupleInput;
 import com.sleepycat.bind.tuple.TupleOutput;
+
+import org.apache.qpid.server.model.ConfiguredObjectJacksonModule;
+import org.apache.qpid.server.store.ConfiguredObjectRecord;
 import org.apache.qpid.server.store.StoreException;
 import org.apache.qpid.server.store.berkeleydb.BDBConfiguredObjectRecord;
 
@@ -75,7 +75,7 @@ public class ConfiguredObjectBinding ext
 try
 {
 StringWriter writer = new StringWriter();
-final ObjectMapper objectMapper = 
ConfiguredObjectJacksonModule.newObjectMapper();
+final ObjectMapper objectMapper = 
ConfiguredObjectJacksonModule.newObjectMapper(true);
 objectMapper.writeValue(writer, object.getAttributes());
 tupleOutput.writeString

svn commit: r1776037 [2/2] - in /qpid/java/trunk: broker-core/src/main/java/org/apache/qpid/server/exchange/ broker-core/src/main/java/org/apache/qpid/server/exchange/topic/ broker-core/src/main/java/

[rgodfrey]

Modified: 
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java?rev=1776037=1776036=1776037=diff
==
--- 
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
 (original)
+++ 
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
 Sun Dec 25 22:55:13 2016
@@ -20,6 +20,7 @@
  */
 package org.apache.qpid.server.exchange;
 
+import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anySet;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.mock;
@@ -27,6 +28,7 @@ import static org.mockito.Mockito.when;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -42,16 +44,23 @@ import org.apache.qpid.server.configurat
 import org.apache.qpid.server.configuration.updater.TaskExecutor;
 import org.apache.qpid.server.logging.EventLogger;
 import org.apache.qpid.server.message.AMQMessageHeader;
+import org.apache.qpid.server.message.EnqueueableMessage;
 import org.apache.qpid.server.message.InstanceProperties;
+import org.apache.qpid.server.message.MessageInstance;
+import org.apache.qpid.server.message.RoutingResult;
 import org.apache.qpid.server.message.ServerMessage;
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.BrokerModel;
 import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl;
 import org.apache.qpid.server.model.Exchange;
 import org.apache.qpid.server.model.Queue;
+import org.apache.qpid.server.model.State;
 import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.server.model.VirtualHostNode;
 import org.apache.qpid.server.queue.BaseQueue;
+import org.apache.qpid.server.store.MessageEnqueueRecord;
+import org.apache.qpid.server.store.TransactionLogResource;
+import org.apache.qpid.server.txn.ServerTransaction;
 import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
 import org.apache.qpid.test.utils.QpidTestCase;
 
@@ -84,6 +93,7 @@ public class HeadersExchangeTest extends
 when(_virtualHost.getCategoryClass()).thenReturn(VirtualHost.class);
 when(_virtualHost.getTaskExecutor()).thenReturn(_taskExecutor);
 when(_virtualHost.getChildExecutor()).thenReturn(_taskExecutor);
+when(_virtualHost.getState()).thenReturn(State.ACTIVE);
 
 _factory = new ConfiguredObjectFactoryImpl(BrokerModel.getInstance());
 when(_virtualHost.getObjectFactory()).thenReturn(_factory);
@@ -106,7 +116,7 @@ public class HeadersExchangeTest extends
 
 protected void routeAndTest(ServerMessage msg, Queue... expected) 
throws Exception
 {
-List results = _exchange.route(msg, "", 
InstanceProperties.EMPTY);
+List results = routeToQueues(msg, "", 
InstanceProperties.EMPTY);
 List unexpected = new 
ArrayList(results);
 unexpected.removeAll(Arrays.asList(expected));
 assertTrue("Message delivered to unexpected queues: " + unexpected, 
unexpected.isEmpty());
@@ -116,6 +126,88 @@ public class HeadersExchangeTest extends
 assertTrue("Duplicates " + results, results.size()==(new 
HashSet(results)).size());
 }
 
+private List routeToQueues(final ServerMessage 
message,
+final String 
routingAddress,
+final InstanceProperties 
instanceProperties)
+{
+RoutingResult result = _exchange.route(message, routingAddress, 
instanceProperties);
+final List resultQueues = new ArrayList<>();
+result.send(new ServerTransaction()
+{
+@Override
+public long getTransactionStartTime()
+{
+return 0;
+}
+
+@Override
+public long getTransactionUpdateTime()
+{
+return 0;
+}
+
+@Override
+public void addPostTransactionAction(final Action 
postTransactionAction)
+{
+
+}
+
+@Override
+public void dequeue(final MessageEnqueueRecord record, final 
Action postTransactionAction)
+{
+
+}
+
+@Override
+public void dequeue(final Collection messages, 
final Action postTransactionAction)
+{
+
+}
+
+@Override
+public void enqueue(final TransactionLogResource queue,
+final EnqueueableMessage message,
+final EnqueueAction postTransactionAction)
+{
+resultQueues.add((BaseQueue) queue);

svn commit: r1776037 [1/2] - in /qpid/java/trunk: broker-core/src/main/java/org/apache/qpid/server/exchange/ broker-core/src/main/java/org/apache/qpid/server/exchange/topic/ broker-core/src/main/java/

[rgodfrey]

Author: rgodfrey
Date: Sun Dec 25 22:55:13 2016
New Revision: 1776037

URL: http://svn.apache.org/viewvc?rev=1776037=rev
Log:
QPID-6028 : allow binding destinations to be things other than queues

Added:

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

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultDestination.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchangeImpl.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeImpl.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeImpl.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchangeImpl.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicExchangeResult.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/FilterSupport.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/MessageDestination.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/BaseQueue.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/TransactionLogResource.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DistributedTransaction.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/ServerTransaction.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java

qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java

qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java

qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java

qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/txn/AsyncAutoCommitTransactionTest.java

qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/txn/AutoCommitTransactionTest.java

qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/txn/LocalTransactionTest.java

qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java

qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java

qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ExchangeDestination.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/NodeReceivingDestination.java

qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementAddressSpace.java

qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java

qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNodeConsumer.java

qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ProxyMessageSource.java

qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java

Modified: 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java?rev=1776037=1776036=1776037=diff
==
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
 (original)
+++ 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
 Sun Dec 25 22:55:13 2016
@@ -24,6 +24,7 @@ import java.security.AccessControlExcept
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -49,9 +50,8

svn commit: r1775781 [2/2] - in /qpid/java/trunk: bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/ bdbstore/src/test/java/org/apache/qpid/server/virtualhost/berkeleydb/ bdbsto

[rgodfrey]

Modified: 
qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/LegacyAccessControlAdapterTest.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/LegacyAccessControlAdapterTest.java?rev=1775781=1775780=1775781=diff
==
--- 
qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/LegacyAccessControlAdapterTest.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/LegacyAccessControlAdapterTest.java
 Fri Dec 23 00:56:57 2016
@@ -80,7 +80,7 @@ public class LegacyAccessControlAdapterT
 when(vh.getCategoryClass()).thenReturn(VirtualHost.class);
 when(vh.getName()).thenReturn(TEST_VIRTUAL_HOST);
 when(vh.getAttribute(VirtualHost.NAME)).thenReturn(TEST_VIRTUAL_HOST);
-when(vh.getParent(VirtualHostNode.class)).thenReturn(_virtualHostNode);
+when(vh.getParent()).thenReturn(_virtualHostNode);
 when(vh.getModel()).thenReturn(BrokerModel.getInstance());
 return vh;
 }
@@ -91,7 +91,7 @@ public class LegacyAccessControlAdapterT
 when(vhn.getCategoryClass()).thenReturn(VirtualHostNode.class);
 when(vhn.getName()).thenReturn("testVHN");
 when(vhn.getAttribute(ConfiguredObject.NAME)).thenReturn("testVHN");
-when(vhn.getParent(Broker.class)).thenReturn(_broker);
+when(vhn.getParent()).thenReturn(_broker);
 when(vhn.getModel()).thenReturn(BrokerModel.getInstance());
 return vhn;
 }
@@ -100,7 +100,7 @@ public class LegacyAccessControlAdapterT
 public void testAuthoriseCreateAccessControlProvider()
 {
 AccessControlProvider accessControlProvider = 
mock(AccessControlProvider.class);
-
when(accessControlProvider.getParent(Broker.class)).thenReturn(_broker);
+when(accessControlProvider.getParent()).thenReturn(_broker);
 when(accessControlProvider.getName()).thenReturn("TEST");
 
when(accessControlProvider.getCategoryClass()).thenReturn(AccessControlProvider.class);
 
@@ -110,7 +110,7 @@ public class LegacyAccessControlAdapterT
 public void testAuthoriseCreateConsumer()
 {
 Queue queue = mock(Queue.class);
-when(queue.getParent(VirtualHost.class)).thenReturn(_virtualHost);
+when(queue.getParent()).thenReturn(_virtualHost);
 when(queue.getAttribute(Queue.NAME)).thenReturn(TEST_QUEUE);
 when(queue.getAttribute(Queue.DURABLE)).thenReturn(true);
 
when(queue.getAttribute(Queue.LIFETIME_POLICY)).thenReturn(LifetimePolicy.PERMANENT);
@@ -123,7 +123,7 @@ public class LegacyAccessControlAdapterT
 
 QueueConsumer consumer = mock(QueueConsumer.class);
 when(consumer.getAttribute(QueueConsumer.NAME)).thenReturn("1");
-when(consumer.getParent(Queue.class)).thenReturn(queue);
+when(consumer.getParent()).thenReturn(queue);
 when(consumer.getCategoryClass()).thenReturn(Consumer.class);
 
 ObjectProperties properties = new ObjectProperties();
@@ -143,7 +143,7 @@ public class LegacyAccessControlAdapterT
 Port mock = mock(Port.class);
 when(mock.getName()).thenReturn("test");
 when(mock.getCategoryClass()).thenReturn(Port.class);
-when(mock.getParent(Broker.class)).thenReturn(_broker);
+when(mock.getParent()).thenReturn(_broker);
 assertBrokerChildUpdateAuthorization(mock);
 }
 
@@ -155,7 +155,7 @@ public class LegacyAccessControlAdapterT
 User mock = mock(User.class);
 when(mock.getName()).thenReturn("test");
 when(mock.getCategoryClass()).thenReturn(User.class);
-
when(mock.getParent(AuthenticationProvider.class)).thenReturn(authenticationProvider);
+when(mock.getParent()).thenReturn(authenticationProvider);
 ObjectProperties properties = new 
ObjectProperties((String)mock.getName());
 assertUpdateAuthorization(mock, LegacyOperation.UPDATE, 
ObjectType.USER, properties, authenticationProvider);
 }
@@ -169,7 +169,7 @@ public class LegacyAccessControlAdapterT
 when(mock.getName()).thenReturn("test");
 when(mock.getAttribute(ConfiguredObject.NAME)).thenReturn("test");
 when(mock.getCategoryClass()).thenReturn(VirtualHost.class);
-when(mock.getParent(VirtualHostNode.class)).thenReturn(vhn);
+when(mock.getParent()).thenReturn(vhn);
 ObjectProperties properties = new 
ObjectProperties((String)mock.getName());
 assertDeleteAuthorization(mock, LegacyOperation.DELETE, 
ObjectType.VIRTUALHOST, properties, vhn);
 }
@@ -179,7 +179,7 @@ public class LegacyAccessControlAdapterT
 KeyStore mock = mock(KeyStore.class);
 when(mock.getName()).thenReturn("test");
 

svn commit: r1775781 [1/2] - in /qpid/java/trunk: bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/ bdbstore/src/test/java/org/apache/qpid/server/virtualhost/berkeleydb/ bdbsto

[rgodfrey]

Author: rgodfrey
Date: Fri Dec 23 00:56:57 2016
New Revision: 1775781

URL: http://svn.apache.org/viewvc?rev=1775781=rev
Log:
QPID-6028 : Change AbstractConfiguredObject to store only the single parent

Modified:

qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java

qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java

qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHostImplTest.java

qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeTest.java

qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeOperationalLoggingTest.java

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

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

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

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

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/TrustStoreMessageSourceCreator.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ManagedUser.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/TCPandSSLTransport.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ProvidedStoreVirtualHostImpl.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/AbstractFixedVirtualHostNodeAlias.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/AbstractVirtualHostAlias.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/DefaultVirtualHostAliasImpl.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/SystemAddressSpaceAliasImpl.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/VirtualHostNameAliasImpl.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostNodeImpl.java

qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostCreationTest.java

qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/DirectExchangeTest.java

qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java

qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java

qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java

qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java

qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java

qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/port/AmqpPortImplTest.java

qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/port/HttpPortImplTest.java

qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/TCPandSSLTransportTest.java

qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AbstractVirtualHostTest.java

qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java

qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhostalias/VirtualHostAliasTest.java

qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNodeTest.java

qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostNodeTest.java

qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/LegacyAccessControlAdapter.java

qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/LegacyAccessControlAdapterTest.java

qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java

qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerFileLoggerTest.java

qpid/java/trunk/broker-plugins/logging-logback/src/test

svn commit: r1775768 [1/2] - in /qpid/java/trunk: bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/ broker-core/src/main/java/org/apache/qpid/server/configuration/store/ broker

[rgodfrey]

Author: rgodfrey
Date: Thu Dec 22 22:57:59 2016
New Revision: 1775768

URL: http://svn.apache.org/viewvc?rev=1775768=rev
Log:
QPID-6028 : Change the Model to prevent multiple parents

Modified:

qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListener.java

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

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

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

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

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

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

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

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

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

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

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

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ConfigModelPasswordManagingAuthenticationProvider.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupImpl.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupProviderImpl.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/ConfiguredObjectRecordConverter.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractNonConnectionAcceptingVirtualHost.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostNodeImpl.java

qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListenerTest.java

qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/DirectExchangeTest.java

qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java

qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestKitCarImpl.java

qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestModel.java

qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestStandardCarImpl.java

qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/lifecycle/TestConfiguredObject.java

qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/TestModel.java

qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractLogger.java

qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java

qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementOutputConverter.java

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

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

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

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

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

qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server

svn commit: r1775768 [2/2] - in /qpid/java/trunk: bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/ broker-core/src/main/java/org/apache/qpid/server/configuration/store/ broker

[rgodfrey]

Modified: 
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/VirtualHostQueryServlet.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/VirtualHostQueryServlet.java?rev=1775768=1775767=1775768=diff
==
--- 
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/VirtualHostQueryServlet.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/VirtualHostQueryServlet.java
 Thu Dec 22 22:57:59 2016
@@ -127,15 +127,15 @@ public class VirtualHostQueryServlet ext
 while (element != null && element != VirtualHost.class)
 {
 hierarchy.add(element);
-final Collection 
parentTypes =
-model.getParentTypes(element);
-if(parentTypes == null || parentTypes.isEmpty())
+final Class parentType =
+model.getParentType(element);
+if(parentType == null)
 {
 break;
 }
 else
 {
-element = parentTypes.iterator().next();
+element = parentType;
 }
 }
 Collections.reverse(hierarchy);
@@ -159,15 +159,15 @@ public class VirtualHostQueryServlet ext
 while (element != null && element != Connection.class)
 {
 hierarchy.add(element);
-final Collection 
parentTypes =
-model.getParentTypes(element);
-if (parentTypes == null || parentTypes.isEmpty())
+final Class parentType =
+model.getParentType(element);
+if (parentType == null)
 {
 break;
 }
 else
 {
-element = parentTypes.iterator().next();
+element = parentType;
 }
 }
 Collections.reverse(hierarchy);

Modified: 
qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java?rev=1775768=1775767=1775768=diff
==
--- 
qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java
 Thu Dec 22 22:57:59 2016
@@ -333,7 +333,7 @@ public class ConfiguredObjectToMapConver
 // set actual values
 
when(mockChild.getActualAttributes()).thenReturn(Collections.singletonMap("secureAttribute",
 "secret"));
 
when(_configuredObject.getChildren(TestChild.class)).thenReturn(Arrays.asList(mockChild));
-
when(model.getParentTypes(TestChild.class)).thenReturn(Collections.singleton(TestChild.class));
+
when(model.getParentType(TestChild.class)).thenReturn((Class)TestChild.class);
 when(_configuredObject.getCategoryClass()).thenReturn(TestChild.class);
 when(mockChild.isDurable()).thenReturn(true);
 

Modified: 
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java?rev=1775768=1775767=1775768=diff
==
--- 
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java
 (original)
+++ 
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java
 Thu Dec 22 22:57:59 2016
@@ -154,7 +154,7 @@ public class VirtualHostMessageStoreTest
 ObjectMapper objectMapper = new ObjectMapper();
 Map attrs =  objectMapper.readValue(bluePrint, 
Map.class);
 virtualHostAttributes.putAll(attrs);
-_node.createChild(VirtualHost.class, virtualHostAttributes, _node);
+_node.createChild(VirtualHost.class, virtualHostAttributes);
 
 _virtualHost = 

svn commit: r1774283 - in /qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp: ManagementAddressSpace.java ProxyMessageSource.java

[rgodfrey]

Author: rgodfrey
Date: Wed Dec 14 16:10:39 2016
New Revision: 1774283

URL: http://svn.apache.org/viewvc?rev=1774283=rev
Log:
QPID-7589 : remove accidentally committed debug logging

Modified:

qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementAddressSpace.java

qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ProxyMessageSource.java

Modified: 
qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementAddressSpace.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementAddressSpace.java?rev=1774283=1774282=1774283=diff
==
--- 
qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementAddressSpace.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementAddressSpace.java
 Wed Dec 14 16:10:39 2016
@@ -247,12 +247,10 @@ public class ManagementAddressSpace impl
 
 private ProxyMessageSource createProxyNode(final Map<String, Object> 
attributes)
 {
-LOGGER.debug("RG: in create proxy node");
 Subject currentSubject = 
Subject.getSubject(AccessController.getContext());
 Set sessionPrincipals = 
currentSubject.getPrincipals(SessionPrincipal.class);
 if (!sessionPrincipals.isEmpty())
 {
-LOGGER.debug("RG: session principal present");
 final ProxyMessageSource proxyMessageSource = new 
ProxyMessageSource(this, attributes);
 final AMQSessionModel session = 
sessionPrincipals.iterator().next().getSession();
 final Object connectionReference = 
session.getConnectionReference();
@@ -298,7 +296,6 @@ public class ManagementAddressSpace impl
  final 
Map<String, Object> attributes)
 {
 
-LOGGER.debug("RG : requesting destination creation");
 if(clazz == MessageDestination.class)
 {
 return (T) createProxyNode(attributes);

Modified: 
qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ProxyMessageSource.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ProxyMessageSource.java?rev=1774283=1774282=1774283=diff
==
--- 
qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ProxyMessageSource.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ProxyMessageSource.java
 Wed Dec 14 16:10:39 2016
@@ -209,7 +209,6 @@ public class ProxyMessageSource implemen
 @Override
 public void notifyWork()
 {
-LOGGER.debug("RG: notifyWork called");
 _underlying.notifyWork();
 }
 



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

svn commit: r1774263 - in /qpid/java/trunk: broker-core/src/main/java/org/apache/qpid/server/virtualhost/ broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ broker-pl

[rgodfrey]

Author: rgodfrey
Date: Wed Dec 14 15:18:33 2016
New Revision: 1774263

URL: http://svn.apache.org/viewvc?rev=1774263=rev
Log:
QPID-7589 : Allow the creation of temporary reply addresses in the $management 
synthetic virtual host

Added:

qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ProxyMessageSource.java
   (with props)
Modified:

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java

qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementAddressSpace.java

qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java

qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/amqp/AmqpManagementTest.java
qpid/java/trunk/test-profiles/Java10BrokenTestsExcludes

Modified: 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java?rev=1774263=1774262=1774263=diff
==
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
 (original)
+++ 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
 Wed Dec 14 15:18:33 2016
@@ -2695,6 +2695,10 @@ public abstract class AbstractVirtualHos
 {
 return (T) createChild((Class)clazz, attributes);
 }
+else if(clazz.isAssignableFrom(Queue.class))
+{
+return (T) createChild(Queue.class, attributes);
+}
 else
 {
 throw new IllegalArgumentException("Cannot create message source 
children of class " + clazz.getSimpleName());
@@ -2713,6 +2717,10 @@ public abstract class AbstractVirtualHos
 {
 return (T) createChild((Class)clazz, attributes);
 }
+else if(clazz.isAssignableFrom(Queue.class))
+{
+return (T) createChild(Queue.class, attributes);
+}
 else
 {
 throw new IllegalArgumentException("Cannot create message 
destination children of class " + clazz.getSimpleName());

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java?rev=1774263=1774262=1774263=diff
==
--- 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
 Wed Dec 14 15:18:33 2016
@@ -799,7 +799,7 @@ public class Session_1_0 implements AMQS
 {
 if (Boolean.TRUE.equals(source.getDynamic()))
 {
-Queue tempQueue = 
createTemporaryQueue(source.getDynamicNodeProperties());
+MessageSource tempQueue = 
createDynamicSource(source.getDynamicNodeProperties());
 source.setAddress(tempQueue.getName());
 }
 String addr = source.getAddress();
@@ -976,7 +976,7 @@ public class Session_1_0 implements AMQS
 if (Boolean.TRUE.equals(target.getDynamic()))
 {
 
-Queue tempQueue = 
createTemporaryQueue(target.getDynamicNodeProperties());
+MessageDestination tempQueue = 
createDynamicDestination(target.getDynamicNodeProperties());
 target.setAddress(tempQueue.getName());
 }
 
@@ -1114,50 +1114,47 @@ public class Session_1_0 implements AMQS
 }
 
 
-private Queue createTemporaryQueue(Map properties)
+private MessageSource createDynamicSource(Map properties)
 {
 final String queueName = _primaryDomain + "TempQueue" + 
UUID.randomUUID().toString();
-Queue queue = null;
+MessageSource queue = null;
 try
 {
-LifetimePolicy lifetimePolicy = properties == null
-? null
-: (LifetimePolicy) 
properties.get(LIFETIME_POLICY);
-Map<String,Object> attributes = new HashMap<String,Object>();
-attributes.put(org.apache.qp

svn commit: r1774020 - /qpid/java/trunk/broker/scripts/

[rgodfrey]

Author: rgodfrey
Date: Tue Dec 13 14:15:42 2016
New Revision: 1774020

URL: http://svn.apache.org/viewvc?rev=1774020=rev
Log:
QPID-3260 : Remove a script that relies on tooling that was deleted back in 2011

Removed:
qpid/java/trunk/broker/scripts/


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

svn commit: r1773795 - in /qpid/java/trunk: broker-core/src/main/java/org/apache/qpid/server/plugin/ broker-core/src/main/java/org/apache/qpid/server/protocol/ broker-plugins/amqp-0-10-protocol/src/ma

[rgodfrey]

Author: rgodfrey
Date: Mon Dec 12 14:34:54 2016
New Revision: 1773795

URL: http://svn.apache.org/viewvc?rev=1773795=rev
Log:
QPID-7587 : Add support for enveloping messages from 0-x protocols using the 
1.0 transport

Added:

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/plugin/MessageFormat.java
  - copied, changed from r1773722, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/plugin/MessageConverter.java

qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/MessageFormatRegistry.java
  - copied, changed from r1773722, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/MessageConverterRegistry.java

qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageFormat_0_10.java
   (with props)

qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageFormat_0_9_1.java
   (with props)
Modified:

qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ExchangeDestination.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/NodeReceivingDestination.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/QueueDestination.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingDestination.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/StandardReceivingLink_1_0.java

qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ContentHeaderPropertiesFactory.java

qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/MessagePublishInfo.java

Copied: 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/plugin/MessageFormat.java
 (from r1773722, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/plugin/MessageConverter.java)
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/plugin/MessageFormat.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/plugin/MessageFormat.java=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/plugin/MessageConverter.java=1773722=1773795=1773795=diff
==
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/plugin/MessageConverter.java
 (original)
+++ 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/plugin/MessageFormat.java
 Mon Dec 12 14:34:54 2016
@@ -20,14 +20,17 @@
  */
 package org.apache.qpid.server.plugin;
 
+import java.util.List;
+
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
 import org.apache.qpid.server.message.ServerMessage;
-import org.apache.qpid.server.model.NamedAddressSpace;
+import org.apache.qpid.server.store.MessageStore;
 
-public interface MessageConverter extends Pluggable
+public interface MessageFormat> extends Pluggable
 {
-Class getInputClass();
-Class getOutputClass();
-
-N convert(M message, NamedAddressSpace addressSpace);
-void dispose(N message);
+int getSupportedFormat();
+Class getMessageClass();
+List convertToMessageFormat(M message);
+M createMessage(List buf, MessageStore store, final Object 
connectionReference);
+String getRoutingAddress(M message, String destinationAddress);
 }

Copied: 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/MessageFormatRegistry.java
 (from r1773722, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/MessageConverterRegistry.java)
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/MessageFormatRegistry.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/MessageFormatRegistry.java=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/MessageConverterRegistry.java=1773722=1773795=1773795=diff
==
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/MessageConverterRegistry.java
 (original)
+++ 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/MessageFormatRegistry.java
 Mon Dec 12 14:34:54 2016
@@ -22,38 +22,40 @@
 package org.apache.qpid.server.protocol;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
 import org.apache.qpid.server.message.ServerMessage;
-import org.apache.qpid.server.plugin.MessageConverter;
+import org.apache.qpid.server.plugin.MessageFormat;
 imp

svn commit: r1773584 [1/4] - in /qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0: ./ codec/ framing/ messaging/ type/ type/codec/ type/messaging/cod

[rgodfrey]

Author: rgodfrey
Date: Sun Dec 11 16:01:06 2016
New Revision: 1773584

URL: http://svn.apache.org/viewvc?rev=1773584=rev
Log:
QPID-7586 : Improve AMQP 1.0 codec

Removed:

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ArrayWriter.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/WrapperTypeValueWriter.java
Modified:

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_from_1_0.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/AbstractDescribedTypeWriter.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/AbstractListWriter.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/AbstractMapWriter.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/BinaryWriter.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/BooleanWriter.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ByteArrayWriter.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ByteWriter.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/CharWriter.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/CompoundWriter.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DelegatingValueWriter.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DoubleWriter.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedEightWriter.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedFourWriter.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedOneWriter.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedSixteenWriter.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedTwoWriter.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FloatWriter.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FrameWriter.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/IntegerWriter.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ListWriter.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/LongWriter.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/MapWriter.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/NullWriter.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/RestrictedTypeValueWriter.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ShortWriter.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SimpleVariableWidthWriter.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/StringWriter.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SymbolArrayWriter.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SymbolWriter.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/TimestampWriter.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UUIDWriter.java

qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid

svn commit: r1773584 [4/4] - in /qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0: ./ codec/ framing/ messaging/ type/ type/codec/ type/messaging/cod

[rgodfrey]

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/CoordinatorWriter.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/CoordinatorWriter.java?rev=1773584=1773583=1773584=diff
==
--- 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/CoordinatorWriter.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/CoordinatorWriter.java
 Sun Dec 11 16:01:06 2016
@@ -25,6 +25,7 @@ package org.apache.qpid.server.protocol.
 
 import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeWriter;
 import org.apache.qpid.server.protocol.v1_0.codec.AbstractListWriter;
+import org.apache.qpid.server.protocol.v1_0.codec.UnsignedLongWriter;
 import org.apache.qpid.server.protocol.v1_0.codec.ValueWriter;
 
 import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong;
@@ -32,69 +33,38 @@ import org.apache.qpid.server.protocol.v
 
 public class CoordinatorWriter extends AbstractDescribedTypeWriter
 {
-private Coordinator _value;
-private int _count = -1;
-
-public CoordinatorWriter(final Registry registry)
-{
-super(registry);
-}
-
-@Override
-protected void onSetValue(final Coordinator value)
-{
-_value = value;
-_count = calculateCount();
-}
-
-private int calculateCount()
-{
-
-
-if( _value.getCapabilities() != null)
-{
-return 1;
-}
-
-return 0;
-}
-
-@Override
-protected void clear()
-{
-_value = null;
-_count = -1;
-}
+private static final ValueWriter DESCRIPTOR_WRITER = 
UnsignedLongWriter.getWriter((byte) 0x30);
 
 
-protected Object getDescriptor()
+private CoordinatorWriter(final Registry registry, final Coordinator 
object)
 {
-return UnsignedLong.valueOf(0x0030L);
+super(DESCRIPTOR_WRITER, new Writer(registry, object));
 }
 
-@Override
-protected ValueWriter createDescribedWriter()
+private static class Writer extends AbstractListWriter
 {
-final Writer writer = new Writer(getRegistry());
-writer.setValue(_value);
-return writer;
-}
+private final Coordinator _value;
+private final int _count;
 
-private class Writer extends AbstractListWriter
-{
 private int _field;
 
-public Writer(final Registry registry)
+public Writer(final Registry registry, final Coordinator object)
 {
 super(registry);
+
+_value = object;
+_count = calculateCount();
 }
 
-@Override
-protected void onSetValue(final Coordinator value)
+private int calculateCount()
 {
-reset();
-}
+if( _value.getCapabilities() != null)
+{
+return 1;
+}
 
+return 0;
+}
 @Override
 protected int getCount()
 {
@@ -122,11 +92,6 @@ public class CoordinatorWriter extends A
 }
 
 @Override
-protected void clear()
-{
-}
-
-@Override
 protected void reset()
 {
 _field = 0;
@@ -136,9 +101,10 @@ public class CoordinatorWriter extends A
 private static Factory FACTORY = new Factory()
 {
 
-public ValueWriter newInstance(Registry registry)
+@Override
+public ValueWriter newInstance(final Registry registry, 
final Coordinator object)
 {
-return new CoordinatorWriter(registry);
+return new CoordinatorWriter(registry, object);
 }
 };
 

Modified: 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DeclareWriter.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DeclareWriter.java?rev=1773584=1773583=1773584=diff
==
--- 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DeclareWriter.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DeclareWriter.java
 Sun Dec 11 16:01:06 2016
@@ -25,6 +25,7 @@ package org.apache.qpid.server.protocol.
 
 import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeWriter;
 import org.apache.qpid.server.protocol.v1_0.codec.AbstractListWriter;
+import