Upgrade the dependency RMQ version to 4.0.0-incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/commit/1b3bb98a Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/tree/1b3bb98a Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/diff/1b3bb98a Branch: refs/heads/jms-dev-1.1.0 Commit: 1b3bb98aa91f4652768402f53a779032c76efa81 Parents: 29f534f Author: zhangke <zhangke_beij...@qq.com> Authored: Tue Feb 21 17:48:45 2017 +0800 Committer: zhangke <zhangke_beij...@qq.com> Committed: Tue Feb 21 17:48:45 2017 +0800 ---------------------------------------------------------------------- core/pom.xml | 2 +- .../rocketmq/jms/ConsumeMessageService.java | 4 ++-- .../rocketmq/jms/DeliverMessageService.java | 16 +++++++------- .../org/apache/rocketmq/jms/MessageWrapper.java | 2 +- .../apache/rocketmq/jms/RocketMQConnection.java | 8 +++---- .../rocketmq/jms/RocketMQConnectionFactory.java | 2 +- .../apache/rocketmq/jms/RocketMQProducer.java | 22 ++++++++++---------- .../rocketmq/jms/SendCompletionListener.java | 4 ++-- .../rocketmq/jms/support/MessageConverter.java | 6 +++--- .../jms/support/MessageConvertTest.java | 6 +++--- pom.xml | 5 +++-- test/pom.xml | 16 ++++++-------- .../rocketmq/jms/integration/RocketMQAdmin.java | 6 +++--- .../jms/integration/RocketMQServer.java | 16 +++++++------- 14 files changed, 56 insertions(+), 59 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/1b3bb98a/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 5f07eb0..11d4471 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -30,7 +30,7 @@ <dependencies> <dependency> - <groupId>com.alibaba.rocketmq</groupId> + <groupId>org.apache.rocketmq</groupId> <artifactId>rocketmq-client</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/1b3bb98a/core/src/main/java/org/apache/rocketmq/jms/ConsumeMessageService.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/rocketmq/jms/ConsumeMessageService.java b/core/src/main/java/org/apache/rocketmq/jms/ConsumeMessageService.java index 535792c..79efa6a 100644 --- a/core/src/main/java/org/apache/rocketmq/jms/ConsumeMessageService.java +++ b/core/src/main/java/org/apache/rocketmq/jms/ConsumeMessageService.java @@ -17,7 +17,7 @@ package org.apache.rocketmq.jms; -import com.alibaba.rocketmq.common.ServiceThread; +import org.apache.rocketmq.common.ServiceThread; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; import java.util.concurrent.atomic.AtomicLong; @@ -43,7 +43,7 @@ public class ConsumeMessageService extends ServiceThread { } @Override public void run() { - while (!this.isStoped()) { + while (!this.isStopped()) { try { MessageWrapper wrapper = queue.take(); RocketMQConsumer consumer = wrapper.getConsumer(); http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/1b3bb98a/core/src/main/java/org/apache/rocketmq/jms/DeliverMessageService.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/rocketmq/jms/DeliverMessageService.java b/core/src/main/java/org/apache/rocketmq/jms/DeliverMessageService.java index 328dda6..b25a339 100644 --- a/core/src/main/java/org/apache/rocketmq/jms/DeliverMessageService.java +++ b/core/src/main/java/org/apache/rocketmq/jms/DeliverMessageService.java @@ -17,13 +17,13 @@ package org.apache.rocketmq.jms; -import com.alibaba.rocketmq.client.ClientConfig; -import com.alibaba.rocketmq.client.consumer.DefaultMQPullConsumer; -import com.alibaba.rocketmq.client.consumer.PullResult; -import com.alibaba.rocketmq.client.exception.MQClientException; -import com.alibaba.rocketmq.common.ServiceThread; -import com.alibaba.rocketmq.common.message.MessageExt; -import com.alibaba.rocketmq.common.message.MessageQueue; +import org.apache.rocketmq.client.ClientConfig; +import org.apache.rocketmq.client.consumer.DefaultMQPullConsumer; +import org.apache.rocketmq.client.consumer.PullResult; +import org.apache.rocketmq.client.exception.MQClientException; +import org.apache.rocketmq.common.ServiceThread; +import org.apache.rocketmq.common.message.MessageExt; +import org.apache.rocketmq.common.message.MessageQueue; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -114,7 +114,7 @@ public class DeliverMessageService extends ServiceThread { @Override public void run() { - while (!isStoped()) { + while (!isStopped()) { if (pause) { this.waitForRunning(1000); continue; http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/1b3bb98a/core/src/main/java/org/apache/rocketmq/jms/MessageWrapper.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/rocketmq/jms/MessageWrapper.java b/core/src/main/java/org/apache/rocketmq/jms/MessageWrapper.java index 5b3658d..1bca541 100644 --- a/core/src/main/java/org/apache/rocketmq/jms/MessageWrapper.java +++ b/core/src/main/java/org/apache/rocketmq/jms/MessageWrapper.java @@ -17,7 +17,7 @@ package org.apache.rocketmq.jms; -import com.alibaba.rocketmq.common.message.MessageQueue; +import org.apache.rocketmq.common.message.MessageQueue; import javax.jms.Message; public class MessageWrapper { http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/1b3bb98a/core/src/main/java/org/apache/rocketmq/jms/RocketMQConnection.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/rocketmq/jms/RocketMQConnection.java b/core/src/main/java/org/apache/rocketmq/jms/RocketMQConnection.java index 6535f90..c68f04a 100644 --- a/core/src/main/java/org/apache/rocketmq/jms/RocketMQConnection.java +++ b/core/src/main/java/org/apache/rocketmq/jms/RocketMQConnection.java @@ -17,10 +17,10 @@ package org.apache.rocketmq.jms; -import com.alibaba.rocketmq.client.ClientConfig; -import com.alibaba.rocketmq.client.exception.MQClientException; -import com.alibaba.rocketmq.client.impl.MQClientManager; -import com.alibaba.rocketmq.client.impl.factory.MQClientInstance; +import org.apache.rocketmq.client.ClientConfig; +import org.apache.rocketmq.client.exception.MQClientException; +import org.apache.rocketmq.client.impl.MQClientManager; +import org.apache.rocketmq.client.impl.factory.MQClientInstance; import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/1b3bb98a/core/src/main/java/org/apache/rocketmq/jms/RocketMQConnectionFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/rocketmq/jms/RocketMQConnectionFactory.java b/core/src/main/java/org/apache/rocketmq/jms/RocketMQConnectionFactory.java index 2a5e2d4..c00338c 100644 --- a/core/src/main/java/org/apache/rocketmq/jms/RocketMQConnectionFactory.java +++ b/core/src/main/java/org/apache/rocketmq/jms/RocketMQConnectionFactory.java @@ -17,7 +17,7 @@ package org.apache.rocketmq.jms; -import com.alibaba.rocketmq.client.impl.factory.MQClientInstance; +import org.apache.rocketmq.client.impl.factory.MQClientInstance; import javax.jms.Connection; import javax.jms.ConnectionFactory; import javax.jms.JMSContext; http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/1b3bb98a/core/src/main/java/org/apache/rocketmq/jms/RocketMQProducer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/rocketmq/jms/RocketMQProducer.java b/core/src/main/java/org/apache/rocketmq/jms/RocketMQProducer.java index a29025e..1c0b7d1 100644 --- a/core/src/main/java/org/apache/rocketmq/jms/RocketMQProducer.java +++ b/core/src/main/java/org/apache/rocketmq/jms/RocketMQProducer.java @@ -17,11 +17,11 @@ package org.apache.rocketmq.jms; -import com.alibaba.rocketmq.client.ClientConfig; -import com.alibaba.rocketmq.client.exception.MQClientException; -import com.alibaba.rocketmq.client.producer.DefaultMQProducer; -import com.alibaba.rocketmq.client.producer.SendResult; -import com.alibaba.rocketmq.client.producer.SendStatus; +import org.apache.rocketmq.client.ClientConfig; +import org.apache.rocketmq.client.exception.MQClientException; +import org.apache.rocketmq.client.producer.DefaultMQProducer; +import org.apache.rocketmq.client.producer.SendResult; +import org.apache.rocketmq.client.producer.SendStatus; import java.util.UUID; import javax.jms.CompletionListener; import javax.jms.Destination; @@ -172,12 +172,12 @@ public class RocketMQProducer implements MessageProducer { long timeToLive) throws JMSException { String topicName = JmsHelper.getTopicName(destination); - com.alibaba.rocketmq.common.message.Message rmqMsg = createRmqMessage(message, topicName); + org.apache.rocketmq.common.message.Message rmqMsg = createRmqMessage(message, topicName); sendSync(rmqMsg); } - private void sendSync(com.alibaba.rocketmq.common.message.Message rmqMsg) throws JMSException { + private void sendSync(org.apache.rocketmq.common.message.Message rmqMsg) throws JMSException { SendResult sendResult; try { @@ -196,7 +196,7 @@ public class RocketMQProducer implements MessageProducer { } } - private void sendAsync(com.alibaba.rocketmq.common.message.Message rmqMsg, + private void sendAsync(org.apache.rocketmq.common.message.Message rmqMsg, CompletionListener completionListener) throws JMSException { try { mqProducer.send(rmqMsg, new SendCompletionListener(completionListener)); @@ -206,11 +206,11 @@ public class RocketMQProducer implements MessageProducer { } } - private com.alibaba.rocketmq.common.message.Message createRmqMessage(Message message, + private org.apache.rocketmq.common.message.Message createRmqMessage(Message message, String topicName) throws JMSException { RocketMQMessage jmsMsg = (RocketMQMessage) message; initJMSHeaders(jmsMsg, destination); - com.alibaba.rocketmq.common.message.Message rmqMsg = null; + org.apache.rocketmq.common.message.Message rmqMsg = null; try { rmqMsg = MessageConverter.convert2RMQMessage(jmsMsg); } @@ -273,7 +273,7 @@ public class RocketMQProducer implements MessageProducer { CompletionListener completionListener) throws JMSException { String topicName = JmsHelper.getTopicName(destination); - com.alibaba.rocketmq.common.message.Message rmqMsg = createRmqMessage(message, topicName); + org.apache.rocketmq.common.message.Message rmqMsg = createRmqMessage(message, topicName); sendAsync(rmqMsg, completionListener); } http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/1b3bb98a/core/src/main/java/org/apache/rocketmq/jms/SendCompletionListener.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/rocketmq/jms/SendCompletionListener.java b/core/src/main/java/org/apache/rocketmq/jms/SendCompletionListener.java index e645329..a99a607 100644 --- a/core/src/main/java/org/apache/rocketmq/jms/SendCompletionListener.java +++ b/core/src/main/java/org/apache/rocketmq/jms/SendCompletionListener.java @@ -17,8 +17,8 @@ package org.apache.rocketmq.jms; -import com.alibaba.rocketmq.client.producer.SendCallback; -import com.alibaba.rocketmq.client.producer.SendResult; +import org.apache.rocketmq.client.producer.SendCallback; +import org.apache.rocketmq.client.producer.SendResult; import javax.jms.CompletionListener; http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/1b3bb98a/core/src/main/java/org/apache/rocketmq/jms/support/MessageConverter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/rocketmq/jms/support/MessageConverter.java b/core/src/main/java/org/apache/rocketmq/jms/support/MessageConverter.java index f39fc2f..0770170 100644 --- a/core/src/main/java/org/apache/rocketmq/jms/support/MessageConverter.java +++ b/core/src/main/java/org/apache/rocketmq/jms/support/MessageConverter.java @@ -17,9 +17,9 @@ package org.apache.rocketmq.jms.support; -import com.alibaba.rocketmq.common.message.Message; -import com.alibaba.rocketmq.common.message.MessageConst; -import com.alibaba.rocketmq.common.message.MessageExt; +import org.apache.rocketmq.common.message.Message; +import org.apache.rocketmq.common.message.MessageConst; +import org.apache.rocketmq.common.message.MessageExt; import com.google.common.base.Charsets; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/1b3bb98a/core/src/test/java/org/apache/rocketmq/jms/support/MessageConvertTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/rocketmq/jms/support/MessageConvertTest.java b/core/src/test/java/org/apache/rocketmq/jms/support/MessageConvertTest.java index 081e17f..410b955 100644 --- a/core/src/test/java/org/apache/rocketmq/jms/support/MessageConvertTest.java +++ b/core/src/test/java/org/apache/rocketmq/jms/support/MessageConvertTest.java @@ -17,8 +17,8 @@ package org.apache.rocketmq.jms.support; -import com.alibaba.rocketmq.common.message.MessageConst; -import com.alibaba.rocketmq.common.message.MessageExt; +import org.apache.rocketmq.common.message.MessageConst; +import org.apache.rocketmq.common.message.MessageExt; import org.apache.rocketmq.jms.RocketMQTopic; import org.apache.rocketmq.jms.msg.RocketMQMessage; import org.apache.rocketmq.jms.msg.RocketMQTextMessage; @@ -52,7 +52,7 @@ public class MessageConvertTest { rmqJmsMessage.setObjectProperty(MessageConst.PROPERTY_TAGS, messageType); rmqJmsMessage.setObjectProperty(MessageConst.PROPERTY_KEYS, messageType); - //convert to RMQMessage + //convert to RMQMessagemiz MessageExt message = (MessageExt)MessageConverter.convert2RMQMessage(rmqJmsMessage); //then convert back to RmqJmsMessage http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/1b3bb98a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 18057cb..2882a6b 100644 --- a/pom.xml +++ b/pom.xml @@ -40,6 +40,7 @@ <maven.compiler.source>1.7</maven.compiler.source> <maven.compiler.target>1.7</maven.compiler.target> <surefire.version>2.19.1</surefire.version> + <rocketmq.version>4.0.0-incubating</rocketmq.version> </properties> <dependencyManagement> @@ -50,9 +51,9 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>com.alibaba.rocketmq</groupId> + <groupId>org.apache.rocketmq</groupId> <artifactId>rocketmq-client</artifactId> - <version>3.2.6</version> + <version>${rocketmq.version}</version> </dependency> <dependency> <groupId>javax.jms</groupId> http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/1b3bb98a/test/pom.xml ---------------------------------------------------------------------- diff --git a/test/pom.xml b/test/pom.xml index b8aff9d..f05c080 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -30,7 +30,6 @@ <properties> <spring.version>4.3.6.RELEASE</spring.version> - <rocketmq.version>3.2.6</rocketmq.version> </properties> <dependencies> @@ -47,12 +46,14 @@ <artifactId>hamcrest-all</artifactId> </dependency> <dependency> - <groupId>com.alibaba.rocketmq</groupId> + <groupId>org.apache.rocketmq</groupId> <artifactId>rocketmq-namesrv</artifactId> + <version>${rocketmq.version}</version> </dependency> <dependency> - <groupId>com.alibaba.rocketmq</groupId> + <groupId>org.apache.rocketmq</groupId> <artifactId>rocketmq-broker</artifactId> + <version>${rocketmq.version}</version> </dependency> <dependency> <groupId>org.springframework</groupId> @@ -65,20 +66,15 @@ <version>${spring.version}</version> </dependency> <dependency> - <groupId>com.alibaba.rocketmq</groupId> + <groupId>org.apache.rocketmq</groupId> <artifactId>rocketmq-namesrv</artifactId> <version>${rocketmq.version}</version> </dependency> <dependency> - <groupId>com.alibaba.rocketmq</groupId> + <groupId>org.apache.rocketmq</groupId> <artifactId>rocketmq-broker</artifactId> <version>${rocketmq.version}</version> </dependency> - <dependency> - <groupId>com.alibaba.rocketmq</groupId> - <artifactId>rocketmq-tools</artifactId> - <version>${rocketmq.version}</version> - </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/1b3bb98a/test/src/main/java/org/apache/rocketmq/jms/integration/RocketMQAdmin.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/rocketmq/jms/integration/RocketMQAdmin.java b/test/src/main/java/org/apache/rocketmq/jms/integration/RocketMQAdmin.java index e161e74..a00370e 100644 --- a/test/src/main/java/org/apache/rocketmq/jms/integration/RocketMQAdmin.java +++ b/test/src/main/java/org/apache/rocketmq/jms/integration/RocketMQAdmin.java @@ -17,9 +17,9 @@ package org.apache.rocketmq.jms.integration; -import com.alibaba.rocketmq.client.exception.MQClientException; -import com.alibaba.rocketmq.common.TopicConfig; -import com.alibaba.rocketmq.tools.admin.DefaultMQAdminExt; +import org.apache.rocketmq.client.exception.MQClientException; +import org.apache.rocketmq.common.TopicConfig; +import org.apache.rocketmq.tools.admin.DefaultMQAdminExt; import com.google.common.collect.Sets; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/1b3bb98a/test/src/main/java/org/apache/rocketmq/jms/integration/RocketMQServer.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/rocketmq/jms/integration/RocketMQServer.java b/test/src/main/java/org/apache/rocketmq/jms/integration/RocketMQServer.java index 496e1a7..416e8d9 100644 --- a/test/src/main/java/org/apache/rocketmq/jms/integration/RocketMQServer.java +++ b/test/src/main/java/org/apache/rocketmq/jms/integration/RocketMQServer.java @@ -17,14 +17,14 @@ package org.apache.rocketmq.jms.integration; -import com.alibaba.rocketmq.broker.BrokerController; -import com.alibaba.rocketmq.common.BrokerConfig; -import com.alibaba.rocketmq.common.MixAll; -import com.alibaba.rocketmq.common.namesrv.NamesrvConfig; -import com.alibaba.rocketmq.namesrv.NamesrvController; -import com.alibaba.rocketmq.remoting.netty.NettyClientConfig; -import com.alibaba.rocketmq.remoting.netty.NettyServerConfig; -import com.alibaba.rocketmq.store.config.MessageStoreConfig; +import org.apache.rocketmq.broker.BrokerController; +import org.apache.rocketmq.common.BrokerConfig; +import org.apache.rocketmq.common.MixAll; +import org.apache.rocketmq.common.namesrv.NamesrvConfig; +import org.apache.rocketmq.namesrv.NamesrvController; +import org.apache.rocketmq.remoting.netty.NettyClientConfig; +import org.apache.rocketmq.remoting.netty.NettyServerConfig; +import org.apache.rocketmq.store.config.MessageStoreConfig; import java.io.File; import java.text.SimpleDateFormat; import java.util.Date;
