[activemq] 01/04: Merge tag 'upstream/5.13.4+dfsg'
Markus Koschany
apo at moszumanska.debian.org
Sun Jul 24 05:12:48 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository activemq.
commit 76b5d1108617712fa09f33ab5a36dd136d109c38
Merge: df6d1e9 1f90684
Author: Markus Koschany <apo at debian.org>
Date: Sun Jul 24 01:45:36 2016 +0200
Merge tag 'upstream/5.13.4+dfsg'
Upstream version 5.13.4+dfsg
# gpg: Signature made Sun 24 Jul 2016 01:45:24 CEST using RSA key ID 513B51E4
# gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
# gpg: aka "Markus Koschany <markus at koschany.net>" [ultimate]
# gpg: aka "Markus Koschany <apo at debian.org>" [ultimate]
activemq-all/pom.xml | 2 +-
activemq-amqp/pom.xml | 7 +-
.../activemq/transport/amqp/AmqpWireFormat.java | 21 +-
.../transport/amqp/AmqpWireFormatFactory.java | 10 +
.../amqp/message/AMQPMessageIdHelper.java | 1 -
.../transport/amqp/message/ActiveMQJMSVendor.java | 2 +-
.../transport/amqp/message/InboundTransformer.java | 2 +-
.../message/JMSMappingOutboundTransformer.java | 9 +-
.../transport/amqp/protocol/AmqpAbstractLink.java | 4 +-
.../transport/amqp/protocol/AmqpConnection.java | 4 +-
.../transport/amqp/protocol/AmqpSender.java | 95 +++--
.../transport/amqp/sasl/AmqpAuthenticator.java | 2 +-
.../activemq/transport/amqp/JMSClientContext.java | 2 +-
.../transport/amqp/JMSClientTestSupport.java | 40 +++
.../transport/amqp/JMSClientTransactionTest.java | 102 +++++-
.../transport/amqp/JMSQueueBrowserTest.java | 326 +++++++++++++++++
.../amqp/JmsTransactedMessageOrderTest.java | 137 +++++++
.../amqp/client/AmqpAbstractResource.java | 13 +
.../transport/amqp/client/AmqpConnection.java | 32 +-
.../transport/amqp/client/AmqpMessage.java | 54 ++-
.../transport/amqp/client/AmqpReceiver.java | 277 ++++++++++++++-
.../transport/amqp/client/AmqpResource.java | 12 +
.../activemq/transport/amqp/client/AmqpSender.java | 4 +-
.../transport/amqp/client/AmqpSession.java | 38 +-
.../amqp/client/AmqpTransactionContext.java | 6 +-
.../amqp/client/util/NoOpAsyncResult.java | 40 +++
.../amqp/interop/AmqpConnectionsTest.java | 29 ++
.../interop/AmqpCorrelationIdPreservationTest.java | 196 ++++++++++
.../amqp/interop/AmqpReceiverDrainTest.java | 154 ++++++++
.../transport/amqp/interop/AmqpReceiverTest.java | 60 ++--
.../amqp/interop/AmqpSendReceiveTest.java | 101 +++++-
.../amqp/protocol/AmqpWireFormatTest.java | 19 +-
.../amqp/protocol/UnsupportedClientTest.java | 55 +++
activemq-amqp/src/test/resources/log4j.properties | 12 +-
activemq-blueprint/pom.xml | 2 +-
activemq-broker/pom.xml | 2 +-
.../activemq/broker/TransportConnection.java | 9 +-
.../broker/region/AbstractSubscription.java | 5 +-
.../broker/region/PrefetchSubscription.java | 18 +-
.../org/apache/activemq/broker/region/Queue.java | 4 +-
.../region/cursors/FilePendingMessageCursor.java | 2 +-
.../region/virtual/CompositeDestination.java | 1 -
.../region/virtual/CompositeDestinationFilter.java | 2 +
.../region/virtual/VirtualTopicInterceptor.java | 13 +-
.../network/jms/SimpleJmsQueueConnector.java | 182 +++++-----
.../network/jms/SimpleJmsTopicConnector.java | 182 +++++-----
.../activemq/security/DefaultAuthorizationMap.java | 4 +-
activemq-camel/pom.xml | 2 +-
activemq-client/pom.xml | 2 +-
activemq-client/src/main/grammar/SelectorParser.jj | 386 ++++++++++----------
.../apache/activemq/ActiveMQMessageConsumer.java | 58 +--
.../activemq/transport/tcp/TcpTransportServer.java | 194 ++++++----
activemq-console/pom.xml | 2 +-
activemq-fileserver/pom.xml | 2 +-
activemq-http/pom.xml | 2 +-
.../activemq/transport/ws/AbstractMQTTSocket.java | 12 +-
.../activemq/transport/ws/jetty9/MQTTSocket.java | 26 +-
.../activemq/transport/ws/MQTTWSConnection.java | 8 +-
.../transport/ws/MQTTWSTransportWillTest.java | 251 +++++++++++++
.../transport/ws/WSTransportTestSupport.java | 5 +-
activemq-itests-spring31/pom.xml | 2 +-
activemq-jaas/pom.xml | 2 +-
activemq-jdbc-store/pom.xml | 2 +-
activemq-jms-pool/pom.xml | 9 +-
.../apache/activemq/jms/pool/ConnectionPool.java | 3 +
.../activemq/jms/pool/PooledConnectionFactory.java | 1 +
.../jms/pool/PooledConnectionFactoryTest.java | 27 ++
.../PooledConnectionSecurityExceptionTest.java | 393 +++++++++++++++++++++
activemq-kahadb-store/pom.xml | 2 +-
.../activemq/store/kahadb/MessageDatabase.java | 69 ++--
.../activemq/store/kahadb/disk/index/ListNode.java | 4 +-
.../store/kahadb/MessageDatabaseSizeTest.java | 147 ++++++++
activemq-karaf-itest/pom.xml | 2 +-
.../ActiveMQBrokerNdExternalCamelFeatureTest.java | 2 +-
.../activemq/karaf/itest/ObrFeatureTest.java | 55 +++
activemq-karaf/pom.xml | 2 +-
.../src/main/resources/features-core.xml | 1 -
activemq-leveldb-store/pom.xml | 2 +-
activemq-log4j-appender/pom.xml | 2 +-
activemq-mqtt/pom.xml | 10 +-
.../transport/mqtt/MQTTProtocolConverter.java | 19 +-
.../activemq/transport/mqtt/MQTTPingReqTest.java | 182 ++++++++++
.../transport/mqtt/MQTTProtocolConverterTest.java | 79 +++++
activemq-openwire-generator/pom.xml | 2 +-
activemq-openwire-legacy/pom.xml | 2 +-
activemq-osgi/pom.xml | 16 +-
.../activemq/osgi/ActiveMQServiceFactory.java | 53 ++-
activemq-partition/pom.xml | 2 +-
activemq-pool/pom.xml | 2 +-
activemq-ra/pom.xml | 2 +-
activemq-rar/pom.xml | 2 +-
activemq-run/pom.xml | 2 +-
activemq-runtime-config/pom.xml | 2 +-
activemq-shiro/pom.xml | 2 +-
activemq-spring/pom.xml | 2 +-
.../src/main/resources/META-INF/spring.schemas | 1 +
activemq-stomp/pom.xml | 2 +-
activemq-tooling/activemq-junit/pom.xml | 2 +-
.../apache/activemq/junit/ActiveMQTestRunner.java | 116 ++++++
.../java/org/apache/activemq/junit/Repeat.java | 34 ++
.../java/org/apache/activemq/junit/RepeatRule.java | 38 ++
.../org/apache/activemq/junit/RepeatStatement.java | 147 ++++++++
activemq-tooling/activemq-maven-plugin/pom.xml | 2 +-
.../activemq-memtest-maven-plugin/pom.xml | 2 +-
.../activemq-perf-maven-plugin/pom.xml | 2 +-
activemq-tooling/pom.xml | 2 +-
activemq-unit-tests/pom.xml | 2 +-
.../broker/virtual/CompositeQueueTest.java | 20 ++
...ualTopicInterceptorWithLeadingWildcardTest.java | 114 ++++++
.../MessageDestinationVirtualTopicTest.java | 120 +++++++
.../MultipleCompositeToPhysicalQueueTest.java | 13 +-
.../broker/virtual/SimpleMessageListener.java | 79 +++++
.../broker/virtual/VirtualTopicDLQTest.java | 2 +-
.../java/org/apache/activemq/bugs/AMQ5426Test.java | 227 ++++++++++++
.../java/org/apache/activemq/bugs/AMQ6194Test.java | 123 +++++++
.../org/apache/activemq/selector/SelectorTest.java | 6 +-
.../org/apache/activemq/spring/ConsumerBean.java | 4 +
.../activemq/store/kahadb/plist/PListTest.java | 6 +
.../broker/virtual/virtual-topic-network-test.xml | 117 ++++++
activemq-web-console/pom.xml | 2 +-
activemq-web-demo/pom.xml | 2 +-
activemq-web/pom.xml | 2 +-
assembly/pom.xml | 2 +-
pom.xml | 6 +-
124 files changed, 4848 insertions(+), 697 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/activemq.git
More information about the pkg-java-commits
mailing list