diff --git a/distribution/release-client.xml b/distribution/release-client.xml
index 46563eb449c094919ab998641e41479ea2e88f40..84d33a01708c0e3e4101cd78393979e34b4b16c9 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>
diff --git a/distribution/release.xml b/distribution/release.xml
index 2d3ec1ecc23001052df8fcacde36f6828c841002..3f304abe2baef0756345215b8e344e04f0e14de0 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>
diff --git a/openmessaging/pom.xml b/openmessaging/pom.xml
index d6498127f584de3a3c354d74ac785e4097db0cfd..e853642d23734de9153e4cb953aa1a2949aed528 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
diff --git a/openmessaging/src/main/java/io/openmessaging/rocketmq/MessagingAccessPointImpl.java b/openmessaging/src/main/java/io/openmessaging/rocketmq/MessagingAccessPointImpl.java
index a897da593b8bc30e954ee7128f851ae4858d20c0..65caf84084c859d7ae0990ac8d44a52e197a384e 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
diff --git a/openmessaging/src/main/java/io/openmessaging/rocketmq/ClientConfig.java b/openmessaging/src/main/java/io/openmessaging/rocketmq/config/ClientConfig.java
similarity index 99%
rename from openmessaging/src/main/java/io/openmessaging/rocketmq/ClientConfig.java
rename to openmessaging/src/main/java/io/openmessaging/rocketmq/config/ClientConfig.java
index fbca21a283c5051f5f40adc9a937b49b025df028..7077c6dc997b0aa87806cf4483a9cf390e5aec9c 100644
--- a/openmessaging/src/main/java/io/openmessaging/rocketmq/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
index 9afc4c931ba38977d24ee5f5773925d43689f927..4dfdca67073657900d92e3326d2b617484cee9df 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;
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 5d4e7d9f7b1f7d756cd6c7529e65c7d2bde4d4f5..8d396d43c5f88d7582f729b025dba216eed3e0be 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;
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 65c8ee006f9f3bdcfb07f541f2ade33679faeae9..a2694e486a02cf4f088b93450f67132d8f50fd79 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;
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 7de7888389bfc752de54622f3afc9dacc030dc29..0b2db4d18645d57cd0181194abe4670f6e1a79a0 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;