Merge branch 'master' into ROCKETMQ-57
Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/63de56c7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/63de56c7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/63de56c7 Branch: refs/heads/ROCKETMQ-54 Commit: 63de56c7b6cada18338bb4be5e84fb17a379e5ac Parents: f8d881b b4108d2 Author: stevenschew <[email protected]> Authored: Fri Jan 20 14:55:52 2017 +0800 Committer: stevenschew <[email protected]> Committed: Fri Jan 20 14:55:52 2017 +0800 ---------------------------------------------------------------------- .travis.yml | 1 + BUILDING | 2 +- .../rocketmq/broker/out/BrokerOuterAPI.java | 1 - .../subscription/SubscriptionGroupManager.java | 2 +- .../rocketmq/client/impl/MQClientManager.java | 3 +- .../processor/DefaultRequestProcessorTest.java | 246 +++++++++++++++ pom.xml | 73 +++-- .../remoting/protocol/RemotingSerializable.java | 2 +- .../remoting/protocol/RocketMQSerializable.java | 17 +- style/rmq_checkstyle.xml | 1 - test/pom.xml | 52 ++++ .../test/client/mq/MQAsyncProducer.java | 85 ++++++ .../test/client/rmq/RMQAsyncSendProducer.java | 226 ++++++++++++++ .../test/client/rmq/RMQBroadCastConsumer.java | 37 +++ .../test/client/rmq/RMQNormalConsumer.java | 90 ++++++ .../test/client/rmq/RMQNormalProducer.java | 167 ++++++++++ .../clientinterface/AbstractMQConsumer.java | 112 +++++++ .../clientinterface/AbstractMQProducer.java | 151 +++++++++ .../test/clientinterface/MQCollector.java | 108 +++++++ .../test/clientinterface/MQConsumer.java | 26 ++ .../test/clientinterface/MQProducer.java | 30 ++ .../rocketmq/test/factory/ConsumerFactory.java | 45 +++ .../rocketmq/test/factory/MQMessageFactory.java | 128 ++++++++ .../rocketmq/test/factory/MessageFactory.java | 62 ++++ .../rocketmq/test/factory/ProducerFactory.java | 37 +++ .../test/factory/SendCallBackFactory.java | 35 +++ .../rocketmq/test/factory/TagMessage.java | 108 +++++++ .../test/listener/AbstractListener.java | 104 +++++++ .../rmq/concurrent/RMQDelayListner.java | 61 ++++ .../rmq/concurrent/RMQNormalListner.java | 70 +++++ .../listener/rmq/order/RMQOrderListener.java | 85 ++++++ .../rocketmq/test/message/MessageQueueMsg.java | 62 ++++ .../rocketmq/test/sendresult/SendResult.java | 62 ++++ .../apache/rocketmq/test/util/Condition.java | 23 ++ .../test/util/DuplicateMessageInfo.java | 137 +++++++++ .../org/apache/rocketmq/test/util/FileUtil.java | 108 +++++++ .../org/apache/rocketmq/test/util/MQAdmin.java | 164 ++++++++++ .../rocketmq/test/util/MQRandomUtils.java | 28 ++ .../org/apache/rocketmq/test/util/MQWait.java | 93 ++++++ .../apache/rocketmq/test/util/RandomUtil.java | 306 +++++++++++++++++++ .../apache/rocketmq/test/util/RandomUtils.java | 91 ++++++ .../org/apache/rocketmq/test/util/TestUtil.java | 122 ++++++++ .../apache/rocketmq/test/util/TestUtils.java | 50 +++ .../apache/rocketmq/test/util/VerifyUtils.java | 146 +++++++++ .../test/util/data/collect/DataCollector.java | 45 +++ .../util/data/collect/DataCollectorManager.java | 112 +++++++ .../test/util/data/collect/DataFilter.java | 22 ++ .../collect/impl/ListDataCollectorImpl.java | 95 ++++++ .../data/collect/impl/MapDataCollectorImpl.java | 111 +++++++ .../test/util/parallel/ParallelTask.java | 43 +++ .../util/parallel/ParallelTaskExecutor.java | 67 ++++ .../rocketmq/test/util/parallel/Task4Test.java | 30 ++ .../org/apache/rocketmq/test/base/BaseConf.java | 162 ++++++++++ .../rocketmq/test/base/IntegrationTestBase.java | 143 +++++++++ .../balance/NormalMsgDynamicBalanceIT.java | 111 +++++++ .../balance/NormalMsgStaticBalanceIT.java | 109 +++++++ .../consumer/broadcast/BaseBroadCastIT.java | 56 ++++ .../normal/BroadCastNormalMsgNotRecvIT.java | 73 +++++ .../normal/BroadCastNormalMsgRecvCrashIT.java | 90 ++++++ .../normal/BroadCastNormalMsgRecvFailIT.java | 72 +++++ .../BroadCastNormalMsgRecvStartLaterIT.java | 88 ++++++ .../BroadCastNormalMsgTwoDiffGroupRecvIT.java | 78 +++++ .../normal/NormalMsgTwoSameGroupConsumerIT.java | 78 +++++ .../broadcast/order/OrderMsgBroadCastIT.java | 75 +++++ .../tag/BroadCastTwoConsumerFilterIT.java | 78 +++++ .../tag/BroadCastTwoConsumerSubDiffTagIT.java | 75 +++++ .../tag/BroadCastTwoConsumerSubTagIT.java | 75 +++++ .../consumer/cluster/DynamicAddAndCrashIT.java | 103 +++++++ .../consumer/cluster/DynamicAddConsumerIT.java | 97 ++++++ .../cluster/DynamicCrashConsumerIT.java | 100 ++++++ .../test/client/consumer/tag/MulTagSubIT.java | 156 ++++++++++ .../consumer/tag/TagMessageWith1ConsumerIT.java | 197 ++++++++++++ .../tag/TagMessageWithMulConsumerIT.java | 196 ++++++++++++ .../tag/TagMessageWithSameGroupConsumerIT.java | 115 +++++++ .../consumer/topic/MulConsumerMulTopicIT.java | 108 +++++++ .../consumer/topic/OneConsumerMulTopicIT.java | 104 +++++++ .../producer/async/AsyncSendExceptionIT.java | 150 +++++++++ .../async/AsyncSendWithMessageQueueIT.java | 85 ++++++ .../AsyncSendWithMessageQueueSelectorIT.java | 106 +++++++ .../async/AsyncSendWithOnlySendCallBackIT.java | 64 ++++ .../producer/exception/msg/ChinaPropIT.java | 74 +++++ .../exception/msg/MessageExceptionIT.java | 129 ++++++++ .../exception/msg/MessageUserPropIT.java | 94 ++++++ .../ProducerGroupAndInstanceNameValidityIT.java | 69 +++++ .../producer/oneway/OneWaySendExceptionIT.java | 78 +++++ .../client/producer/oneway/OneWaySendIT.java | 64 ++++ .../producer/oneway/OneWaySendWithMQIT.java | 79 +++++ .../oneway/OneWaySendWithSelectorIT.java | 104 +++++++ .../order/OrderMsgDynamicRebalanceIT.java | 115 +++++++ .../test/client/producer/order/OrderMsgIT.java | 108 +++++++ .../producer/order/OrderMsgRebalanceIT.java | 133 ++++++++ .../producer/order/OrderMsgWithTagIT.java | 169 ++++++++++ .../querymsg/QueryMsgByIdExceptionIT.java | 81 +++++ .../producer/querymsg/QueryMsgByIdIT.java | 75 +++++ .../producer/querymsg/QueryMsgByKeyIT.java | 104 +++++++ .../apache/rocketmq/test/delay/DelayConf.java | 27 ++ .../rocketmq/test/delay/NormalMsgDelayIT.java | 116 +++++++ .../test/smoke/NormalMessageSendAndRecvIT.java | 62 ++++ test/src/test/resources/log4j.xml | 46 +++ test/src/test/resources/logback-test.xml | 33 ++ 100 files changed, 8750 insertions(+), 38 deletions(-) ----------------------------------------------------------------------
