activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mschoech...@apache.org
Subject [11/12] activemq git commit: Resolved merge conflict
Date Mon, 29 Jun 2015 21:26:28 GMT
Resolved merge conflict


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/3870aa94
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/3870aa94
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/3870aa94

Branch: refs/heads/master
Commit: 3870aa94473b2253e7a38e5897187d1049d60059
Parents: aeb93e4 002ade7
Author: Marc Schoechlin <marc.schoechlin@breuninger.de>
Authored: Mon Jun 29 08:34:50 2015 +0200
Committer: Marc Schoechlin <marc.schoechlin@breuninger.de>
Committed: Mon Jun 29 08:34:50 2015 +0200

----------------------------------------------------------------------
 .gitignore                                      |   2 +
 .../activemq/transport/amqp/AmqpSupport.java    |   5 +-
 .../activemq/transport/amqp/AmqpWireFormat.java |   2 +-
 .../transport/amqp/protocol/AmqpConnection.java |  48 ++
 .../transport/amqp/protocol/AmqpReceiver.java   |   8 +-
 .../transport/amqp/protocol/AmqpSender.java     |  16 +-
 .../transport/amqp/protocol/AmqpSession.java    |  13 +
 .../protocol/AmqpTransactionCoordinator.java    |  51 +-
 .../activemq/transport/amqp/AMQ4563Test.java    |   4 +-
 .../transport/amqp/AmqpTestSupport.java         |   6 +-
 .../activemq/transport/amqp/IDERunner.java      |  20 +-
 .../amqp/JMSClientTransactionTest.java          |  32 +
 .../amqp/interop/AmqpConnectionsTest.java       |  17 +
 .../amqp/interop/AmqpSendReceiveTest.java       |  17 +-
 .../activemq/advisory/AdvisoryBroker.java       |  35 +-
 .../apache/activemq/broker/BrokerService.java   |  86 ++-
 .../activemq/broker/PublishedAddressPolicy.java |   9 +-
 .../activemq/broker/jmx/ManagementContext.java  |  30 +-
 .../activemq/broker/region/AbstractRegion.java  |  82 ++-
 .../activemq/broker/region/BaseDestination.java |   9 +
 .../apache/activemq/broker/region/Queue.java    |   1 +
 .../broker/region/RegionStatistics.java         |  89 +++
 .../apache/activemq/broker/region/Topic.java    |  30 +-
 .../activemq/broker/region/TopicRegion.java     |   3 +-
 .../region/cursors/AbstractStoreCursor.java     |  66 +-
 .../broker/region/policy/PolicyEntry.java       |  39 ++
 .../network/DemandForwardingBridgeSupport.java  |   8 +-
 .../activemq/network/NetworkBridgeFactory.java  |  14 -
 .../activemq/transport/vm/VMTransport.java      |   9 -
 .../org/apache/activemq/util/BrokerSupport.java |   1 -
 .../apache/activemq/util/osgi/Activator.java    |  72 ++-
 activemq-client/pom.xml                         |  58 +-
 .../org/apache/activemq/ActiveMQSession.java    | 229 ++++---
 .../activemq/ActiveMQSessionExecutor.java       |  11 +
 .../apache/activemq/command/CommandTypes.java   |   6 +-
 .../activemq/command/NetworkBridgeFilter.java   |   4 +-
 .../activemq/command/SubscriptionInfo.java      |  23 +-
 .../v11/ActiveMQBlobMessageMarshaller.java      | 139 ++++
 .../v11/ActiveMQBytesMessageMarshaller.java     | 114 ++++
 .../v11/ActiveMQDestinationMarshaller.java      | 114 ++++
 .../v11/ActiveMQMapMessageMarshaller.java       | 114 ++++
 .../openwire/v11/ActiveMQMessageMarshaller.java | 114 ++++
 .../v11/ActiveMQObjectMessageMarshaller.java    | 114 ++++
 .../openwire/v11/ActiveMQQueueMarshaller.java   | 114 ++++
 .../v11/ActiveMQStreamMessageMarshaller.java    | 114 ++++
 .../v11/ActiveMQTempDestinationMarshaller.java  |  99 +++
 .../v11/ActiveMQTempQueueMarshaller.java        | 114 ++++
 .../v11/ActiveMQTempTopicMarshaller.java        | 114 ++++
 .../v11/ActiveMQTextMessageMarshaller.java      | 114 ++++
 .../openwire/v11/ActiveMQTopicMarshaller.java   | 114 ++++
 .../openwire/v11/BaseCommandMarshaller.java     | 118 ++++
 .../openwire/v11/BaseDataStreamMarshaller.java  | 644 +++++++++++++++++++
 .../openwire/v11/BrokerIdMarshaller.java        | 129 ++++
 .../openwire/v11/BrokerInfoMarshaller.java      | 206 ++++++
 .../v11/ConnectionControlMarshaller.java        | 169 +++++
 .../openwire/v11/ConnectionErrorMarshaller.java | 134 ++++
 .../openwire/v11/ConnectionIdMarshaller.java    | 129 ++++
 .../openwire/v11/ConnectionInfoMarshaller.java  | 201 ++++++
 .../openwire/v11/ConsumerControlMarshaller.java | 158 +++++
 .../openwire/v11/ConsumerIdMarshaller.java      | 139 ++++
 .../openwire/v11/ConsumerInfoMarshaller.java    | 260 ++++++++
 .../openwire/v11/ControlCommandMarshaller.java  | 129 ++++
 .../v11/DataArrayResponseMarshaller.java        | 151 +++++
 .../openwire/v11/DataResponseMarshaller.java    | 129 ++++
 .../openwire/v11/DestinationInfoMarshaller.java | 170 +++++
 .../openwire/v11/DiscoveryEventMarshaller.java  | 134 ++++
 .../v11/ExceptionResponseMarshaller.java        | 129 ++++
 .../openwire/v11/FlushCommandMarshaller.java    | 114 ++++
 .../openwire/v11/IntegerResponseMarshaller.java | 128 ++++
 .../openwire/v11/JournalQueueAckMarshaller.java | 134 ++++
 .../openwire/v11/JournalTopicAckMarshaller.java | 154 +++++
 .../openwire/v11/JournalTraceMarshaller.java    | 129 ++++
 .../v11/JournalTransactionMarshaller.java       | 138 ++++
 .../openwire/v11/KeepAliveInfoMarshaller.java   | 114 ++++
 .../v11/LastPartialCommandMarshaller.java       | 114 ++++
 .../v11/LocalTransactionIdMarshaller.java       | 134 ++++
 .../openwire/v11/MarshallerFactory.java         | 109 ++++
 .../openwire/v11/MessageAckMarshaller.java      | 162 +++++
 .../openwire/v11/MessageDispatchMarshaller.java | 143 ++++
 .../MessageDispatchNotificationMarshaller.java  | 144 +++++
 .../openwire/v11/MessageIdMarshaller.java       | 144 +++++
 .../openwire/v11/MessageMarshaller.java         | 316 +++++++++
 .../openwire/v11/MessagePullMarshaller.java     | 149 +++++
 .../v11/NetworkBridgeFilterMarshaller.java      | 137 ++++
 .../openwire/v11/PartialCommandMarshaller.java  | 133 ++++
 .../openwire/v11/ProducerAckMarshaller.java     | 133 ++++
 .../openwire/v11/ProducerIdMarshaller.java      | 139 ++++
 .../openwire/v11/ProducerInfoMarshaller.java    | 170 +++++
 .../openwire/v11/RemoveInfoMarshaller.java      | 134 ++++
 .../v11/RemoveSubscriptionInfoMarshaller.java   | 139 ++++
 .../openwire/v11/ReplayCommandMarshaller.java   | 132 ++++
 .../openwire/v11/ResponseMarshaller.java        | 128 ++++
 .../openwire/v11/SessionIdMarshaller.java       | 134 ++++
 .../openwire/v11/SessionInfoMarshaller.java     | 129 ++++
 .../openwire/v11/ShutdownInfoMarshaller.java    | 114 ++++
 .../v11/SubscriptionInfoMarshaller.java         | 154 +++++
 .../openwire/v11/TransactionIdMarshaller.java   |  99 +++
 .../openwire/v11/TransactionInfoMarshaller.java | 138 ++++
 .../openwire/v11/WireFormatInfoMarshaller.java  | 154 +++++
 .../openwire/v11/XATransactionIdMarshaller.java | 138 ++++
 .../discovery/simple/SimpleDiscoveryAgent.java  |   2 +-
 .../transport/failover/FailoverTransport.java   |   9 +
 .../java/org/apache/activemq/console/Main.java  |   8 +-
 .../activemq/console/command/PurgeCommand.java  |  99 +--
 .../activemq/console/command/QueryCommand.java  | 113 +++-
 .../activemq/console/command/ShellCommand.java  |   2 +-
 .../console/command/store/StoreExporter.java    |   4 +-
 .../activemq/console/util/JmxMBeansUtil.java    |   6 +-
 .../activemq/console/PurgeCommandTest.java      | 188 ++++++
 .../activemq/console/QueryCommandTest.java      | 183 ++++++
 .../transport/http/HttpClientTransport.java     |   7 +
 .../store/jdbc/DataSourceServiceSupport.java    |   6 +-
 .../store/jdbc/LeaseDatabaseLocker.java         |   2 +-
 .../apache/activemq/store/jdbc/Statements.java  |  23 +-
 .../activemq/store/kahadb/KahaDBStore.java      |   1 -
 .../activemq/store/kahadb/MessageDatabase.java  |  11 +-
 activemq-karaf-itest/pom.xml                    |   3 -
 .../itest/ActiveMQAMQPBrokerFeatureTest.java    |  13 +
 .../transport/mqtt/MQTTProtocolConverter.java   |  67 +-
 .../activemq/transport/mqtt/MQTTAuthTest.java   |  39 ++
 activemq-openwire-generator/pom.xml             |   4 +-
 .../activemq/ra/ActiveMQResourceAdapter.java    |  14 +-
 .../java/org/apache/activemq/ra/MDBTest.java    |  72 +++
 activemq-unit-tests/pom.xml                     |   1 +
 .../apache/activemq/RedeliveryPolicyTest.java   |  97 +++
 .../apache/activemq/advisory/AdvisoryTests.java |  85 ++-
 .../activemq/broker/BrokerRedeliveryTest.java   |  18 +-
 .../activemq/broker/RedeliveryRecoveryTest.java | 139 ++++
 .../ft/QueueMasterSlaveSingleUrlTest.java       |  34 +
 .../jmx/SelectiveMBeanRegistrationTest.java     |   5 +-
 .../policy/MaxDestinationsPolicyTest.java       | 271 ++++++++
 .../cursors/AbstractStoreCursorNpeTest.java     |  93 +++
 .../org/apache/activemq/bugs/AMQ2149Test.java   |  14 +-
 .../org/apache/activemq/bugs/AMQ4677Test.java   |   4 +-
 .../org/apache/activemq/bugs/AMQ5567Test.java   |  17 +-
 .../org/apache/activemq/bugs/AMQ5844Test.java   | 216 +++++++
 .../bugs/AMQ5863CompositePublishTest.java       | 113 ++++
 .../network/NetworkBrokerDetachTest.java        |  12 +-
 .../activemq/store/MessagePriorityTest.java     |  31 +
 .../store/jdbc/JDBCMessagePriorityTest.java     |   1 -
 .../store/jdbc/JDBCNetworkBrokerDetachTest.java |  40 +-
 .../failover/FailoverClusterTestSupport.java    |  40 +-
 .../failover/FailoverComplexClusterTest.java    |  10 -
 .../transport/vm/VMTransportBrokerNameTest.java |  33 +-
 .../transport/vm/VMTransportThreadSafeTest.java |  18 +-
 .../vm/VmTransportNetworkBrokerTest.java        |  39 +-
 .../usage/PeriodicDiskUsageLimitTest.java       | 185 ++++++
 .../usecases/AdvisoryViaNetworkTest.java        |  77 +++
 .../ConcurrentProducerDurableConsumerTest.java  | 128 ++--
 .../DurableSubscriptionWithNoLocalTest.java     | 345 ++++++++++
 .../activemq/usecases/MemoryLimitTest.java      |  13 +-
 .../NetworkBridgeProducerFlowControlTest.java   | 230 ++++++-
 activemq-web-console/pom.xml                    |   2 +-
 assembly/src/release/bin/activemq-admin         |  10 +-
 assembly/src/release/bin/activemq-admin.bat     |   6 +-
 assembly/src/release/bin/activemq.bat           |   6 +-
 pom.xml                                         |   2 +-
 157 files changed, 12991 insertions(+), 627 deletions(-)
----------------------------------------------------------------------



Mime
View raw message