Repository: incubator-rocketmq Updated Branches: refs/heads/openmessaging-impl 28a6deacd -> 00a166e8f
Add oms mudle to build config and add some unsupported hints. Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/9c1dc747 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/9c1dc747 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/9c1dc747 Branch: refs/heads/openmessaging-impl Commit: 9c1dc7474da919e2c6fbbaa67752ba01ed83146b Parents: 28a6dea Author: yukon <[email protected]> Authored: Thu Apr 20 16:43:12 2017 +0800 Committer: yukon <[email protected]> Committed: Thu Apr 20 16:43:12 2017 +0800 ---------------------------------------------------------------------- distribution/release-client.xml | 1 + distribution/release.xml | 1 + openmessaging/pom.xml | 6 - .../io/openmessaging/rocketmq/ClientConfig.java | 194 ------------------- .../rocketmq/MessagingAccessPointImpl.java | 14 +- .../rocketmq/config/ClientConfig.java | 194 +++++++++++++++++++ .../rocketmq/consumer/LocalMessageCache.java | 2 +- .../rocketmq/consumer/PullConsumerImpl.java | 2 +- .../rocketmq/consumer/PushConsumerImpl.java | 2 +- .../rocketmq/producer/AbstractOMSProducer.java | 2 +- 10 files changed, 207 insertions(+), 211 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/9c1dc747/distribution/release-client.xml ---------------------------------------------------------------------- diff --git a/distribution/release-client.xml b/distribution/release-client.xml index 46563eb..84d33a0 100644 --- a/distribution/release-client.xml +++ b/distribution/release-client.xml @@ -47,6 +47,7 @@ <useAllReactorProjects>true</useAllReactorProjects> <includes> <include>org.apache.rocketmq:rocketmq-client</include> + <include>org.apache.rocketmq:rocketmq-openmessaging</include> </includes> <binaries> <outputDirectory>./</outputDirectory> http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/9c1dc747/distribution/release.xml ---------------------------------------------------------------------- diff --git a/distribution/release.xml b/distribution/release.xml index 2d3ec1e..3f304ab 100644 --- a/distribution/release.xml +++ b/distribution/release.xml @@ -67,6 +67,7 @@ <include>org.apache.rocketmq:rocketmq-namesrv</include> <include>org.apache.rocketmq:rocketmq-filtersrv</include> <include>org.apache.rocketmq:rocketmq-example</include> + <include>org.apache.rocketmq:rocketmq-openmessaging</include> </includes> <binaries> <outputDirectory>lib/</outputDirectory> http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/9c1dc747/openmessaging/pom.xml ---------------------------------------------------------------------- diff --git a/openmessaging/pom.xml b/openmessaging/pom.xml index d649812..e853642 100644 --- a/openmessaging/pom.xml +++ b/openmessaging/pom.xml @@ -38,11 +38,5 @@ <groupId>org.apache.rocketmq</groupId> <artifactId>rocketmq-client</artifactId> </dependency> - <dependency> - <groupId>javax.jms</groupId> - <artifactId>javax.jms-api</artifactId> - <version>2.0.1</version> - <scope>test</scope> - </dependency> </dependencies> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/9c1dc747/openmessaging/src/main/java/io/openmessaging/rocketmq/ClientConfig.java ---------------------------------------------------------------------- diff --git a/openmessaging/src/main/java/io/openmessaging/rocketmq/ClientConfig.java b/openmessaging/src/main/java/io/openmessaging/rocketmq/ClientConfig.java deleted file mode 100644 index fbca21a..0000000 --- a/openmessaging/src/main/java/io/openmessaging/rocketmq/ClientConfig.java +++ /dev/null @@ -1,194 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package io.openmessaging.rocketmq; - -import io.openmessaging.PropertyKeys; -import io.openmessaging.rocketmq.domain.NonStandardKeys; - -public class ClientConfig implements PropertyKeys, NonStandardKeys { - private String omsDriverImpl; - private String omsAccessPoints; - private String omsNamespace; - private String omsProducerId; - private String omsConsumerId; - private int omsOperationTimeout = 5000; - private String omsRoutingName; - private String omsOperatorName; - private String omsDstQueue; - private String omsSrcTopic; - private String rmqConsumerGroup; - private String rmqProducerGroup = "__OMS_PRODUCER_DEFAULT_GROUP"; - private int rmqMaxRedeliveryTimes = 16; - private int rmqMessageConsumeTimeout = 15; //In minutes - private int rmqMaxConsumeThreadNums = 64; - private int rmqMinConsumeThreadNums = 20; - private String rmqMessageDestination; - private int rmqPullMessageBatchNums = 32; - private int rmqPullMessageCacheCapacity = 1000; - - public String getOmsDriverImpl() { - return omsDriverImpl; - } - - public void setOmsDriverImpl(final String omsDriverImpl) { - this.omsDriverImpl = omsDriverImpl; - } - - public String getOmsAccessPoints() { - return omsAccessPoints; - } - - public void setOmsAccessPoints(final String omsAccessPoints) { - this.omsAccessPoints = omsAccessPoints; - } - - public String getOmsNamespace() { - return omsNamespace; - } - - public void setOmsNamespace(final String omsNamespace) { - this.omsNamespace = omsNamespace; - } - - public String getOmsProducerId() { - return omsProducerId; - } - - public void setOmsProducerId(final String omsProducerId) { - this.omsProducerId = omsProducerId; - } - - public String getOmsConsumerId() { - return omsConsumerId; - } - - public void setOmsConsumerId(final String omsConsumerId) { - this.omsConsumerId = omsConsumerId; - } - - public int getOmsOperationTimeout() { - return omsOperationTimeout; - } - - public void setOmsOperationTimeout(final int omsOperationTimeout) { - this.omsOperationTimeout = omsOperationTimeout; - } - - public String getOmsRoutingName() { - return omsRoutingName; - } - - public void setOmsRoutingName(final String omsRoutingName) { - this.omsRoutingName = omsRoutingName; - } - - public String getOmsOperatorName() { - return omsOperatorName; - } - - public void setOmsOperatorName(final String omsOperatorName) { - this.omsOperatorName = omsOperatorName; - } - - public String getOmsDstQueue() { - return omsDstQueue; - } - - public void setOmsDstQueue(final String omsDstQueue) { - this.omsDstQueue = omsDstQueue; - } - - public String getOmsSrcTopic() { - return omsSrcTopic; - } - - public void setOmsSrcTopic(final String omsSrcTopic) { - this.omsSrcTopic = omsSrcTopic; - } - - public String getRmqConsumerGroup() { - return rmqConsumerGroup; - } - - public void setRmqConsumerGroup(final String rmqConsumerGroup) { - this.rmqConsumerGroup = rmqConsumerGroup; - } - - public String getRmqProducerGroup() { - return rmqProducerGroup; - } - - public void setRmqProducerGroup(final String rmqProducerGroup) { - this.rmqProducerGroup = rmqProducerGroup; - } - - public int getRmqMaxRedeliveryTimes() { - return rmqMaxRedeliveryTimes; - } - - public void setRmqMaxRedeliveryTimes(final int rmqMaxRedeliveryTimes) { - this.rmqMaxRedeliveryTimes = rmqMaxRedeliveryTimes; - } - - public int getRmqMessageConsumeTimeout() { - return rmqMessageConsumeTimeout; - } - - public void setRmqMessageConsumeTimeout(final int rmqMessageConsumeTimeout) { - this.rmqMessageConsumeTimeout = rmqMessageConsumeTimeout; - } - - public int getRmqMaxConsumeThreadNums() { - return rmqMaxConsumeThreadNums; - } - - public void setRmqMaxConsumeThreadNums(final int rmqMaxConsumeThreadNums) { - this.rmqMaxConsumeThreadNums = rmqMaxConsumeThreadNums; - } - - public int getRmqMinConsumeThreadNums() { - return rmqMinConsumeThreadNums; - } - - public void setRmqMinConsumeThreadNums(final int rmqMinConsumeThreadNums) { - this.rmqMinConsumeThreadNums = rmqMinConsumeThreadNums; - } - - public String getRmqMessageDestination() { - return rmqMessageDestination; - } - - public void setRmqMessageDestination(final String rmqMessageDestination) { - this.rmqMessageDestination = rmqMessageDestination; - } - - public int getRmqPullMessageBatchNums() { - return rmqPullMessageBatchNums; - } - - public void setRmqPullMessageBatchNums(final int rmqPullMessageBatchNums) { - this.rmqPullMessageBatchNums = rmqPullMessageBatchNums; - } - - public int getRmqPullMessageCacheCapacity() { - return rmqPullMessageCacheCapacity; - } - - public void setRmqPullMessageCacheCapacity(final int rmqPullMessageCacheCapacity) { - this.rmqPullMessageCacheCapacity = rmqPullMessageCacheCapacity; - } -} http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/9c1dc747/openmessaging/src/main/java/io/openmessaging/rocketmq/MessagingAccessPointImpl.java ---------------------------------------------------------------------- diff --git a/openmessaging/src/main/java/io/openmessaging/rocketmq/MessagingAccessPointImpl.java b/openmessaging/src/main/java/io/openmessaging/rocketmq/MessagingAccessPointImpl.java index a897da5..65caf84 100644 --- a/openmessaging/src/main/java/io/openmessaging/rocketmq/MessagingAccessPointImpl.java +++ b/openmessaging/src/main/java/io/openmessaging/rocketmq/MessagingAccessPointImpl.java @@ -87,37 +87,37 @@ public class MessagingAccessPointImpl implements MessagingAccessPoint { @Override public IterableConsumer createIterableConsumer(String queueName) { - throw new OMSNotSupportedException("-1", "IterableConsumer is not supported in RocketMQ"); + throw new OMSNotSupportedException("-1", "IterableConsumer is not supported in current version"); } @Override public IterableConsumer createIterableConsumer(String queueName, KeyValue properties) { - throw new OMSNotSupportedException("-1", "IterableConsumer is not supported in RocketMQ"); + throw new OMSNotSupportedException("-1", "IterableConsumer is not supported in current version"); } @Override public ResourceManager getResourceManager() { - return null; + throw new OMSNotSupportedException("-1", "ResourceManager is not supported in current version."); } @Override public ServiceEndPoint createServiceEndPoint() { - return null; + throw new OMSNotSupportedException("-1", "ServiceEndPoint is not supported in current version."); } @Override public ServiceEndPoint createServiceEndPoint(KeyValue properties) { - return null; + throw new OMSNotSupportedException("-1", "ServiceEndPoint is not supported in current version."); } @Override public void addObserver(Observer observer) { - + //Ignore } @Override public void deleteObserver(Observer observer) { - + //Ignore } @Override http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/9c1dc747/openmessaging/src/main/java/io/openmessaging/rocketmq/config/ClientConfig.java ---------------------------------------------------------------------- diff --git a/openmessaging/src/main/java/io/openmessaging/rocketmq/config/ClientConfig.java b/openmessaging/src/main/java/io/openmessaging/rocketmq/config/ClientConfig.java new file mode 100644 index 0000000..7077c6d --- /dev/null +++ b/openmessaging/src/main/java/io/openmessaging/rocketmq/config/ClientConfig.java @@ -0,0 +1,194 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.openmessaging.rocketmq.config; + +import io.openmessaging.PropertyKeys; +import io.openmessaging.rocketmq.domain.NonStandardKeys; + +public class ClientConfig implements PropertyKeys, NonStandardKeys { + private String omsDriverImpl; + private String omsAccessPoints; + private String omsNamespace; + private String omsProducerId; + private String omsConsumerId; + private int omsOperationTimeout = 5000; + private String omsRoutingName; + private String omsOperatorName; + private String omsDstQueue; + private String omsSrcTopic; + private String rmqConsumerGroup; + private String rmqProducerGroup = "__OMS_PRODUCER_DEFAULT_GROUP"; + private int rmqMaxRedeliveryTimes = 16; + private int rmqMessageConsumeTimeout = 15; //In minutes + private int rmqMaxConsumeThreadNums = 64; + private int rmqMinConsumeThreadNums = 20; + private String rmqMessageDestination; + private int rmqPullMessageBatchNums = 32; + private int rmqPullMessageCacheCapacity = 1000; + + public String getOmsDriverImpl() { + return omsDriverImpl; + } + + public void setOmsDriverImpl(final String omsDriverImpl) { + this.omsDriverImpl = omsDriverImpl; + } + + public String getOmsAccessPoints() { + return omsAccessPoints; + } + + public void setOmsAccessPoints(final String omsAccessPoints) { + this.omsAccessPoints = omsAccessPoints; + } + + public String getOmsNamespace() { + return omsNamespace; + } + + public void setOmsNamespace(final String omsNamespace) { + this.omsNamespace = omsNamespace; + } + + public String getOmsProducerId() { + return omsProducerId; + } + + public void setOmsProducerId(final String omsProducerId) { + this.omsProducerId = omsProducerId; + } + + public String getOmsConsumerId() { + return omsConsumerId; + } + + public void setOmsConsumerId(final String omsConsumerId) { + this.omsConsumerId = omsConsumerId; + } + + public int getOmsOperationTimeout() { + return omsOperationTimeout; + } + + public void setOmsOperationTimeout(final int omsOperationTimeout) { + this.omsOperationTimeout = omsOperationTimeout; + } + + public String getOmsRoutingName() { + return omsRoutingName; + } + + public void setOmsRoutingName(final String omsRoutingName) { + this.omsRoutingName = omsRoutingName; + } + + public String getOmsOperatorName() { + return omsOperatorName; + } + + public void setOmsOperatorName(final String omsOperatorName) { + this.omsOperatorName = omsOperatorName; + } + + public String getOmsDstQueue() { + return omsDstQueue; + } + + public void setOmsDstQueue(final String omsDstQueue) { + this.omsDstQueue = omsDstQueue; + } + + public String getOmsSrcTopic() { + return omsSrcTopic; + } + + public void setOmsSrcTopic(final String omsSrcTopic) { + this.omsSrcTopic = omsSrcTopic; + } + + public String getRmqConsumerGroup() { + return rmqConsumerGroup; + } + + public void setRmqConsumerGroup(final String rmqConsumerGroup) { + this.rmqConsumerGroup = rmqConsumerGroup; + } + + public String getRmqProducerGroup() { + return rmqProducerGroup; + } + + public void setRmqProducerGroup(final String rmqProducerGroup) { + this.rmqProducerGroup = rmqProducerGroup; + } + + public int getRmqMaxRedeliveryTimes() { + return rmqMaxRedeliveryTimes; + } + + public void setRmqMaxRedeliveryTimes(final int rmqMaxRedeliveryTimes) { + this.rmqMaxRedeliveryTimes = rmqMaxRedeliveryTimes; + } + + public int getRmqMessageConsumeTimeout() { + return rmqMessageConsumeTimeout; + } + + public void setRmqMessageConsumeTimeout(final int rmqMessageConsumeTimeout) { + this.rmqMessageConsumeTimeout = rmqMessageConsumeTimeout; + } + + public int getRmqMaxConsumeThreadNums() { + return rmqMaxConsumeThreadNums; + } + + public void setRmqMaxConsumeThreadNums(final int rmqMaxConsumeThreadNums) { + this.rmqMaxConsumeThreadNums = rmqMaxConsumeThreadNums; + } + + public int getRmqMinConsumeThreadNums() { + return rmqMinConsumeThreadNums; + } + + public void setRmqMinConsumeThreadNums(final int rmqMinConsumeThreadNums) { + this.rmqMinConsumeThreadNums = rmqMinConsumeThreadNums; + } + + public String getRmqMessageDestination() { + return rmqMessageDestination; + } + + public void setRmqMessageDestination(final String rmqMessageDestination) { + this.rmqMessageDestination = rmqMessageDestination; + } + + public int getRmqPullMessageBatchNums() { + return rmqPullMessageBatchNums; + } + + public void setRmqPullMessageBatchNums(final int rmqPullMessageBatchNums) { + this.rmqPullMessageBatchNums = rmqPullMessageBatchNums; + } + + public int getRmqPullMessageCacheCapacity() { + return rmqPullMessageCacheCapacity; + } + + public void setRmqPullMessageCacheCapacity(final int rmqPullMessageCacheCapacity) { + this.rmqPullMessageCacheCapacity = rmqPullMessageCacheCapacity; + } +} http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/9c1dc747/openmessaging/src/main/java/io/openmessaging/rocketmq/consumer/LocalMessageCache.java ---------------------------------------------------------------------- diff --git a/openmessaging/src/main/java/io/openmessaging/rocketmq/consumer/LocalMessageCache.java b/openmessaging/src/main/java/io/openmessaging/rocketmq/consumer/LocalMessageCache.java index 9afc4c9..4dfdca6 100644 --- a/openmessaging/src/main/java/io/openmessaging/rocketmq/consumer/LocalMessageCache.java +++ b/openmessaging/src/main/java/io/openmessaging/rocketmq/consumer/LocalMessageCache.java @@ -19,7 +19,7 @@ package io.openmessaging.rocketmq.consumer; import io.openmessaging.KeyValue; import io.openmessaging.PropertyKeys; import io.openmessaging.ServiceLifecycle; -import io.openmessaging.rocketmq.ClientConfig; +import io.openmessaging.rocketmq.config.ClientConfig; import io.openmessaging.rocketmq.domain.ConsumeRequest; import java.util.Collections; import java.util.Map; http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/9c1dc747/openmessaging/src/main/java/io/openmessaging/rocketmq/consumer/PullConsumerImpl.java ---------------------------------------------------------------------- diff --git a/openmessaging/src/main/java/io/openmessaging/rocketmq/consumer/PullConsumerImpl.java b/openmessaging/src/main/java/io/openmessaging/rocketmq/consumer/PullConsumerImpl.java index 5d4e7d9..8d396d4 100644 --- a/openmessaging/src/main/java/io/openmessaging/rocketmq/consumer/PullConsumerImpl.java +++ b/openmessaging/src/main/java/io/openmessaging/rocketmq/consumer/PullConsumerImpl.java @@ -21,7 +21,7 @@ import io.openmessaging.Message; import io.openmessaging.PropertyKeys; import io.openmessaging.PullConsumer; import io.openmessaging.exception.OMSRuntimeException; -import io.openmessaging.rocketmq.ClientConfig; +import io.openmessaging.rocketmq.config.ClientConfig; import io.openmessaging.rocketmq.domain.ConsumeRequest; import io.openmessaging.rocketmq.utils.BeanUtils; import io.openmessaging.rocketmq.utils.OMSUtil; http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/9c1dc747/openmessaging/src/main/java/io/openmessaging/rocketmq/consumer/PushConsumerImpl.java ---------------------------------------------------------------------- diff --git a/openmessaging/src/main/java/io/openmessaging/rocketmq/consumer/PushConsumerImpl.java b/openmessaging/src/main/java/io/openmessaging/rocketmq/consumer/PushConsumerImpl.java index 65c8ee0..a2694e4 100644 --- a/openmessaging/src/main/java/io/openmessaging/rocketmq/consumer/PushConsumerImpl.java +++ b/openmessaging/src/main/java/io/openmessaging/rocketmq/consumer/PushConsumerImpl.java @@ -24,7 +24,7 @@ import io.openmessaging.PropertyKeys; import io.openmessaging.PushConsumer; import io.openmessaging.ReceivedMessageContext; import io.openmessaging.exception.OMSRuntimeException; -import io.openmessaging.rocketmq.ClientConfig; +import io.openmessaging.rocketmq.config.ClientConfig; import io.openmessaging.rocketmq.utils.BeanUtils; import io.openmessaging.rocketmq.utils.OMSUtil; import io.openmessaging.rocketmq.domain.NonStandardKeys; http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/9c1dc747/openmessaging/src/main/java/io/openmessaging/rocketmq/producer/AbstractOMSProducer.java ---------------------------------------------------------------------- diff --git a/openmessaging/src/main/java/io/openmessaging/rocketmq/producer/AbstractOMSProducer.java b/openmessaging/src/main/java/io/openmessaging/rocketmq/producer/AbstractOMSProducer.java index 7de7888..0b2db4d 100644 --- a/openmessaging/src/main/java/io/openmessaging/rocketmq/producer/AbstractOMSProducer.java +++ b/openmessaging/src/main/java/io/openmessaging/rocketmq/producer/AbstractOMSProducer.java @@ -27,7 +27,7 @@ import io.openmessaging.exception.OMSMessageFormatException; import io.openmessaging.exception.OMSNotSupportedException; import io.openmessaging.exception.OMSRuntimeException; import io.openmessaging.exception.OMSTimeOutException; -import io.openmessaging.rocketmq.ClientConfig; +import io.openmessaging.rocketmq.config.ClientConfig; import io.openmessaging.rocketmq.domain.BytesMessageImpl; import io.openmessaging.rocketmq.utils.BeanUtils; import org.apache.rocketmq.client.exception.MQBrokerException;
