[activemq] 01/02: Merge tag 'upstream/5.14.2+dfsg'
Markus Koschany
apo at moszumanska.debian.org
Fri Dec 9 23:21:28 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 20aa39221769dd64dac843069c3b5e246cced849
Merge: 8a7626b 5139392
Author: Markus Koschany <apo at debian.org>
Date: Fri Dec 9 23:53:08 2016 +0100
Merge tag 'upstream/5.14.2+dfsg'
Upstream version 5.14.2+dfsg
# gpg: Signatur vom Fr 09 Dez 2016 23:53:07 CET
# gpg: mittels RSA-Schlüssel ACF3D088EF32EDEF6A1A835FD9AD14B9513B51E4
# 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]
activemq-all/pom.xml | 2 +-
activemq-amqp/pom.xml | 2 +-
.../activemq/transport/amqp/AmqpSupport.java | 28 +-
.../amqp/message/AMQPNativeInboundTransformer.java | 12 +-
.../message/AMQPNativeOutboundTransformer.java | 102 ++---
.../amqp/message/AMQPRawInboundTransformer.java | 32 +-
.../transport/amqp/message/ActiveMQJMSVendor.java | 398 ----------------
.../transport/amqp/message/AmqpMessageSupport.java | 189 +++++++-
.../transport/amqp/message/AmqpWritableBuffer.java | 164 +++++++
.../amqp/message/AutoOutboundTransformer.java | 26 +-
.../transport/amqp/message/InboundTransformer.java | 164 +++----
.../amqp/message/JMSMappingInboundTransformer.java | 117 +++--
.../message/JMSMappingOutboundTransformer.java | 504 ++++++++++++---------
.../amqp/message/OutboundTransformer.java | 50 +-
.../amqp/protocol/AmqpAbstractReceiver.java | 5 +-
.../transport/amqp/protocol/AmqpConnection.java | 2 +-
.../activemq/transport/amqp/protocol/AmqpLink.java | 11 +-
.../transport/amqp/protocol/AmqpReceiver.java | 104 ++---
.../transport/amqp/protocol/AmqpSender.java | 85 ++--
.../transport/amqp/protocol/AmqpSession.java | 37 +-
.../amqp/protocol/AmqpTransactionCoordinator.java | 10 +-
.../transport/amqp/AmqpTransformerTest.java | 6 -
.../activemq/transport/amqp/JMSClientTest.java | 77 +++-
.../transport/amqp/JMSInteroperabilityTest.java | 127 +++++-
.../amqp/client/AmqpAbstractResource.java | 1 -
.../amqp/client/AmqpClientTestSupport.java | 24 +-
.../transport/amqp/client/AmqpConnection.java | 39 +-
.../transport/amqp/client/AmqpFrameValidator.java | 102 +++++
.../transport/amqp/client/AmqpMessage.java | 46 +-
.../transport/amqp/client/AmqpProtocolTracer.java | 116 +++++
.../transport/amqp/client/AmqpReceiver.java | 49 +-
.../activemq/transport/amqp/client/AmqpSender.java | 12 +-
.../transport/amqp/client/AmqpSession.java | 62 ++-
.../transport/amqp/client/AmqpValidator.java | 46 +-
.../amqp/interop/AmqpAnonymousSenderTest.java | 2 +-
.../interop/AmqpBrokerReuqestedHearbeatsTest.java | 8 +-
.../interop/AmqpClientRequestsHeartbeatsTest.java | 4 +-
.../interop/AmqpConfiguredMaxConnectionsTest.java | 2 +-
.../amqp/interop/AmqpConnectionsTest.java | 14 +-
.../interop/AmqpCorrelationIdPreservationTest.java | 4 +-
.../interop/AmqpCorruptedFrameHandlingTest.java | 6 +-
.../amqp/interop/AmqpDeliveryAnnotationsTest.java | 2 +-
.../amqp/interop/AmqpDescribedTypePayloadTest.java | 6 +-
.../interop/AmqpDisabledInactivityMonitorTest.java | 4 +-
.../amqp/interop/AmqpDurableReceiverTest.java | 166 ++++++-
.../amqp/interop/AmqpFlowControlTest.java | 111 +++++
.../amqp/interop/AmqpMaxFrameSizeTest.java | 2 +-
.../interop/AmqpMessageIdPreservationTest.java | 4 +-
.../amqp/interop/AmqpReceiverDrainTest.java | 156 +++++--
.../transport/amqp/interop/AmqpReceiverTest.java | 171 ++++++-
.../transport/amqp/interop/AmqpSaslPlainTest.java | 2 +-
.../amqp/interop/AmqpScheduledMessageTest.java | 40 +-
.../amqp/interop/AmqpSendReceiveTest.java | 158 ++++++-
.../transport/amqp/interop/AmqpSenderTest.java | 36 +-
.../transport/amqp/interop/AmqpSessionTest.java | 48 +-
.../amqp/interop/AmqpSlowReceiverTest.java | 4 +-
.../interop/AmqpSocketProxyIdleTimeoutTests.java | 4 +-
.../amqp/interop/AmqpTempDestinationTest.java | 42 +-
.../amqp/interop/AmqpTransactionTest.java | 210 +++++++--
.../message/JMSMappingInboundTransformerTest.java | 127 +++---
.../message/JMSMappingOutboundTransformerTest.java | 428 ++++++++++-------
.../JMSTransformationSpeedComparisonTest.java | 191 +++++---
.../amqp/message/MessageTransformationTest.java | 296 ++++++++++++
.../amqp/profile/JmsSendReceiveStressTest.java | 187 ++++++++
activemq-blueprint/pom.xml | 2 +-
activemq-broker/pom.xml | 4 +-
.../apache/activemq/advisory/AdvisoryBroker.java | 4 +
.../activemq/broker/TransportConnection.java | 30 +-
.../org/apache/activemq/broker/region/Queue.java | 10 +-
.../org/apache/activemq/broker/region/Topic.java | 11 +-
.../activemq/broker/region/TopicSubscription.java | 98 ++--
.../scheduler/memory/InMemoryJobScheduler.java | 17 +-
.../network/DemandForwardingBridgeSupport.java | 109 ++---
.../activemq/network/DurableConduitBridge.java | 41 +-
.../apache/activemq/plugin/StatisticsBroker.java | 2 +-
.../transport/auto/AutoSslTransportFactory.java | 11 +-
.../transport/auto/AutoSslTransportServer.java | 5 +-
.../transport/auto/AutoTcpTransportFactory.java | 12 +-
.../transport/auto/AutoTcpTransportServer.java | 19 +-
.../auto/nio/AutoNIOSSLTransportServer.java | 2 +-
.../auto/nio/AutoNioTransportFactory.java | 7 +-
.../apache/activemq/util/NetworkBridgeUtils.java | 184 ++++++++
activemq-camel/pom.xml | 2 +-
activemq-cf/pom.xml | 2 +-
activemq-client/pom.xml | 4 +-
.../activemq/ActiveMQXASslConnectionFactory.java | 100 ++++
.../activemq/command/ActiveMQMapMessage.java | 4 +-
.../activemq/command/ActiveMQObjectMessage.java | 4 +-
.../activemq/command/ActiveMQTextMessage.java | 4 +-
.../java/org/apache/activemq/command/Message.java | 14 +-
.../jndi/ActiveMQInitialContextFactory.java | 2 +-
.../jndi/ActiveMQSslInitialContextFactory.java | 41 ++
.../transport/AbstractInactivityMonitor.java | 6 +
.../transport/failover/FailoverTransport.java | 6 +-
.../activemq/ActiveMQSslConnectionFactoryTest.java | 8 +-
.../ActiveMQXASslConnectionFactoryTest.java | 30 +-
activemq-console/pom.xml | 2 +-
activemq-http/pom.xml | 2 +-
.../transport/http/HttpTransportServer.java | 26 +-
.../activemq/transport/ws/WSTransportProxy.java | 16 +-
.../activemq/transport/ws/jetty9/MQTTSocket.java | 12 +-
.../activemq/transport/ws/jetty9/StompSocket.java | 12 +-
.../activemq/transport/ws/jetty9/WSServlet.java | 2 +-
.../transport/ws/WSTransportHttpTraceTest.java | 8 +-
.../transport/ws/WSTransportLinkStealingTest.java | 2 +-
.../activemq/transport/ws/WSTransportTest.java | 41 +-
.../activemq/transport/wss/WSSTransportTest.java | 17 +-
activemq-itests-spring31/pom.xml | 2 +-
activemq-jaas/pom.xml | 2 +-
activemq-jdbc-store/pom.xml | 2 +-
activemq-jms-pool/pom.xml | 2 +-
activemq-kahadb-store/pom.xml | 2 +-
.../apache/activemq/store/kahadb/KahaDBStore.java | 17 +-
.../activemq/store/kahadb/MessageDatabase.java | 8 +-
.../store/kahadb/disk/journal/Journal.java | 4 +-
.../store/kahadb/scheduler/JobSchedulerImpl.java | 30 +-
activemq-karaf-itest/pom.xml | 2 +-
.../karaf/itest/ActiveMQAMQPBrokerFeatureTest.java | 29 +-
activemq-karaf/pom.xml | 2 +-
activemq-karaf/src/main/resources/features.xml | 14 +-
activemq-leveldb-store/pom.xml | 2 +-
activemq-log4j-appender/pom.xml | 2 +-
activemq-mqtt/pom.xml | 2 +-
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 +-
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 | 4 +-
.../activemq/ActiveMQSslConnectionFactoryTest.java | 18 +-
.../activemq/ActiveMQXAConnectionFactoryTest.java | 55 ++-
.../ActiveMQXASslConnectionFactoryTest.java | 31 +-
.../ActiveMQXASslConnectionFactoryVmTest.java | 33 +-
.../java/org/apache/activemq/bugs/AMQ2103Test.java | 15 +-
.../java/org/apache/activemq/bugs/AMQ6522Test.java | 117 +++++
.../jndi/ActiveMQSslInitialContextFactoryTest.java | 109 +++++
.../org/apache/activemq/jndi/JNDITestSupport.java | 5 +-
.../activemq/jndi/XASslConnectionFactoryTest.java | 45 ++
.../network/DurableSyncNetworkBridgeTest.java | 138 +++++-
.../apache/activemq/network/SimpleNetworkTest.java | 89 ++++
.../plugin/BrokerStatisticsPluginTest.java | 2 +
...Test.java => AutoTransportConnectionsTest.java} | 79 +++-
.../org/apache/activemq/usecases/AMQ6477Test.java | 196 ++++++++
.../TopicSubscriptionZeroPrefetchTest.java | 174 ++++++-
activemq-web-console/pom.xml | 2 +-
.../src/main/webapp/queueConsumers.jsp | 2 +-
.../src/main/webapp/queueProducers.jsp | 2 +-
.../src/main/webapp/subscribers.jsp | 6 +-
.../src/main/webapp/topicProducers.jsp | 2 +-
.../src/main/webapp/topicSubscribers.jsp | 2 +-
activemq-web-demo/pom.xml | 2 +-
activemq-web/pom.xml | 2 +-
assembly/pom.xml | 2 +-
pom.xml | 40 +-
167 files changed, 5384 insertions(+), 2066 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