[activemq] 06/13: Merge tag 'upstream/5.13.3+dfsg'
Markus Koschany
apo at moszumanska.debian.org
Sun Jun 26 14:51:56 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 93ea954028c258ea14956f7956167473bf0e8c0c
Merge: 308dc8a 336714a
Author: Markus Koschany <apo at debian.org>
Date: Sun Jun 26 15:44:58 2016 +0200
Merge tag 'upstream/5.13.3+dfsg'
Upstream version 5.13.3+dfsg
# gpg: Signature made Sun 26 Jun 2016 15:44:43 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 | 3 +-
activemq-amqp/pom.xml | 2 +-
.../amqp/message/AMQPMessageIdHelper.java | 255 +++++++++++++
.../transport/amqp/message/InboundTransformer.java | 8 +-
.../message/JMSMappingOutboundTransformer.java | 7 +-
.../transport/amqp/client/AmqpMessage.java | 26 ++
.../interop/AmqpMessageIdPreservationTest.java | 166 +++++++++
.../amqp/message/AMQPMessageIdHelperTest.java | 406 +++++++++++++++++++++
activemq-blueprint/pom.xml | 2 +-
activemq-broker/pom.xml | 2 +-
.../apache/activemq/advisory/AdvisoryBroker.java | 64 ++--
.../org/apache/activemq/broker/jmx/HealthView.java | 25 +-
.../activemq/broker/jmx/HealthViewMBean.java | 13 +
.../activemq/broker/jmx/NetworkConnectorView.java | 38 ++
.../broker/jmx/NetworkConnectorViewMBean.java | 9 +
.../activemq/broker/region/BaseDestination.java | 2 +-
.../org/apache/activemq/broker/region/Queue.java | 91 +++--
.../region/cursors/QueueDispatchPendingList.java | 86 +++--
.../broker/region/virtual/FilteredDestination.java | 35 +-
.../network/DemandForwardingBridgeSupport.java | 18 +-
.../network/NetworkBridgeConfiguration.java | 40 ++
activemq-camel/pom.xml | 2 +-
activemq-client/pom.xml | 2 +-
.../apache/activemq/ActiveMQMessageConsumer.java | 4 +-
.../activemq/command/ActiveMQBytesMessage.java | 29 +-
.../java/org/apache/activemq/command/Message.java | 11 +-
.../apache/activemq/thread/TaskRunnerFactory.java | 4 +-
.../transport/failover/FailoverTransport.java | 224 +++++-------
.../activemq/transport/nio/SelectorManager.java | 2 +-
.../org/apache/activemq/util/ThreadPoolUtils.java | 40 +-
activemq-console/pom.xml | 2 +-
activemq-fileserver/pom.xml | 2 +-
activemq-http/pom.xml | 2 +-
.../transport/http/HttpInactivityMonitor.java | 58 +++
.../transport/http/HttpTransportFactory.java | 9 +-
.../http/HttpTransportConnectTimeoutTest.java | 93 +++++
activemq-http/src/test/resources/log4j.properties | 1 +
activemq-itests-spring31/pom.xml | 2 +-
activemq-jaas/pom.xml | 2 +-
.../org/apache/activemq/jaas/PropertiesLoader.java | 2 +
.../apache/activemq/jaas/ReloadableProperties.java | 1 +
.../activemq/jaas/PropertiesLoginModuleTest.java | 119 ++++--
.../src/test/resources/groupsReload.properties | 22 +-
activemq-jaas/src/test/resources/login.config | 9 +
.../src/test/resources/usersReload.properties | 23 +-
activemq-jdbc-store/pom.xml | 2 +-
activemq-jms-pool/pom.xml | 2 +-
.../apache/activemq/jms/pool/ConnectionPool.java | 34 +-
.../apache/activemq/jms/pool/PooledConnection.java | 4 +-
.../activemq/jms/pool/PooledConnectionFactory.java | 19 +-
.../jms/pool/PooledConnectionFailoverTest.java | 117 ++++++
.../src/test/resources/log4j.properties | 6 +-
activemq-kahadb-store/pom.xml | 2 +-
.../store/kahadb/KahaDBPersistenceAdapter.java | 51 +++
.../apache/activemq/store/kahadb/KahaDBStore.java | 3 +-
.../activemq/store/kahadb/MessageDatabase.java | 364 ++++++++++++++----
.../store/kahadb/MultiKahaDBTransactionStore.java | 38 +-
.../org/apache/activemq/store/kahadb/Visitor.java | 4 +
.../store/kahadb/disk/journal/DataFile.java | 23 +-
.../kahadb/disk/journal/DataFileAccessor.java | 5 +-
.../kahadb/disk/journal/DataFileAppender.java | 32 +-
.../store/kahadb/disk/journal/FileAppender.java | 6 +-
.../store/kahadb/disk/journal/Journal.java | 128 +++++--
.../disk/journal/TargetedDataFileAppender.java | 297 +++++++++++++++
.../activemq/store/kahadb/disk/page/PageFile.java | 57 +--
.../kahadb/disk/util/DataByteArrayInputStream.java | 31 +-
.../disk/util/DataByteArrayOutputStream.java | 24 +-
.../src/main/proto/journal-data.proto | 12 +
.../disk/journal/TargetedDataFileAppenderTest.java | 116 ++++++
activemq-karaf-itest/pom.xml | 2 +-
activemq-karaf/pom.xml | 2 +-
activemq-leveldb-store/pom.xml | 2 +-
.../src/main/proto/records.proto | 3 +-
.../org/apache/activemq/leveldb/DBManager.scala | 10 +-
.../org/apache/activemq/leveldb/LevelDBStore.scala | 1 +
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 +-
.../transport/stomp/LegacyFrameTranslator.java | 7 +-
.../stomp/StompCompositeDestinationTest.java | 46 +++
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 | 6 +-
.../activemq/broker/jmx/HealthViewMBeanTest.java | 5 +
.../broker/jmx/SelectiveMBeanRegistrationTest.java | 34 +-
.../java/org/apache/activemq/bugs/AMQ3436Test.java | 1 +
.../java/org/apache/activemq/bugs/AMQ6244Test.java | 179 +++++++++
.../java/org/apache/activemq/bugs/AMQ6254Test.java | 348 ++++++++++++++++++
.../TransactedStoreUsageSuspendResumeTest.java | 5 +-
.../network/VirtualConsumerDemandTest.java | 55 ++-
.../store/AbstractVmConcurrentDispatchTest.java | 294 +++++++++++++++
.../kahadb/KahaDbVmConcurrentDispatchTest.java | 68 ++++
.../MultiKahaDbVmConcurrentDispatchTest.java | 81 ++++
.../leveldb/LevelDbVmConcurrentDispatchTest.java | 61 ++++
.../activemq/usecases/AdvisoryViaNetworkTest.java | 194 ++++++++++
.../usecases/PriorityRedeliveryOrderTest.java | 210 +++++++++++
.../QueueZeroPrefetchLazyDispatchPriorityTest.java | 393 ++++++++++++++++++++
activemq-web-console/pom.xml | 2 +-
activemq-web-demo/pom.xml | 2 +-
activemq-web/pom.xml | 2 +-
assembly/pom.xml | 2 +-
assembly/src/release/bin/activemq-admin.bat | 2 +-
assembly/src/release/bin/activemq.bat | 2 +-
pom.xml | 16 +-
119 files changed, 4741 insertions(+), 673 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