Add oms mudle to build config and add some unsupported hints.

zhouxinyu · zhouxinyu · commit 9c1dc7474da9 · 2017-04-20T16:43:12.000+08:00
diff --git 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>
diff --git 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>
diff --git 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>
diff --git 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 PullConsumer createPullConsumer(String queueName, KeyValue properties) {
 
     @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
diff --git a/openmessaging/src/main/java/io/openmessaging/rocketmq/config/ClientConfig.java b/openmessaging/src/main/java/io/openmessaging/rocketmq/config/ClientConfig.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.openmessaging.rocketmq;
+package io.openmessaging.rocketmq.config;
 
 import io.openmessaging.PropertyKeys;
 import io.openmessaging.rocketmq.domain.NonStandardKeys;
diff --git 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 @@
 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;
diff --git 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.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;
diff --git 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.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;
diff --git 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.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;

Original file line number	Diff line number	Diff line change
`@@ -87,37 +87,37 @@ public PullConsumer createPullConsumer(String queueName, KeyValue properties) {`
`87`	`87`
`88`	`88`	`@Override`
`89`	`89`	`public IterableConsumer createIterableConsumer(String queueName) {`
`90`		`- throw new OMSNotSupportedException("-1", "IterableConsumer is not supported in RocketMQ");`
	`90`	`+ throw new OMSNotSupportedException("-1", "IterableConsumer is not supported in current version");`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`@Override`
`94`	`94`	`public IterableConsumer createIterableConsumer(String queueName, KeyValue properties) {`
`95`		`- throw new OMSNotSupportedException("-1", "IterableConsumer is not supported in RocketMQ");`
	`95`	`+ throw new OMSNotSupportedException("-1", "IterableConsumer is not supported in current version");`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`@Override`
`99`	`99`	`public ResourceManager getResourceManager() {`
`100`		`- return null;`
	`100`	`+ throw new OMSNotSupportedException("-1", "ResourceManager is not supported in current version.");`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`@Override`
`104`	`104`	`public ServiceEndPoint createServiceEndPoint() {`
`105`		`- return null;`
	`105`	`+ throw new OMSNotSupportedException("-1", "ServiceEndPoint is not supported in current version.");`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`@Override`
`109`	`109`	`public ServiceEndPoint createServiceEndPoint(KeyValue properties) {`
`110`		`- return null;`
	`110`	`+ throw new OMSNotSupportedException("-1", "ServiceEndPoint is not supported in current version.");`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`@Override`
`114`	`114`	`public void addObserver(Observer observer) {`
`115`		`-`
	`115`	`+ //Ignore`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`@Override`
`119`	`119`	`public void deleteObserver(Observer observer) {`
`120`		`-`
	`120`	`+ //Ignore`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`@Override`