This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository activemq.
commit 114ae03e10c60e7894f6a8ce0a9e61663d043de4 Merge: 9e0246f aef6d84 Author: Markus Koschany <[email protected]> Date: Sun Aug 7 13:33:29 2016 +0200 Merge tag 'upstream/5.14.0+dfsg' Upstream version 5.14.0+dfsg # gpg: Signature made Sun 07 Aug 2016 13:33:24 CEST using RSA key ID 513B51E4 # gpg: Good signature from "Markus Koschany <[email protected]>" [ultimate] # gpg: aka "Markus Koschany <[email protected]>" [ultimate] # gpg: aka "Markus Koschany <[email protected]>" [ultimate] activemq-all/pom.xml | 2 +- activemq-amqp/pom.xml | 47 +- .../activemq/transport/amqp/AmqpFrameParser.java | 3 +- .../transport/amqp/AmqpProtocolConverter.java | 8 +- .../activemq/transport/amqp/AmqpSupport.java | 2 +- .../transport/amqp/AmqpTransportFilter.java | 7 - .../activemq/transport/amqp/AmqpWSTransport.java | 143 ++++ .../transport/amqp/AmqpWSTransportFactory.java | 88 +++ .../activemq/transport/amqp/AmqpWireFormat.java | 2 +- .../amqp/message/AMQPNativeInboundTransformer.java | 13 +- .../message/AMQPNativeOutboundTransformer.java | 4 +- .../amqp/message/AMQPRawInboundTransformer.java | 25 +- .../transport/amqp/message/ActiveMQJMSVendor.java | 328 ++++++++- .../amqp/message/AmqpContentTypeSupport.java | 145 ++++ .../transport/amqp/message/AmqpMessageSupport.java | 150 +++++ .../amqp/message/AutoOutboundTransformer.java | 15 +- .../transport/amqp/message/EncodedMessage.java | 4 +- .../transport/amqp/message/InboundTransformer.java | 49 +- .../amqp/message/InvalidContentTypeException.java | 30 +- .../amqp/message/JMSMappingInboundTransformer.java | 155 +++-- .../message/JMSMappingOutboundTransformer.java | 263 +++++--- .../activemq/transport/amqp/message/JMSVendor.java | 53 -- .../amqp/message/OutboundTransformer.java | 46 +- .../transport/amqp/protocol/AmqpConnection.java | 8 +- .../transport/amqp/protocol/AmqpReceiver.java | 30 +- .../transport/amqp/protocol/AmqpSender.java | 50 +- .../transport/amqp/protocol/AmqpSession.java | 29 +- .../transport/amqp/sasl/AmqpAuthenticator.java | 4 +- .../services/org/apache/activemq/transport/amqp+ws | 17 + .../org/apache/activemq/transport/amqp+wss | 17 + .../activemq/transport/amqp}/AmqpAndMqttTest.java | 5 +- .../activemq/transport/amqp/AmqpTestSupport.java | 49 ++ .../JMSClientProducerFlowSendFailIfNoSpace.java | 5 - .../amqp/JMSClientRequestResponseTest.java | 4 - .../activemq/transport/amqp/JMSClientSslTest.java | 13 - .../activemq/transport/amqp/JMSClientTest.java | 81 +++ .../transport/amqp/JMSClientTransactionTest.java | 60 +- .../transport/amqp/JMSInteroperabilityTest.java | 471 +++++++++++++ .../activemq/transport/amqp/client/AmqpClient.java | 2 +- .../amqp/client/AmqpClientTestSupport.java | 36 +- .../transport/amqp/client/AmqpConnection.java | 13 +- .../amqp/client/AmqpTransactionCoordinator.java | 5 +- ...{NettyTransport.java => NettyTcpTransport.java} | 307 +++++---- .../amqp/client/transport/NettyTransport.java | 369 +--------- .../client/transport/NettyTransportFactory.java | 21 +- .../client/transport/NettyTransportListener.java | 2 +- .../client/transport/NettyTransportOptions.java | 8 +- .../client/transport/NettyTransportSslOptions.java | 9 +- .../client/transport/NettyTransportSupport.java | 6 +- .../amqp/client/transport/NettyWSTransport.java | 166 +++++ .../interop/AmqpBrokerReuqestedHearbeatsTest.java | 18 + .../interop/AmqpClientRequestsHeartbeatsTest.java | 18 + .../amqp/interop/AmqpConnectionsTest.java | 52 +- .../interop/AmqpCorrelationIdPreservationTest.java | 3 +- .../interop/AmqpMessageIdPreservationTest.java | 31 + .../amqp/interop/AmqpSendReceiveTest.java | 66 ++ .../amqp/interop/AmqpTempDestinationTest.java | 107 +++ .../amqp/message/AmqpContentTypeSupportTest.java | 229 +++++++ .../amqp/message/AmqpMessageSupportTest.java | 108 +++ .../message/JMSMappingInboundTransformerTest.java | 555 ++++++++++++++- .../message/JMSMappingOutboundTransformerTest.java | 743 ++++++++++++++++++++- .../JMSTransformationSpeedComparisonTest.java | 312 +++++++++ .../amqp/profile/QueueBrowserStressTest.java | 28 +- activemq-amqp/src/test/resources/log4j.properties | 2 +- activemq-blueprint/pom.xml | 2 +- activemq-broker/pom.xml | 2 +- .../apache/activemq/advisory/AdvisoryBroker.java | 1 + .../org/apache/activemq/broker/BrokerService.java | 20 +- .../activemq/broker/TransportConnection.java | 134 +++- .../apache/activemq/broker/TransportConnector.java | 10 +- .../org/apache/activemq/broker/jmx/BrokerView.java | 82 +-- .../activemq/broker/jmx/BrokerViewMBean.java | 34 +- .../apache/activemq/broker/jmx/ConnectorView.java | 2 +- .../activemq/broker/jmx/JobSchedulerView.java | 5 - .../activemq/broker/jmx/JobSchedulerViewMBean.java | 17 - .../activemq/broker/jmx/OpenTypeSupport.java | 2 +- .../apache/activemq/broker/jmx/ProducerView.java | 5 +- .../activemq/broker/jmx/ProducerViewMBean.java | 2 + .../activemq/broker/jmx/SubscriptionView.java | 28 +- .../activemq/broker/jmx/SubscriptionViewMBean.java | 22 +- .../broker/region/DurableTopicSubscription.java | 3 + .../broker/region/IndirectMessageReference.java | 52 +- .../broker/region/NullMessageReference.java | 34 + .../broker/region/PrefetchSubscription.java | 28 +- .../org/apache/activemq/broker/region/Queue.java | 108 ++- .../broker/region/QueueMessageReference.java | 19 +- .../activemq/broker/region/RegionBroker.java | 14 +- .../org/apache/activemq/broker/region/Topic.java | 13 +- .../activemq/broker/region/TopicSubscription.java | 8 +- .../region/cursors/FilePendingMessageCursor.java | 42 +- .../broker/region/cursors/OrderedPendingList.java | 33 +- .../broker/region/cursors/PendingList.java | 2 + .../region/cursors/PrioritizedPendingList.java | 65 +- .../region/cursors/QueueDispatchPendingList.java | 25 +- .../broker/region/cursors/TopicStorePrefetch.java | 1 - .../activemq/broker/region/policy/PolicyEntry.java | 1 + .../region/virtual/CompositeDestination.java | 55 +- .../region/virtual/CompositeDestinationFilter.java | 23 +- .../SelectorAwareVirtualTopicInterceptor.java | 25 +- .../org/apache/activemq/network/ConduitBridge.java | 8 +- .../network/DemandForwardingBridgeSupport.java | 258 +++++-- .../activemq/network/DemandSubscription.java | 13 + .../network/DiscoveryNetworkConnector.java | 13 +- .../activemq/network/DurableConduitBridge.java | 53 +- .../activemq/network/MBeanBridgeDestination.java | 6 +- .../network/NetworkBridgeConfiguration.java | 9 + .../apache/activemq/network/NetworkConnector.java | 17 +- .../apache/activemq/network/jms/JmsConnector.java | 8 +- .../activemq/network/jms/ReconnectionPolicy.java | 2 +- .../plugin/SubQueueSelectorCacheBroker.java | 91 ++- .../security/AbstractAuthenticationBroker.java | 2 - .../activemq/security/AuthorizationBroker.java | 5 +- .../security/AuthorizationDestinationFilter.java | 1 - .../apache/activemq/security/SecurityContext.java | 5 - .../store/AbstractMessageStoreStatistics.java | 81 +++ .../store/MessageStoreSubscriptionStatistics.java | 112 ++++ .../activemq/store/ProxyTopicMessageStore.java | 4 + .../apache/activemq/store/SharedFileLocker.java | 7 +- .../apache/activemq/store/TopicMessageStore.java | 17 + .../activemq/store/memory/MemoryMessageStore.java | 10 +- .../store/memory/MemoryTopicMessageStore.java | 9 + .../apache/activemq/transaction/Transaction.java | 42 +- .../apache/activemq/transaction/XATransaction.java | 6 - .../apache/activemq/transport/vm/VMTransport.java | 17 + .../apache/activemq/JmsTransactionTestSupport.java | 5 +- .../apache/activemq/broker/LinkStealingTest.java | 107 +-- .../SubQueueSelectorCacheBrokerWildcardTest.java | 59 ++ .../apache/activemq/store/PListTestSupport.java | 5 +- .../java/org/apache/activemq/test/TestSupport.java | 7 +- .../apache/activemq/util/DefaultTestAppender.java | 0 activemq-camel/pom.xml | 2 +- .../camel/component/ActiveMQComponent.java | 5 + .../OriginalDestinationPropagateStrategy.java | 56 ++ .../camel/CamelJmsRequestReplyNobTest.java | 111 +++ .../activemq/camel/JmsJdbcXARollbackTest.java | 4 +- .../org/apache/activemq/camel/JmsJdbcXATest.java | 5 +- .../component/ActiveMQOriginalDestinationTest.java | 76 +++ .../org/apache/activemq/camel/requestReply.xml | 76 +++ activemq-cf/README.md | 11 + activemq-cf/org.apache.activemq.cfg | 22 + activemq-cf/pom.xml | 75 +++ .../osgi/cf/ConnectionFactoryProvider.java | 80 +++ activemq-client/pom.xml | 6 +- .../org/apache/activemq/ActiveMQConnection.java | 60 +- .../apache/activemq/ActiveMQConnectionFactory.java | 13 +- .../activemq/ActiveMQConnectionMetaData.java | 32 + .../apache/activemq/ActiveMQMessageConsumer.java | 29 +- .../activemq/ActiveMQMessageTransformation.java | 74 +- .../org/apache/activemq/TransactionContext.java | 42 +- .../apache/activemq/advisory/AdvisorySupport.java | 2 + .../activemq/broker/region/MessageReference.java | 2 + .../org/apache/activemq/command/BrokerInfo.java | 22 +- .../activemq/command/BrokerSubscriptionInfo.java | 100 +++ .../org/apache/activemq/command/CommandTypes.java | 8 +- .../java/org/apache/activemq/command/Message.java | 9 + .../apache/activemq/command/WireFormatInfo.java | 36 + .../activemq/filter/ComparisonExpression.java | 38 +- .../apache/activemq/openwire/OpenWireFormat.java | 5 +- .../activemq/openwire/OpenWireFormatFactory.java | 31 + .../v12/ActiveMQBlobMessageMarshaller.java | 139 ++++ .../v12/ActiveMQBytesMessageMarshaller.java | 114 ++++ .../v12/ActiveMQDestinationMarshaller.java | 114 ++++ .../openwire/v12/ActiveMQMapMessageMarshaller.java | 114 ++++ .../openwire/v12/ActiveMQMessageMarshaller.java | 114 ++++ .../v12/ActiveMQObjectMessageMarshaller.java | 114 ++++ .../openwire/v12/ActiveMQQueueMarshaller.java | 114 ++++ .../v12/ActiveMQStreamMessageMarshaller.java | 114 ++++ .../v12/ActiveMQTempDestinationMarshaller.java | 99 +++ .../openwire/v12/ActiveMQTempQueueMarshaller.java | 114 ++++ .../openwire/v12/ActiveMQTempTopicMarshaller.java | 114 ++++ .../v12/ActiveMQTextMessageMarshaller.java | 114 ++++ .../openwire/v12/ActiveMQTopicMarshaller.java | 114 ++++ .../openwire/v12/BaseCommandMarshaller.java | 118 ++++ .../openwire/v12/BaseDataStreamMarshaller.java | 644 ++++++++++++++++++ .../activemq/openwire/v12/BrokerIdMarshaller.java | 129 ++++ .../openwire/v12/BrokerInfoMarshaller.java | 206 ++++++ .../v12/BrokerSubscriptionInfoMarshaller.java | 161 +++++ .../openwire/v12/ConnectionControlMarshaller.java | 169 +++++ .../openwire/v12/ConnectionErrorMarshaller.java | 134 ++++ .../openwire/v12/ConnectionIdMarshaller.java | 129 ++++ .../openwire/v12/ConnectionInfoMarshaller.java | 201 ++++++ .../openwire/v12/ConsumerControlMarshaller.java | 158 +++++ .../openwire/v12/ConsumerIdMarshaller.java | 139 ++++ .../openwire/v12/ConsumerInfoMarshaller.java | 260 +++++++ .../openwire/v12/ControlCommandMarshaller.java | 129 ++++ .../openwire/v12/DataArrayResponseMarshaller.java | 151 +++++ .../openwire/v12/DataResponseMarshaller.java | 129 ++++ .../openwire/v12/DestinationInfoMarshaller.java | 170 +++++ .../openwire/v12/DiscoveryEventMarshaller.java | 134 ++++ .../openwire/v12/ExceptionResponseMarshaller.java | 129 ++++ .../openwire/v12/FlushCommandMarshaller.java | 114 ++++ .../openwire/v12/IntegerResponseMarshaller.java | 128 ++++ .../openwire/v12/JournalQueueAckMarshaller.java | 134 ++++ .../openwire/v12/JournalTopicAckMarshaller.java | 154 +++++ .../openwire/v12/JournalTraceMarshaller.java | 129 ++++ .../openwire/v12/JournalTransactionMarshaller.java | 138 ++++ .../openwire/v12/KeepAliveInfoMarshaller.java | 114 ++++ .../openwire/v12/LastPartialCommandMarshaller.java | 114 ++++ .../openwire/v12/LocalTransactionIdMarshaller.java | 134 ++++ .../activemq/openwire/v12/MarshallerFactory.java | 110 +++ .../openwire/v12/MessageAckMarshaller.java | 162 +++++ .../openwire/v12/MessageDispatchMarshaller.java | 143 ++++ .../v12/MessageDispatchNotificationMarshaller.java | 144 ++++ .../activemq/openwire/v12/MessageIdMarshaller.java | 144 ++++ .../activemq/openwire/v12/MessageMarshaller.java | 316 +++++++++ .../openwire/v12/MessagePullMarshaller.java | 149 +++++ .../v12/NetworkBridgeFilterMarshaller.java | 137 ++++ .../openwire/v12/PartialCommandMarshaller.java | 133 ++++ .../openwire/v12/ProducerAckMarshaller.java | 133 ++++ .../openwire/v12/ProducerIdMarshaller.java | 139 ++++ .../openwire/v12/ProducerInfoMarshaller.java | 170 +++++ .../openwire/v12/RemoveInfoMarshaller.java | 134 ++++ .../v12/RemoveSubscriptionInfoMarshaller.java | 139 ++++ .../openwire/v12/ReplayCommandMarshaller.java | 132 ++++ .../activemq/openwire/v12/ResponseMarshaller.java | 128 ++++ .../activemq/openwire/v12/SessionIdMarshaller.java | 134 ++++ .../openwire/v12/SessionInfoMarshaller.java | 129 ++++ .../openwire/v12/ShutdownInfoMarshaller.java | 114 ++++ .../openwire/v12/SubscriptionInfoMarshaller.java | 154 +++++ .../openwire/v12/TransactionIdMarshaller.java | 99 +++ .../openwire/v12/TransactionInfoMarshaller.java | 138 ++++ .../openwire/v12/WireFormatInfoMarshaller.java | 154 +++++ .../openwire/v12/XATransactionIdMarshaller.java | 138 ++++ .../org/apache/activemq/state/CommandVisitor.java | 3 + .../activemq/state/CommandVisitorAdapter.java | 44 ++ .../apache/activemq/thread/TaskRunnerFactory.java | 6 +- .../org/apache/activemq/transport/Transport.java | 25 + .../apache/activemq/transport/TransportFilter.java | 42 +- .../multicast/MulticastDiscoveryAgent.java | 4 +- .../discovery/simple/SimpleDiscoveryAgent.java | 48 +- .../transport/failover/FailoverTransport.java | 49 +- .../activemq/transport/fanout/FanoutTransport.java | 71 +- .../activemq/transport/mock/MockTransport.java | 70 +- .../activemq/transport/nio/NIOTransport.java | 5 +- .../activemq/transport/nio/SelectorManager.java | 10 +- .../activemq/transport/tcp/SslTransport.java | 11 +- .../activemq/transport/tcp/TcpTransport.java | 19 +- .../activemq/transport/tcp/TcpTransportServer.java | 4 +- .../activemq/transport/udp/UdpTransport.java | 25 +- .../apache/activemq/transport/ws/WSTransport.java | 95 +++ .../apache/activemq/util/IOExceptionSupport.java | 33 + ...StringToListOfActiveMQDestinationConverter.java | 18 +- .../activemq/util/AnonymousSimplePojoParent.java | 32 +- .../ClassLoadingAwareObjectInputStreamTest.java | 557 +++++++++++++++ .../activemq/util/LocalSimplePojoParent.java | 42 +- .../java/org/apache/activemq/util/SimplePojo.java | 73 ++ activemq-console/pom.xml | 2 +- .../activemq/console/command/DstatCommand.java | 12 +- activemq-fileserver/pom.xml | 112 ---- .../apache/activemq/util/FilenameGuardFilter.java | 96 --- .../java/org/apache/activemq/util/IOHelper.java | 139 ---- .../java/org/apache/activemq/util/RestFilter.java | 230 ------- .../src/main/webapp/META-INF/LICENSE | 203 ------ .../src/main/webapp/META-INF/NOTICE | 5 - .../src/main/webapp/WEB-INF/web.xml | 55 -- activemq-fileserver/src/main/webapp/index.html | 30 - .../org/apache/activemq/util/HttpBlobTest.java | 72 -- .../org/apache/activemq/util/HttpTestSupport.java | 127 ---- .../org/apache/activemq/util/RestFilterTest.java | 70 -- activemq-http/pom.xml | 4 +- .../transport/http/BlockingQueueTransport.java | 27 +- .../transport/http/HttpClientTransport.java | 15 + .../transport/util/HttpTransportUtils.java | 21 + .../activemq/transport/ws/AbstractMQTTSocket.java | 9 +- .../activemq/transport/ws/AbstractStompSocket.java | 8 +- .../activemq/transport/ws/StompWSConnection.java | 11 +- .../activemq/transport/ws/WSTransportFactory.java | 12 +- .../activemq/transport/ws/WSTransportProxy.java | 270 ++++++++ .../activemq/transport/ws/WSTransportServer.java | 21 +- .../activemq/transport/ws/jetty9/MQTTSocket.java | 2 +- .../activemq/transport/ws/jetty9/StompSocket.java | 4 +- .../activemq/transport/ws/jetty9/WSServlet.java | 125 +++- .../transport/wss/WSSTransportFactory.java | 12 +- .../TwoBrokerTopicSendReceiveUsingHttpTest.java | 12 +- .../activemq/transport/ws/MQTTWSConnection.java | 10 +- .../transport/ws/StompWSConnectionTimeoutTest.java | 4 - .../transport/ws/StompWSTransportTest.java | 44 +- .../transport/ws/WSTransportTestSupport.java | 16 +- activemq-http/src/test/resources/log4j.properties | 4 +- activemq-itests-spring31/pom.xml | 2 +- activemq-jaas/pom.xml | 2 +- activemq-jdbc-store/pom.xml | 28 +- .../store/jdbc/JDBCPersistenceAdapter.java | 3 + .../activemq/store/jdbc/JDBCTopicMessageStore.java | 8 + .../activemq/store/jdbc/LeaseDatabaseLocker.java | 6 +- .../activemq/store/jdbc/TransactionContext.java | 313 ++++++++- .../store/jdbc/adapter/BlobJDBCAdapter.java | 4 - .../store/jdbc/adapter/DefaultJDBCAdapter.java | 180 ++--- .../store/journal/JournalTopicMessageStore.java | 7 + .../DefaultJDBCAdapterDoCreateTablesTest.java | 181 +++++ activemq-jms-pool/pom.xml | 10 +- .../activemq/jms/pool/PooledConnectionFactory.java | 2 +- .../pool/ConnectionExpiryEvictsFromPoolTest.java | 13 + .../PooledConnectionFactoryMaximumActiveTest.java | 2 + .../jms/pool/PooledConnectionFactoryTest.java | 17 +- .../jms/pool/PooledConnectionFailoverTest.java | 13 + .../PooledConnectionSecurityExceptionTest.java | 17 + .../pool/PooledConnectionTempDestCleanupTest.java | 20 +- .../jms/pool/PooledConnectionTempQueueTest.java | 2 + .../activemq/jms/pool/PooledConnectionTest.java | 5 +- .../PooledSessionExhaustionBlockTimeoutTest.java | 13 + .../jms/pool/PooledSessionExhaustionTest.java | 13 + .../pool/PooledSessionNoPublisherCachingTest.java | 13 + .../activemq/jms/pool/PooledSessionTest.java | 13 + .../jms/pool/PooledTopicPublisherTest.java | 17 +- .../activemq/jms/pool/XAConnectionPoolTest.java | 8 + activemq-kahadb-store/pom.xml | 12 +- .../store/kahadb/KahaDBPersistenceAdapter.java | 51 +- .../apache/activemq/store/kahadb/KahaDBStore.java | 160 +++-- .../activemq/store/kahadb/MessageDatabase.java | 361 ++++++++-- .../store/kahadb/MultiKahaDBTransactionStore.java | 2 +- .../activemq/store/kahadb/TempKahaDBStore.java | 8 + .../journal/CallerBufferingDataFileAppender.java | 16 + .../store/kahadb/disk/journal/DataFile.java | 11 + .../kahadb/disk/journal/DataFileAccessor.java | 2 +- .../kahadb/disk/journal/DataFileAccessorPool.java | 16 +- .../kahadb/disk/journal/DataFileAppender.java | 54 +- .../store/kahadb/disk/journal/Journal.java | 542 ++++++++++----- .../disk/journal/TargetedDataFileAppender.java | 8 +- .../JournalCorruptionEofIndexRecoveryTest.java | 75 ++- .../kahadb/JournalCorruptionIndexRecoveryTest.java | 17 +- ...ecoveryTest.java => JournalFdRecoveryTest.java} | 198 +++--- .../store/kahadb/JournalSyncStrategyTest.java | 133 ++++ .../disk/journal/DataFileAccessorPoolTest.java | 66 ++ .../journal/DataFileAppenderSyncStrategyTest.java | 93 +++ .../store/kahadb/disk/journal/JournalTest.java | 1 + .../journal/PreallocationJournalLatencyTest.java | 87 +++ .../disk/journal/TargetedDataFileAppenderTest.java | 1 + activemq-karaf-itest/pom.xml | 2 +- .../ActiveMQBrokerNdExternalCamelFeatureTest.java | 3 +- activemq-karaf/pom.xml | 4 +- .../karaf/commands/ActiveMQCommandSupport.java | 7 + .../src/main/resources/features-core.xml | 6 + activemq-leveldb-store/pom.xml | 2 +- .../org/apache/activemq/leveldb/LevelDBStore.scala | 21 +- activemq-log4j-appender/pom.xml | 2 +- activemq-mqtt/pom.xml | 2 +- .../transport/mqtt/MQTTProtocolConverter.java | 35 +- .../transport/mqtt/MQTTProtocolSupport.java | 87 +++ .../MQTTVirtualTopicSubscriptionStrategy.java | 19 +- .../mqtt/MQTTOverlapedSubscriptionsTest.java | 2 +- .../apache/activemq/transport/mqtt/MQTTTest.java | 320 +++++++++ .../activemq/transport/mqtt/MQTTTestSupport.java | 4 +- .../activemq/transport/mqtt/PahoMQTTTest.java | 247 +++---- 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 | 3 +- activemq-ra/pom.xml | 2 +- .../activemq/ra/ActiveMQManagedConnection.java | 2 +- .../activemq/ra/ActiveMQConnectionFactoryTest.java | 4 + .../activemq/ra/ConnectionManagerAdapter.java | 6 +- .../ra/JmsXARollback2CxTransactionTest.java | 12 +- .../test/java/org/apache/activemq/ra/MDBTest.java | 11 +- .../apache/activemq/ra/ManagedConnectionTest.java | 41 +- .../activemq/ra/UnsubscribeResubscribeTest.java | 8 + activemq-rar/pom.xml | 2 +- activemq-run/pom.xml | 2 +- activemq-runtime-config/pom.xml | 2 +- .../java/JavaRuntimeConfigurationBroker.java | 1 - .../activemq/plugin/util/PolicyEntryUtil.java | 2 - activemq-shiro/pom.xml | 2 +- .../shiro/subject/SubjectSecurityContext.java | 5 - .../shiro/subject/SubjectSecurityContextTest.java | 5 - activemq-spring/pom.xml | 2 +- .../apache/activemq/spring/SpringSslContext.java | 19 +- .../src/main/resources/META-INF/spring.schemas | 1 + activemq-stomp/pom.xml | 2 +- .../transport/stomp/ProtocolConverter.java | 59 +- .../activemq/transport/stomp/Stomp11Test.java | 16 +- .../activemq/transport/stomp/Stomp12Test.java | 57 ++ .../transport/stomp/StompAdvisoryTest.java | 158 ++++- .../apache/activemq/transport/stomp/StompTest.java | 43 +- activemq-tooling/activemq-junit/pom.xml | 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 | 12 +- .../activemq/ActiveMQConnectionFactoryTest.java | 23 + .../activemq/JmsQueueBrowserExpirationTest.java | 43 ++ .../org/apache/activemq/MessageEvictionTest.java | 1 - .../advisory/AdvisoryTempDestinationTests.java | 12 +- .../apache/activemq/advisory/AdvisoryTests.java | 5 +- .../org/apache/activemq/blob/FTPTestSupport.java | 34 +- .../apache/activemq/blob/FilesystemBlobTest.java | 2 +- .../org/apache/activemq/broker/BrokerTest.java | 10 +- .../activemq/broker/XARecoveryBrokerTest.java | 16 + .../broker/ft/QueueMasterSlaveTestSupport.java | 2 +- .../ft/kahaDbJdbcLeaseQueueMasterSlaveTest.java | 4 +- .../org/apache/activemq/broker/jmx/MBeanTest.java | 53 +- .../activemq/broker/region/DestinationGCTest.java | 3 +- .../region/SubscriptionAddRemoveQueueTest.java | 147 ++-- .../cursors/AbstractPendingMessageCursorTest.java | 77 ++- .../cursors/KahaDBPendingMessageCursorTest.java | 205 +++++- .../cursors/MemoryPendingMessageCursorTest.java | 26 +- .../MultiKahaDBPendingMessageCursorTest.java | 9 + .../region/cursors/OrderPendingListTest.java | 53 ++ .../region/cursors/PrioritizedPendingListTest.java | 57 +- .../broker/scheduler/JmsCronSchedulerTest.java | 8 +- .../broker/scheduler/JmsSchedulerTest.java | 13 +- .../scheduler/JobSchedulerManagementTest.java | 15 +- .../broker/virtual/VirtualTopicDLQTest.java | 33 +- .../broker/virtual/VirtualTopicFanoutPerfTest.java | 25 +- .../activemq/bugs/AMQ2584ConcurrentDlqTest.java | 2 + .../java/org/apache/activemq/bugs/AMQ2616Test.java | 66 +- .../java/org/apache/activemq/bugs/AMQ2832Test.java | 3 + .../java/org/apache/activemq/bugs/AMQ2910Test.java | 2 +- .../java/org/apache/activemq/bugs/AMQ3120Test.java | 4 + .../java/org/apache/activemq/bugs/AMQ3166Test.java | 294 ++++++++ .../java/org/apache/activemq/bugs/AMQ4147Test.java | 18 +- .../java/org/apache/activemq/bugs/AMQ4212Test.java | 2 + .../java/org/apache/activemq/bugs/AMQ4323Test.java | 2 + .../java/org/apache/activemq/bugs/AMQ5336Test.java | 77 +++ .../java/org/apache/activemq/bugs/AMQ5914Test.java | 4 +- .../java/org/apache/activemq/bugs/AMQ6000Test.java | 2 +- .../java/org/apache/activemq/bugs/AMQ6117Test.java | 148 ++++ .../java/org/apache/activemq/bugs/AMQ6240Test.java | 101 +++ .../java/org/apache/activemq/bugs/AMQ6264Test.java | 135 ++++ .../java/org/apache/activemq/bugs/AMQ6293Test.java | 175 +++++ .../activemq/bugs/JMSQueueBrowserPriorityTest.java | 225 +++++++ .../org/apache/activemq/bugs/JmsTimeoutTest.java | 8 +- .../activemq/bugs/MessageExpiryClientSideTest.java | 265 ++++++++ .../bugs/MessageExpiryTimeDifferenceTest.java | 224 +++++++ .../TransactedStoreUsageSuspendResumeTest.java | 18 +- .../activemq/bugs/TrapMessageInJDBCStoreTest.java | 6 + .../activemq/command/ActiveMQTextMessageTest.java | 7 + .../activemq/console/command/PurgeCommandTest.java | 6 +- .../network/DemandForwardingBridgeFilterTest.java | 18 + .../activemq/network/DuplexNetworkMBeanTest.java | 6 +- .../network/DurableSyncNetworkBridgeTest.java | 539 +++++++++++++++ .../network/DynamicNetworkTestSupport.java | 130 +++- .../network/ForceDurableNetworkBridgeTest.java | 351 ++++++++++ .../apache/activemq/network/NetworkRouteTest.java | 2 + .../apache/activemq/network/SimpleNetworkTest.java | 8 +- .../network/VirtualConsumerDemandTest.java | 54 +- .../jms/TopicOutboundBridgeReconnectTest.java | 57 +- .../openwire/BrokerSubscriptionInfoTest.java | 78 +++ .../openwire/WireFormatInfoPropertiesTest.java | 122 ++++ .../org/apache/activemq/selector/SelectorTest.java | 17 + .../store/AbstractMessageStoreSizeStatTest.java | 12 +- .../store/AbstractStoreStatTestSupport.java | 1 - .../store/AbstractVmConcurrentDispatchTest.java | 63 +- .../activemq/store/SharedFileLockerTest.java | 5 +- .../store/jdbc/JDBCCleanupLimitedPoolTest.java | 152 +++++ .../store/jdbc/JDBCXACommitExceptionTest.java | 31 +- .../store/kahadb/KahaDBIndexLocationTest.java | 2 + .../apache/activemq/store/kahadb/KahaDBTest.java | 37 + .../kahadb/KahaDbVmConcurrentDispatchTest.java | 16 +- .../MultiKahaDbVmConcurrentDispatchTest.java | 16 +- .../store/kahadb/SubscriptionRecoveryTest.java | 2 + .../leveldb/LevelDbVmConcurrentDispatchTest.java | 11 +- .../memory/MemoryMessageStoreSizeStatTest.java | 1 - .../activemq/test/JmsSendReceiveTestSupport.java | 38 +- .../activemq/test/JmsTopicSendReceiveTest.java | 18 +- ...SendReceiveWithEmbeddedBrokerAndUserIDTest.java | 16 +- ...ceiveWithTwoConnectionsAndByteSelectorTest.java | 9 +- ...iveWithTwoConnectionsAndEmbeddedBrokerTest.java | 28 +- .../JmsTopicSendReceiveWithTwoConnectionsTest.java | 16 +- .../test/TemporaryDestinationToFromNameTest.java | 6 +- .../activemq/transport/SoWriteTimeoutTest.java | 6 +- .../apache/activemq/transport/StubTransport.java | 25 +- .../transport/TransportBrokerTestSupport.java | 30 +- .../transport/auto/AutoTransportConfigureTest.java | 30 +- .../failover/FailoverTransactionTest.java | 37 +- .../transport/vm/VmTransportNetworkBrokerTest.java | 75 ++- .../activemq/usage/PeriodicDiskUsageLimitTest.java | 2 + .../org/apache/activemq/usecases/AMQ6366Test.java | 141 ++++ .../usecases/BacklogNetworkCrossTalkTest.java | 4 +- .../activemq/usecases/ExpiredMessagesTest.java | 1 - .../usecases/NetworkBrokerNameColonTest.java | 51 ++ .../QueueOrderSingleTransactedConsumerTest.java | 211 ++++++ .../QueueZeroPrefetchLazyDispatchPriorityTest.java | 140 ++-- ...ctorAwareVTThatDropsMessagesWhenNoConsumer.java | 154 +++++ .../usecases/TopicProducerFlowControlTest.java | 25 +- ....java => TopicProducerToSubFileCursorTest.java} | 47 +- .../TwoBrokerDurableForwardStaticRestartTest.java | 147 ++++ .../java/org/apache/activemq/util/TestUtils.java | 32 +- activemq-web-console/pom.xml | 2 +- .../activemq/web/controller/RetryMessage.java | 62 ++ .../src/main/webapp/WEB-INF/dispatcher-servlet.xml | 1 + activemq-web-console/src/main/webapp/message.jsp | 33 +- activemq-web-demo/pom.xml | 2 +- activemq-web/pom.xml | 2 +- .../java/org/apache/activemq/web/MessageQuery.java | 4 + assembly/pom.xml | 52 +- assembly/src/main/descriptors/common-bin.xml | 26 +- assembly/src/release/bin/activemq | 4 +- assembly/src/release/bin/env | 20 +- assembly/src/release/conf/java.security | 19 + assembly/src/release/conf/jetty.xml | 5 - .../examples/conf/activemq-jdbc-performance.xml | 4 +- assembly/src/release/examples/conf/jetty-demo.xml | 6 - .../other/perfharness/perfharness-activemq.sh | 49 -- .../stomp/python/stompest/async/listener.py | 3 +- .../examples/stomp/python/stompest/readme.md | 14 +- pom.xml | 31 +- 498 files changed, 26470 insertions(+), 4703 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/activemq.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
