[activemq] 01/04: Merge tag 'upstream/5.14.5'
Markus Koschany
apo at moszumanska.debian.org
Sat May 20 21:55:38 UTC 2017
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository activemq.
commit 19294ef10c15815717d5526f25f70063a0eb806a
Merge: 5d92dd2 93db1e0
Author: Markus Koschany <apo at debian.org>
Date: Sat May 20 23:20:09 2017 +0200
Merge tag 'upstream/5.14.5'
Upstream version 5.14.5
# gpg: Signatur vom Sa 20 Mai 2017 23:20:08 CEST
# 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]
NOTICE | 14 +-
activemq-all/pom.xml | 2 +-
activemq-amqp/pom.xml | 2 +-
.../activemq/transport/amqp/AmqpWireFormat.java | 8 +
.../activemq/transport/amqp/AmqpTestSupport.java | 16 +-
.../transport/amqp/client/AmqpConnection.java | 20 +-
.../transport/amqp/client/AmqpMessage.java | 78 +++++-
.../amqp/interop/AmqpExpiredMessageTest.java | 269 ++++++++++++++++++
activemq-blueprint/pom.xml | 2 +-
activemq-broker/pom.xml | 2 +-
.../org/apache/activemq/broker/BrokerService.java | 73 +++--
.../activemq/broker/TransportConnection.java | 47 ++--
.../activemq/broker/region/AbstractRegion.java | 10 +-
.../activemq/broker/region/BaseDestination.java | 14 +-
.../org/apache/activemq/broker/region/Queue.java | 56 ++--
.../org/apache/activemq/broker/region/Topic.java | 47 ++--
.../activemq/broker/region/TopicSubscription.java | 1 -
activemq-camel/pom.xml | 2 +-
activemq-cf/pom.xml | 2 +-
activemq-client/pom.xml | 2 +-
.../org/apache/activemq/ActiveMQConnection.java | 20 --
.../activemq/state/ConnectionStateTracker.java | 29 +-
.../java/org/apache/activemq/thread/Scheduler.java | 8 +
.../apache/activemq/thread/TaskRunnerFactory.java | 50 ++--
.../activemq/transport/tcp/TcpTransportServer.java | 4 +-
.../activemq/util/DataByteArrayInputStream.java | 62 +----
.../activemq/util/DataByteArrayOutputStream.java | 45 +---
.../apache/activemq/util/IntrospectionSupport.java | 10 +-
.../apache/activemq/util/MarshallingSupport.java | 175 ++++++------
.../org/apache/activemq/thread/SchedulerTest.java | 85 ++++++
.../activemq/thread/TaskRunnerFactoryTest.java | 77 ++++++
activemq-console/pom.xml | 2 +-
activemq-http/pom.xml | 2 +-
.../transport/http/HttpClientTransport.java | 3 +
.../http/HttpClientTransportCookiePolicyTest.java | 61 +++++
activemq-itests-spring31/pom.xml | 2 +-
activemq-jaas/pom.xml | 2 +-
activemq-jdbc-store/pom.xml | 2 +-
.../jdbc/microsoft_jdbc_driver_6_1_for_sql_server | 17 ++
activemq-jms-pool/pom.xml | 2 +-
activemq-kahadb-store/pom.xml | 2 +-
.../store/kahadb/KahaDBPersistenceAdapter.java | 5 +
.../activemq/store/kahadb/MessageDatabase.java | 240 +++++++++--------
.../store/kahadb/disk/journal/DataFile.java | 4 +
.../kahadb/disk/journal/DataFileAppender.java | 52 ++--
.../store/kahadb/disk/journal/Journal.java | 17 +-
.../activemq/store/kahadb/disk/page/PageFile.java | 18 +-
.../kahadb/disk/util/DataByteArrayInputStream.java | 36 +--
.../disk/util/DataByteArrayOutputStream.java | 38 +--
.../activemq/store/kahadb/JournalArchiveTest.java | 221 +++++++++++++++
.../kahadb/JournalMetaDataCheckpointTest.java | 219 +++++++++++++++
.../store/kahadb/JournalSyncStrategyTest.java | 3 +
.../store/kahadb/MessageDatabaseSizeTest.java | 41 +++
.../DataFileAppenderNoSpaceNoBatchTest.java | 148 ++++++++++
.../journal/JournalMaxFileLengthChangeTest.java | 143 ++++++++++
.../store/kahadb/disk/page/PageFileTest.java | 28 ++
activemq-karaf-itest/pom.xml | 2 +-
activemq-karaf/pom.xml | 2 +-
.../src/main/resources/features-core.xml | 4 +-
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 | 12 +-
.../src/main/resources/META-INF/spring.schemas | 3 +
activemq-partition/pom.xml | 2 +-
activemq-pool/pom.xml | 7 +-
.../apache/activemq/pool/PooledConsumerTest.java | 220 +++++++++++++++
activemq-ra/pom.xml | 2 +-
activemq-rar/pom.xml | 2 +-
activemq-run/pom.xml | 2 +-
activemq-runtime-config/pom.xml | 2 +-
.../activemq/plugin/NetworkConnectorProcessor.java | 6 +-
.../java/JavaRuntimeConfigurationBroker.java | 2 +-
.../org/apache/activemq/NetworkConnectorTest.java | 26 ++
.../activemq/java/JavaNetworkConnectorTest.java | 30 ++-
activemq-shiro/pom.xml | 2 +-
activemq-spring/pom.xml | 2 +-
.../src/main/resources/META-INF/spring.schemas | 2 +
activemq-stomp/pom.xml | 2 +-
activemq-tooling/activemq-junit/pom.xml | 2 +-
.../activemq/junit/EmbeddedActiveMQBroker.java | 5 +-
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/region/DestinationGCStressTest.java | 300 +++++++++++++++++++++
.../activemq/broker/region/QueuePurgeTest.java | 50 ++++
.../java/org/apache/activemq/bugs/AMQ6432Test.java | 219 +++++++++++++++
.../java/org/apache/activemq/bugs/AMQ6579Test.java | 128 +++++++++
.../java/org/apache/activemq/bugs/AMQ6599Test.java | 110 ++++++++
.../apache/activemq/network/SimpleNetworkTest.java | 3 +
.../failover/FailoverStateTrackingTest.java | 260 ++++++++++++++++++
.../transport/tcp/TcpTransportCloseSocketTest.java | 133 +++++++++
activemq-web-console/pom.xml | 3 +-
.../src/main/webapp/WEB-INF/web.xml | 3 +
activemq-web-console/src/main/webapp/browse.jsp | 2 +
.../src/main/webapp/connection.jsp | 2 +
.../src/main/webapp/connections.jsp | 2 +
activemq-web-console/src/main/webapp/graph.jsp | 2 +
activemq-web-console/src/main/webapp/index.jsp | 2 +
activemq-web-console/src/main/webapp/message.jsp | 2 +
activemq-web-console/src/main/webapp/network.jsp | 2 +
.../src/main/webapp/queueConsumers.jsp | 2 +
.../src/main/webapp/queueGraph.jsp | 2 +
.../src/main/webapp/queueProducers.jsp | 2 +
activemq-web-console/src/main/webapp/queues.jsp | 2 +
activemq-web-console/src/main/webapp/scheduled.jsp | 2 +
activemq-web-console/src/main/webapp/send.jsp | 2 +
activemq-web-console/src/main/webapp/slave.jsp | 7 +-
.../src/main/webapp/subscribers.jsp | 2 +
.../src/main/webapp/topicProducers.jsp | 2 +
.../src/main/webapp/topicSubscribers.jsp | 2 +
activemq-web-console/src/main/webapp/topics.jsp | 2 +
activemq-web-demo/pom.xml | 2 +-
activemq-web/pom.xml | 2 +-
assembly/pom.xml | 2 +-
assembly/src/main/descriptors/common-bin.xml | 10 +
assembly/src/main/descriptors/unix-bin.xml | 2 +
assembly/src/release/NOTICE | 2 +-
pom.xml | 4 +-
123 files changed, 3548 insertions(+), 625 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