release v3.2.6

.gitignore

@@ -1,7 +1,62 @@
+rocketmq-broker/.classpath
+rocketmq-broker/.project
+rocketmq-broker/.settings/org.eclipse.jdt.core.prefs
+rocketmq-broker/target/classes/.gitignore
+rocketmq-broker/target/test-classes/.gitignore
+rocketmq-client/.classpath
+rocketmq-client/.project
+rocketmq-client/.settings/org.eclipse.jdt.core.prefs
+rocketmq-client/target/classes/.gitignore
+rocketmq-client/target/test-classes/.gitignore
+rocketmq-common/.classpath
+rocketmq-common/.project
+rocketmq-common/.settings/org.eclipse.jdt.core.prefs
+rocketmq-common/target/classes/.gitignore
+rocketmq-common/target/test-classes/.gitignore
+rocketmq-example/.classpath
+rocketmq-example/.project
+rocketmq-example/.settings/org.eclipse.jdt.core.prefs
+rocketmq-example/target/classes/.gitignore
+rocketmq-filtersrv/.classpath
+rocketmq-filtersrv/.project
+rocketmq-filtersrv/.settings/org.eclipse.jdt.core.prefs
+rocketmq-filtersrv/target/.gitignore
+rocketmq-namesrv/.classpath
+rocketmq-namesrv/.project
+rocketmq-namesrv/.settings/org.eclipse.jdt.core.prefs
+rocketmq-namesrv/target/.gitignore
+rocketmq-remoting/.classpath
+rocketmq-remoting/.project
+rocketmq-remoting/.settings/org.eclipse.jdt.core.prefs
+rocketmq-remoting/target/classes/.gitignore
+rocketmq-remoting/target/test-classes/.gitignore
+rocketmq-srvutil/.classpath
+rocketmq-srvutil/.project
+rocketmq-srvutil/.settings/org.eclipse.jdt.core.prefs
+rocketmq-srvutil/target/.gitignore
+rocketmq-srvutil/target/test-classes/.gitignore
+rocketmq-store/.classpath
+rocketmq-store/.project
+rocketmq-store/.settings/org.eclipse.jdt.core.prefs
+rocketmq-store/target/.gitignore
+rocketmq-store/target/test-classes/.gitignore
+rocketmq-tools/.classpath
+rocketmq-tools/.project
+rocketmq-tools/.settings/org.eclipse.jdt.core.prefs
+rocketmq-tools/target/.gitignore
+target/mvn-eclipse-cache.properties
 *.class
-.classpath
-.project
-.settings/
 target/
 *.iml
 .idea/
+target/
+logs/
+.classpath
+.project
+.settings/
+.amateras
+src/main/resources/hibernate.cfg.xml
+src/main/resources/hibernate.reveng.xml
+/target*
+*.log*
+

.travis.yml

@@ -1 +1 @@
-language: java
+language: java

README.md

@@ -21,8 +21,8 @@ It offers a variety of features as follows:
 * Documentation: <https://github.com/alibaba/RocketMQ/wiki>
 * Wiki: <https://github.com/alibaba/RocketMQ/wiki>
 * Issues: <https://github.com/alibaba/RocketMQ/issues>
