[activemq] 02/05: Merge tag 'upstream/5.14.1+dfsg'

Markus Koschany apo at moszumanska.debian.org
Thu Oct 6 21:04:12 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 c815b0d467e7d33d40fb492787402db6733b2434
Merge: ad459f1 9dc4386
Author: Markus Koschany <apo at debian.org>
Date:   Thu Oct 6 21:55:21 2016 +0200

    Merge tag 'upstream/5.14.1+dfsg'
    
    Upstream version 5.14.1+dfsg
    
    # gpg: Signatur vom Do 06 Okt 2016 21:55:19 CEST
    # gpg:                mittels RSA-Schlüssel D9AD14B9513B51E4
    # gpg: Korrekte Signatur von "Markus Koschany <apo at gambaru.de>" [ultimativ]
    # gpg:                     alias "Markus Koschany <markus at koschany.net>" [ultimativ]
    # gpg:                     alias "Markus Koschany <apo at debian.org>" [ultimativ]

 NOTICE                                             |   2 +-
 README.txt => README.md                            |  14 +-
 activemq-all/pom.xml                               |   2 +-
 activemq-amqp/pom.xml                              |   2 +-
 .../transport/amqp/AmqpNioSslTransport.java        |   5 +-
 .../activemq/transport/amqp/AmqpSupport.java       |   1 +
 .../transport/amqp/AmqpTransportFilter.java        |  15 +-
 .../transport/amqp/message/ActiveMQJMSVendor.java  |   3 +
 .../transport/amqp/protocol/AmqpConnection.java    |  16 +-
 .../transport/amqp/protocol/AmqpSender.java        |  85 +--
 .../activemq/transport/amqp/AmqpTestSupport.java   |  16 +
 .../transport/amqp/JMSClientTransactionTest.java   |   6 -
 .../amqp/auto/JMSClientAutoSslAuthTest.java        | 113 ++++
 .../activemq/transport/amqp/client/AmqpClient.java |  22 +-
 .../transport/amqp/client/AmqpConnection.java      |  40 +-
 .../transport/amqp/client/AmqpMessage.java         |  71 ++-
 .../transport/amqp/client/AmqpReceiver.java        |  66 ++-
 .../activemq/transport/amqp/client/AmqpSender.java |  29 +-
 .../transport/amqp/client/AmqpSession.java         |  19 +-
 .../amqp/interop/AmqpAnonymousSenderTest.java      |  73 +++
 .../amqp/interop/AmqpConnectionsTest.java          |   5 +
 .../transport/amqp/interop/AmqpReceiverTest.java   |  41 ++
 .../amqp/interop/AmqpSendReceiveTest.java          | 342 +++++++++++-
 .../amqp/interop/AmqpTransactionTest.java          | 594 +++++++++++++++++++++
 .../message/JMSMappingOutboundTransformerTest.java |  37 ++
 activemq-amqp/src/test/resources/log4j.properties  |   5 +-
 activemq-blueprint/pom.xml                         |   2 +-
 activemq-broker/pom.xml                            |   2 +-
 .../activemq/broker/region/AbstractRegion.java     |   2 +-
 .../broker/region/AbstractSubscription.java        |  12 +
 .../broker/region/PrefetchSubscription.java        |  10 +-
 .../org/apache/activemq/broker/region/Queue.java   |  16 +-
 .../activemq/broker/region/QueueSubscription.java  |   2 +-
 .../activemq/broker/region/RegionBroker.java       |   2 +-
 .../org/apache/activemq/broker/region/Topic.java   |  11 +-
 .../apache/activemq/broker/region/TopicRegion.java |  21 +-
 .../activemq/broker/region/TopicSubscription.java  |  21 +-
 .../broker/region/cursors/AbstractStoreCursor.java |  18 +-
 .../network/DemandForwardingBridgeSupport.java     |  12 +-
 .../activemq/network/DurableConduitBridge.java     |  25 +
 .../activemq/store/NoLocalSubscriptionAware.java   |  22 +
 .../activemq/store/memory/MemoryMessageStore.java  |  53 +-
 .../store/memory/MemoryPersistenceAdapter.java     |  32 +-
 .../store/memory/MemoryTopicMessageStore.java      |  63 ++-
 .../activemq/store/memory/MemoryTopicSub.java      |  37 +-
 .../store/memory/MemoryTransactionStore.java       |  36 +-
 .../transport/auto/AutoSslTransportFactory.java    |  25 +-
 .../transport/auto/AutoSslTransportServer.java     |  24 +-
 .../transport/auto/AutoTcpTransportFactory.java    |  18 +-
 .../transport/auto/AutoTcpTransportServer.java     |  13 +-
 .../auto/nio/AutoNIOSSLTransportServer.java        |  14 +-
 .../auto/nio/AutoNioTransportFactory.java          |   2 -
 .../transport/nio/AutoInitNioSSLTransport.java     |   2 +-
 .../apache/activemq/store/PListTestSupport.java    |  12 +-
 activemq-camel/pom.xml                             |   2 +-
 .../camel/component/ActiveMQComponent.java         |  10 +
 .../OriginalDestinationPropagateStrategy.java      |   2 +-
 activemq-cf/pom.xml                                |   2 +-
 activemq-client/pom.xml                            |   2 +-
 .../apache/activemq/thread/PooledTaskRunner.java   |  21 +-
 .../activemq/transport/TransportFactory.java       |   4 -
 .../activemq/transport/nio/NIOSSLTransport.java    |  29 +-
 .../transport/tcp/SslTransportFactory.java         |  10 +
 .../java/org/apache/activemq/util/BitArrayBin.java |   2 +-
 .../activemq/util/TypeConversionSupport.java       |  22 +-
 .../org/apache/activemq/util/BitArrayBinTest.java  |  10 +
 activemq-console/pom.xml                           |   2 +-
 activemq-http/pom.xml                              |   2 +-
 .../transport/http/HttpClientTransport.java        |   6 +-
 activemq-itests-spring31/pom.xml                   |   2 +-
 activemq-jaas/pom.xml                              |   2 +-
 activemq-jdbc-store/pom.xml                        |   2 +-
 .../activemq/store/jdbc/JDBCMessageStore.java      |  37 +-
 activemq-jms-pool/pom.xml                          |   2 +-
 activemq-kahadb-store/pom.xml                      |   2 +-
 .../store/kahadb/KahaDBPersistenceAdapter.java     |  13 +-
 .../apache/activemq/store/kahadb/KahaDBStore.java  |  18 +-
 .../kahadb/MultiKahaDBPersistenceAdapter.java      |  14 +-
 .../store/kahadb/plist/PListStoreImpl.java         |  48 +-
 .../activemq/store/kahadb/plist/PListImplTest.java |  69 +++
 activemq-karaf-itest/pom.xml                       |   2 +-
 activemq-karaf/pom.xml                             |   2 +-
 .../org.apache.activemq.server-default.cfg         |   2 +-
 activemq-leveldb-store/pom.xml                     |   2 +-
 activemq-log4j-appender/pom.xml                    |   2 +-
 activemq-mqtt/pom.xml                              |   2 +-
 .../transport/mqtt/MQTTNIOSSLTransport.java        |   1 +
 .../transport/mqtt/auto/MQTTAutoSslAuthTest.java   | 102 ++++
 activemq-openwire-generator/pom.xml                |   2 +-
 activemq-openwire-legacy/pom.xml                   |   2 +-
 activemq-osgi/pom.xml                              |   2 +-
 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 +-
 .../transport/stomp/StompNIOSSLTransport.java      |   2 +-
 .../transport/stomp/StompSslTransportFactory.java  |  25 +
 .../transport/stomp/auto/StompAutoSslAuthTest.java | 140 +++++
 activemq-tooling/activemq-junit/pom.xml            |   2 +-
 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 +-
 .../cursors/MemoryPendingMessageCursorTest.java    |   2 +-
 .../java/org/apache/activemq/bugs/AMQ5212Test.java | 110 ++++
 .../java/org/apache/activemq/bugs/AMQ6387Test.java | 268 ++++++++++
 .../network/DurableSyncNetworkBridgeTest.java      | 149 +++++-
 .../network/DynamicNetworkTestSupport.java         |  12 +
 .../openwire/OpenWireConnectionTimeoutTest.java    |  31 +-
 .../JDBCPersistenceAdapterExpiredMessageTest.java  | 157 ++++++
 .../activemq/transport/auto/AutoSslAuthTest.java   | 142 +++++
 .../auto/AutoWireFormatConfigurationTest.java      | 123 +++++
 .../failover/FailoverTransactionTest.java          |  44 +-
 .../usecases/DurableSubscriptionOffline3Test.java  |   2 +-
 .../DurableSubscriptionWithNoLocalTest.java        | 138 ++++-
 .../activemq/usecases/NetworkAsyncStartTest.java   |  92 +++-
 .../TopicSubscriptionZeroPrefetchTest.java         |  19 +
 .../TwoBrokerQueueClientsReconnectTest.java        | 206 ++++++-
 activemq-web-console/pom.xml                       |   2 +-
 activemq-web-demo/pom.xml                          |   2 +-
 activemq-web/pom.xml                               |   2 +-
 assembly/pom.xml                                   |   2 +-
 pom.xml                                            |  12 +-
 130 files changed, 3902 insertions(+), 400 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