JIRA Issue: https://issues.apache.org/jira/browse/ROCKETMQ-6

Merge branch 'master' into ROCKETMQ-6
apache · Dec 28, 2016 · 297d903 · 297d903
2 parents 8ec82dc + 2eae25c
commit 297d903
Show file tree

Hide file tree

Showing 623 changed files with 11,435 additions and 15,913 deletions.
diff --git a/BUILDING b/BUILDING
@@ -0,0 +1,37 @@
+Build instructions for RocketMQ
+
+====================================================
+
+(1) Requisites
+
+JDK 1.7+ is required in order to compile and run RocketMQ.
+
+RocketMQ utilizes Maven as a distribution management and packaging tool. Version 3.0.3 or later is required.
+Maven installation and configuration instructions can be found here:
+
+http://maven.apache.org/run-maven/index.html
+
+
+(2) Executing test cases
+
+Execute the following command in order to compile and test the components:
+
+$ mvn test
+
+
+(3) Importing projects to eclipse
+
+First, generate eclipse project files:
+
+$ mvn -U eclipse:eclipse
+
+Then, import to eclipse by specifying the root directory of the project via:
+
+[File] > [Import] > [Existing Projects into Workspace].
+
+
+(4) Building packages
+
+Execute the following command in order to build the tar.gz packages and install JAR to the local repository:
+
+$ mvn clean package install assembly:assembly -U
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 ## RocketMQ [![Build Status](https://travis-ci.org/apache/incubator-rocketmq.svg?branch=master)](https://travis-ci.org/apache/incubator-rocketmq)
-[![Maven Central](https://img.shields.io/badge/maven--center-stable--version-green.svg)](http://search.maven.org/#search%7Cga%7C1%7Ccom.alibaba.rocketmq)
-[![GitHub release](https://img.shields.io/badge/release-download-orange.svg)](https://github.com/alibaba/RocketMQ/releases)
+[![Maven Central](https://img.shields.io/badge/maven--center-stable--version-green.svg)](http://search.maven.org/#search%7Cga%7C1%7Corg.apache.rocketmq)
+[![GitHub release](https://img.shields.io/badge/release-download-orange.svg)](https://github.org/apache/rocketmqreleases)
 [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
 
 **RocketMQ is a low latency, reliable, scalable, easy to use message oriented middleware born from alibaba massive messaging business.**
@@ -31,7 +31,7 @@ It offers a variety of features as follows:
 ----------
 
 ## RocketMQ Community
-* [`Docker images`](https://registry.hub.docker.com/u/vongosling/rocketmq/)
+* [`Docker images`](https://registry.hub.docker.com/u/vongosling@apache.org/rocketmq/)
 * [RocketMQ Community Projects](https://github.com/rocketmq)
 
 ----------

diff --git a/benchmark/consumer.sh b/benchmark/consumer.sh
@@ -15,7 +15,4 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-#
-# $Id: consumer.sh 1831 2013-05-16 01:39:51Z shijia.wxr $
-#
-sh ./runclass.sh com.alibaba.rocketmq.example.benchmark.Consumer $@ &
+sh ./runclass.sh org.apache.rocketmq.example.benchmark.Consumer $@ &
diff --git a/benchmark/producer.sh b/benchmark/producer.sh
@@ -15,6 +15,6 @@
 #  limitations under the License.
 
 #
-# $Id: producer.sh 1831 2013-05-16 01:39:51Z shijia.wxr $
+# $Id: producer.sh 1831 2013-05-16 01:39:51Z vintagewang@apache.org $
 #
-sh ./runclass.sh -Dcom.alibaba.rocketmq.client.sendSmartMsg=true com.alibaba.rocketmq.example.benchmark.Producer $@ &
+sh ./runclass.sh -Dorg.apache.rocketmq.client.sendSmartMsg=true org.apache.rocketmq.example.benchmark.Producer $@ &
diff --git a/benchmark/runclass.sh b/benchmark/runclass.sh
@@ -15,7 +15,7 @@
 #  limitations under the License.
 
 #
-# $Id: runserver.sh 1831 2013-05-16 01:39:51Z shijia.wxr $
+# $Id: runserver.sh 1831 2013-05-16 01:39:51Z vintagewang@apache.org $
 #
 
 if [ $# -lt 1 ];

diff --git a/benchmark/tproducer.sh b/benchmark/tproducer.sh
@@ -15,6 +15,6 @@
 #  limitations under the License.
 
 #
-# $Id: producer.sh 1831 2013-05-16 01:39:51Z shijia.wxr $
+# $Id: producer.sh 1831 2013-05-16 01:39:51Z vintagewang@apache.org $
 #
-sh ./runclass.sh com.alibaba.rocketmq.example.benchmark.TransactionProducer  $@
+sh ./runclass.sh org.apache.rocketmq.example.benchmark.TransactionProducer  $@
diff --git a/bin/mqadmin b/bin/mqadmin
@@ -42,4 +42,4 @@ fi
 
 export ROCKETMQ_HOME
 
-sh ${ROCKETMQ_HOME}/bin/tools.sh com.alibaba.rocketmq.tools.command.MQAdminStartup $@
+sh ${ROCKETMQ_HOME}/bin/tools.sh org.apache.rocketmq.tools.command.MQAdminStartup $@
diff --git a/bin/mqadmin.xml b/bin/mqadmin.xml
@@ -22,7 +22,7 @@
 
 	<jvmtype>server</jvmtype>
 
-	<mainclass>com.alibaba.rocketmq.tools.command.MQAdminStartup</mainclass>
+	<mainclass>org.apache.rocketmq.tools.command.MQAdminStartup</mainclass>
 
 	<properties>
 		<java.ext.dirs>${cpd}/../lib</java.ext.dirs>

diff --git a/bin/mqbroker b/bin/mqbroker
@@ -44,4 +44,4 @@ export ROCKETMQ_HOME
 
 rm -f $HOME/rmq_bk_gc.log.bac
 cp $HOME/rmq_bk_gc.log $HOME/rmq_bk_gc.log.bac
-sh ${ROCKETMQ_HOME}/bin/runbroker.sh com.alibaba.rocketmq.broker.BrokerStartup $@
+sh ${ROCKETMQ_HOME}/bin/runbroker.sh org.apache.rocketmq.broker.BrokerStartup $@
diff --git a/bin/mqbroker.xml b/bin/mqbroker.xml
@@ -22,7 +22,7 @@
 
 	<jvmtype>server</jvmtype>
 
-	<mainclass>com.alibaba.rocketmq.broker.BrokerStartup</mainclass>
+	<mainclass>org.apache.rocketmq.broker.BrokerStartup</mainclass>
 
 	<properties>
 		<java.ext.dirs>${cpd}/../lib</java.ext.dirs>

diff --git a/bin/mqfiltersrv b/bin/mqfiltersrv
@@ -42,4 +42,4 @@ fi
 
 export ROCKETMQ_HOME
 
-sh ${ROCKETMQ_HOME}/bin/runserver.sh com.alibaba.rocketmq.filtersrv.FiltersrvStartup $@
+sh ${ROCKETMQ_HOME}/bin/runserver.sh org.apache.rocketmq.filtersrv.FiltersrvStartup $@
diff --git a/bin/mqfiltersrv.xml b/bin/mqfiltersrv.xml
@@ -22,7 +22,7 @@
 
 	<jvmtype>server</jvmtype>
 
-	<mainclass>com.alibaba.rocketmq.filtersrv.FiltersrvStartup</mainclass>
+	<mainclass>org.apache.rocketmq.filtersrv.FiltersrvStartup</mainclass>
 
 	<properties>
 		<java.ext.dirs>${cpd}/../lib</java.ext.dirs>

diff --git a/bin/mqnamesrv b/bin/mqnamesrv
@@ -42,4 +42,4 @@ fi
 
 export ROCKETMQ_HOME
 
-sh ${ROCKETMQ_HOME}/bin/runserver.sh com.alibaba.rocketmq.namesrv.NamesrvStartup $@
+sh ${ROCKETMQ_HOME}/bin/runserver.sh org.apache.rocketmq.namesrv.NamesrvStartup $@
diff --git a/bin/mqnamesrv.xml b/bin/mqnamesrv.xml
@@ -22,7 +22,7 @@
 
 	<jvmtype>server</jvmtype>
 
-	<mainclass>com.alibaba.rocketmq.namesrv.NamesrvStartup</mainclass>
+	<mainclass>org.apache.rocketmq.namesrv.NamesrvStartup</mainclass>
 
 	<properties>
 		<java.ext.dirs>${cpd}/../lib</java.ext.dirs>

diff --git a/bin/mqshutdown b/bin/mqshutdown
@@ -18,7 +18,7 @@
 case $1 in
     broker)
 
-    pid=`ps ax | grep -i 'com.alibaba.rocketmq.broker.BrokerStartup' |grep java | grep -v grep | awk '{print $1}'`
+    pid=`ps ax | grep -i 'org.apache.rocketmq.broker.BrokerStartup' |grep java | grep -v grep | awk '{print $1}'`
     if [ -z "$pid" ] ; then
             echo "No mqbroker running."
             exit -1;
@@ -32,7 +32,7 @@ case $1 in
     ;;
     namesrv)
 
-    pid=`ps ax | grep -i 'com.alibaba.rocketmq.namesrv.NamesrvStartup' |grep java | grep -v grep | awk '{print $1}'`
+    pid=`ps ax | grep -i 'org.apache.rocketmq.namesrv.NamesrvStartup' |grep java | grep -v grep | awk '{print $1}'`
     if [ -z "$pid" ] ; then
             echo "No mqnamesrv running."
             exit -1;

diff --git a/bin/startfsrv.sh b/bin/startfsrv.sh
@@ -42,4 +42,4 @@ fi
 
 export ROCKETMQ_HOME
 
-nohup sh ${ROCKETMQ_HOME}/bin/runserver.sh com.alibaba.rocketmq.filtersrv.FiltersrvStartup $@ &
+nohup sh ${ROCKETMQ_HOME}/bin/runserver.sh org.apache.rocketmq.filtersrv.FiltersrvStartup $@ &
diff --git a/rocketmq-broker/pom.xml → broker/pom.xml b/rocketmq-broker/pom.xml → broker/pom.xml
@@ -15,10 +15,10 @@
    limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>com.alibaba.rocketmq</groupId>
+        <groupId>org.apache.rocketmq</groupId>
         <artifactId>rocketmq-all</artifactId>
         <version>4.0.0-SNAPSHOT</version>
     </parent>