-* QQ Group: [5776652](http://url.cn/Knxm0o)
-* Weibo <http://q.weibo.com/1628465>
+* QQ Group: [5776652](http://url.cn/Knxm0o)
+* Weibo <http://q.weibo.com/1628465>
 * [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/alibaba/RocketMQ?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
 
@@ -45,14 +45,14 @@ It offers a variety of features as follows:
 * lansheng
 * longji
 * fuchong
-* mouyu
+* mouyu
 
 ----------
 
 ## Contributors in RocketMQ community
-* [@lizhanhui](https://github.com/lizhanhui) fixed several important bugs.
-* [@vongosling](https://github.com/vongosling) developed [rocketmq-storm](https://github.com/rocketmq/rocketmq-storm) for rocketmq
-* [@majinkai](https://github.com/majinkai) developed [rocketmq-flume](https://github.com/rocketmq/rocketmq-flume) for rocketmq
+* [@lizhanhui](https://github.com/lizhanhui) fixed several important bugs.
+* [@vongosling](https://github.com/vongosling) developed [rocketmq-storm](https://github.com/rocketmq/rocketmq-storm) for rocketmq
+* [@majinkai](https://github.com/majinkai) developed [rocketmq-flume](https://github.com/rocketmq/rocketmq-flume) for rocketmq
 * [@kangliqiang](https://github.com/kangliqiang) developed [rocketmq-client4cpp](https://github.com/rocketmq/rocketmq-client4cpp) for rocketmq
 * [@yankai913](https://github.com/yankai913) developed [rocketmq-console](https://github.com/rocketmq/rocketmq-console) for rocketmq
 * [@calvinzhan](https://github.com/calvinzhan) developed [rocketmq-jmsclient](https://github.com/rocketmq/rocketmq-jmsclient) for rocketmq

benchmark/consumer.sh

@@ -1,6 +1,6 @@
-#!/bin/sh
-
-#
-# $Id: consumer.sh 1831 2013-05-16 01:39:51Z shijia.wxr $
-#
-sh ./runclass.sh com.alibaba.rocketmq.example.benchmark.Consumer $@
+#!/bin/sh
+
+#
+# $Id: consumer.sh 1831 2013-05-16 01:39:51Z shijia.wxr $
+#
+sh ./runclass.sh com.alibaba.rocketmq.example.benchmark.Consumer $@

benchmark/producer.sh

@@ -1,6 +1,6 @@
-#!/bin/sh
-
-#
-# $Id: producer.sh 1831 2013-05-16 01:39:51Z shijia.wxr $
-#
-sh ./runclass.sh -Dcom.alibaba.rocketmq.client.sendSmartMsg=true com.alibaba.rocketmq.example.benchmark.Producer $@
+#!/bin/sh
+
+#
+# $Id: producer.sh 1831 2013-05-16 01:39:51Z shijia.wxr $
+#
+sh ./runclass.sh -Dcom.alibaba.rocketmq.client.sendSmartMsg=true com.alibaba.rocketmq.example.benchmark.Producer $@

benchmark/runclass.sh

@@ -1,30 +1,30 @@
-#!/bin/sh
-
-#
-# $Id: runserver.sh 1831 2013-05-16 01:39:51Z shijia.wxr $
-#
-
-if [ $# -lt 1 ];
-then
-  echo "USAGE: $0 classname opts"
-  exit 1
-fi
-
-BASE_DIR=$(dirname $0)/..
-CLASSPATH=.:${BASE_DIR}/conf:${CLASSPATH}
-
-JAVA_OPT="${JAVA_OPT} -server -Xms1g -Xmx1g -Xmn256m -XX:PermSize=128m -XX:MaxPermSize=320m"
-JAVA_OPT="${JAVA_OPT} -XX:+UseConcMarkSweepGC -XX:+UseCMSCompactAtFullCollection -XX:CMSInitiatingOccupancyFraction=70 -XX:+CMSParallelRemarkEnabled -XX:SoftRefLRUPolicyMSPerMB=0 -XX:+CMSClassUnloadingEnabled -XX:SurvivorRatio=8 -XX:+DisableExplicitGC"
-JAVA_OPT="${JAVA_OPT} -verbose:gc -Xloggc:${HOME}/rmq_srv_gc.log -XX:+PrintGCDetails"
-JAVA_OPT="${JAVA_OPT} -XX:-OmitStackTraceInFastThrow"
-JAVA_OPT="${JAVA_OPT} -Djava.ext.dirs=${BASE_DIR}/lib"
-#JAVA_OPT="${JAVA_OPT} -Xdebug -Xrunjdwp:transport=dt_socket,address=9555,server=y,suspend=n"
-JAVA_OPT="${JAVA_OPT} -cp ${CLASSPATH}"
-
-if [ -z "$JAVA_HOME" ]; then
-  JAVA_HOME=/opt/taobao/java
-fi
-
-JAVA="$JAVA_HOME/bin/java"
-
-$JAVA ${JAVA_OPT} $@
+#!/bin/sh
+
+#
+# $Id: runserver.sh 1831 2013-05-16 01:39:51Z shijia.wxr $
+#
+
+if [ $# -lt 1 ];
+then
+  echo "USAGE: $0 classname opts"
+  exit 1
+fi
+
+BASE_DIR=$(dirname $0)/..
+CLASSPATH=.:${BASE_DIR}/conf:${CLASSPATH}
+
+JAVA_OPT="${JAVA_OPT} -server -Xms1g -Xmx1g -Xmn256m -XX:PermSize=128m -XX:MaxPermSize=320m"
+JAVA_OPT="${JAVA_OPT} -XX:+UseConcMarkSweepGC -XX:+UseCMSCompactAtFullCollection -XX:CMSInitiatingOccupancyFraction=70 -XX:+CMSParallelRemarkEnabled -XX:SoftRefLRUPolicyMSPerMB=0 -XX:+CMSClassUnloadingEnabled -XX:SurvivorRatio=8 -XX:+DisableExplicitGC"
+JAVA_OPT="${JAVA_OPT} -verbose:gc -Xloggc:${HOME}/rmq_srv_gc.log -XX:+PrintGCDetails"
+JAVA_OPT="${JAVA_OPT} -XX:-OmitStackTraceInFastThrow"
+JAVA_OPT="${JAVA_OPT} -Djava.ext.dirs=${BASE_DIR}/lib"
+#JAVA_OPT="${JAVA_OPT} -Xdebug -Xrunjdwp:transport=dt_socket,address=9555,server=y,suspend=n"
+JAVA_OPT="${JAVA_OPT} -cp ${CLASSPATH}"
+
+if [ -z "$JAVA_HOME" ]; then
+  JAVA_HOME=/opt/taobao/java
+fi
+
+JAVA="$JAVA_HOME/bin/java"
+
+$JAVA ${JAVA_OPT} $@

bin/README.md

@@ -1,34 +1,34 @@
-### 操作系统调优
-在生产环境部署Broker前，必须要执行os.sh，对操作系统进行调优
-
-**P.S: os.sh只能执行一次，需要sudo root权限**
-
-### 启动broker
-* Unix平台
-
-	`nohup sh mqbroker &`
-
-* Windows平台（仅支持64位）
-
-	`mqbroker.exe`
-
-### 关闭broker
-	sh mqshutdown broker
-
-### 启动Name Server
-* Unix平台
-
-	`nohup sh mqnamesrv &`
-
-* Windows平台（仅支持64位）
-
-	`mqnamesrv.exe`
-
-### 关闭Name Server
-	sh mqshutdown namesrv
-
-### 更新或创建Topic
-	sh mqadmin updateTopic -b 127.0.0.1:10911 -t TopicA
-
-### 更新或创建订阅组
+### 操作系统调优
+在生产环境部署Broker前，必须要执行os.sh，对操作系统进行调优
+
+**P.S: os.sh只能执行一次，需要sudo root权限**
+
+### 启动broker
+* Unix平台
+
+	`nohup sh mqbroker &`
+
+* Windows平台（仅支持64位）
+
+	`mqbroker.exe`
+
+### 关闭broker
+	sh mqshutdown broker
+
+### 启动Name Server
+* Unix平台
+
+	`nohup sh mqnamesrv &`
+
+* Windows平台（仅支持64位）
+
+	`mqnamesrv.exe`
+
+### 关闭Name Server
+	sh mqshutdown namesrv
+
+### 更新或创建Topic
+	sh mqadmin updateTopic -b 127.0.0.1:10911 -t TopicA
+
+### 更新或创建订阅组
 	sh mqadmin updateSubGroup -b 127.0.0.1:10911 -g SubGroupA

bin/mqadmin

@@ -1,34 +1,34 @@
-#!/bin/sh
-
-#
-# $Id: mqbroker 1840 2013-05-16 02:13:59Z shijia.wxr $
-#
-
-if [ -z "$ROCKETMQ_HOME" ] ; then
-  ## resolve links - $0 may be a link to maven's home
-  PRG="$0"
-
-  # need this for relative symlinks
-  while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-      PRG="$link"
-    else
-      PRG="`dirname "$PRG"`/$link"
-    fi
-  done
-
-  saveddir=`pwd`
-
-  ROCKETMQ_HOME=`dirname "$PRG"`/..
-
-  # make it fully qualified
-  ROCKETMQ_HOME=`cd "$ROCKETMQ_HOME" && pwd`
-
-  cd "$saveddir"
-fi
-
-export ROCKETMQ_HOME
-
-sh ${ROCKETMQ_HOME}/bin/tools.sh com.alibaba.rocketmq.tools.command.MQAdminStartup $@
+#!/bin/sh
+
+#
+# $Id: mqbroker 1840 2013-05-16 02:13:59Z shijia.wxr $
+#
+
+if [ -z "$ROCKETMQ_HOME" ] ; then
+  ## resolve links - $0 may be a link to maven's home
+  PRG="$0"
+
+  # need this for relative symlinks
+  while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+      PRG="$link"
+    else
+      PRG="`dirname "$PRG"`/$link"
+    fi
+  done
+
+  saveddir=`pwd`
+
+  ROCKETMQ_HOME=`dirname "$PRG"`/..
+
+  # make it fully qualified
+  ROCKETMQ_HOME=`cd "$ROCKETMQ_HOME" && pwd`
+
+  cd "$saveddir"
+fi
+
+export ROCKETMQ_HOME
+
+sh ${ROCKETMQ_HOME}/bin/tools.sh com.alibaba.rocketmq.tools.command.MQAdminStartup $@

bin/mqadmin.xml

@@ -1,26 +1,26 @@
-<java>
-	<debug>false</debug>
-
-	<javahome>${JAVA_HOME}</javahome>
-
-	<jvmtype>server</jvmtype>
-
-	<mainclass>com.alibaba.rocketmq.tools.command.MQAdminStartup</mainclass>
-
-	<properties>
-		<java.ext.dirs>${cpd}/../lib</java.ext.dirs>
-		<rocketmq.home.dir>${cpd}/..</rocketmq.home.dir>
-	</properties>
-
-	<classpaths>
-	</classpaths>
-
-	<options>
-		<-Xms512m></-Xms512m>
-		<-Xmx1g></-Xmx1g>
-		<-XX:NewSize>256M</-XX:NewSize>
-		<-XX:MaxNewSize>512M</-XX:MaxNewSize>
-		<-XX:PermSize>128M</-XX:PermSize>
-		<-XX:MaxPermSize>128M</-XX:MaxPermSize>
-	</options>
-</java>
+<java>
+	<debug>false</debug>
+
+	<javahome>${JAVA_HOME}</javahome>
+
+	<jvmtype>server</jvmtype>
+
+	<mainclass>com.alibaba.rocketmq.tools.command.MQAdminStartup</mainclass>
+
+	<properties>
+		<java.ext.dirs>${cpd}/../lib</java.ext.dirs>
+		<rocketmq.home.dir>${cpd}/..</rocketmq.home.dir>
+	</properties>
+
+	<classpaths>
+	</classpaths>
+
+	<options>
+		<-Xms512m></-Xms512m>
+		<-Xmx1g></-Xmx1g>
+		<-XX:NewSize>256M</-XX:NewSize>
+		<-XX:MaxNewSize>512M</-XX:MaxNewSize>
+		<-XX:PermSize>128M</-XX:PermSize>
+		<-XX:MaxPermSize>128M</-XX:MaxPermSize>
+	</options>
+</java>