[#2] Use rocketmq-dashboard instead of rocketmq-console

NOTICE

@@ -1,4 +1,4 @@
-Apache RocketMQ Console
+Apache RocketMQ Dashboard
 Copyright 2016-2017 The Apache Software Foundation
 
 This product includes software developed at

README.md

@@ -42,7 +42,7 @@ mvn spring-boot:run
 or
 ```
 mvn clean package -Dmaven.test.skip=true
-java -jar target/rocketmq-console-ng-2.0.0.jar
+java -jar target/rocketmq-dashboard-2.0.0.jar
 ```
 
 #### Tips
@@ -59,14 +59,14 @@ java -jar target/rocketmq-console-ng-2.0.0.jar
  </mirrors>
  ```
 
-* if you use the rocketmq < 3.5.8,please add -Dcom.rocketmq.sendMessageWithVIPChannel=false when you start rocketmq-console-ng(or you can change it in ops page)
+* if you use the rocketmq < 3.5.8,please add -Dcom.rocketmq.sendMessageWithVIPChannel=false when you start rocketmq-dashboard(or you can change it in ops page)
 * change the rocketmq.config.namesrvAddr in resource/application.properties.(or you can change it in ops page)
 
 ## UserGuide
 
-[English](https://github.com/apache/incubator-rocketmq-externals/blob/master/rocketmq-console/doc/1_0_0/UserGuide_EN.md)
+[English](https://github.com/apache/rocketmq-dashboard/blob/master/doc/1_0_0/UserGuide_EN.md)
 
-[中文](https://github.com/apache/incubator-rocketmq-externals/blob/master/rocketmq-console/doc/1_0_0/UserGuide_CN.md)
+[中文](https://github.com/apache/rocketmq-dashboard/blob/master/doc/1_0_0/UserGuide_CN.md)
 
 ## Contributing
 

doc/1_0_0/UserGuide_CN.md

@@ -64,7 +64,7 @@
 * 消息详情可以展示这条消息的详细信息，查看消息对应到具体消费组的消费情况（如果异常，可以查看具体的异常信息）。可以向指定的消费组重发消息。
 
 
-## HTTPS 方式访问Console
+## HTTPS 方式访问Dashboard
 * HTTPS功能实际上是使用SpringBoot提供的配置功能即可完成，首先，需要有一个SSL KeyStore来存放服务端证书，可以使用本工程所提供的测试密钥库:
 resources/rmqcngkeystore.jks, 它可以通过如下keytool命令生成
 ```
@@ -76,7 +76,7 @@ keytool -list -v -keystore rmqcngkeystore.jks
 keytool -importkeystore -srckeystore rmqcngkeystore.jks -destkeystore rmqcngkeystore.jks -deststoretype pkcs12 
 ```
 
-* 配置resources/application.properties, 打开SSL的相关选项, 启动console后即开启了HTTPS.
+* 配置resources/application.properties, 打开SSL的相关选项, 启动dashboard后即开启了HTTPS.
 ```
 #设置https端口
 server.port=8443
@@ -88,8 +88,8 @@ server.port=8443
 #server.ssl.keyAlias=rmqcngkey
 ```
 
-## 登录访问Console
-在访问Console时支持按用户名和密码登录控制台，在操作完成后登出。需要做如下的设置:
+## 登录访问Dashboard
+在访问Dashboard时支持按用户名和密码登录控制台，在操作完成后登出。需要做如下的设置:
 
 * 1.在Spring配置文件resources/application.properties中修改 开启登录功能
 ```$xslt

doc/1_0_0/UserGuide_EN.md

@@ -1,7 +1,7 @@
 # RocketMQ User Guide
 
 ## OPS Page
-* You can change console's namesrvAddr here
+* You can change dashboard's namesrvAddr here
 * You can change the value of useVIPChannel here (if you rocketMQ version < 3.5.8,the value of useVIPChannel should be false)
 
 ## DashBoard Page
@@ -65,7 +65,7 @@
 you can send this message to the group you selected
 
 
-## Access Console with HTTPS
+## Access Dashboard with HTTPS
 * SpringBoot itself has provided the SSL configuration. You can use the project test Keystore:resources/rmqcngkeystore.jks. The store is generated with the following unix keytool commands:
 ```
 #Generate Keystore and add alias rmqcngKey
@@ -76,7 +76,7 @@ keytool -list -v -keystore rmqcngkeystore.jks
 keytool -importkeystore -srckeystore rmqcngkeystore.jks -destkeystore rmqcngkeystore.jks -deststoretype pkcs12 
 ```
 
-* Uncomment the following SSL properties in resources/application.properties. restart Console then access with HTTPS.
+* Uncomment the following SSL properties in resources/application.properties. restart Dashboard then access with HTTPS.
 
 ```
 #Set https port
@@ -89,8 +89,8 @@ server.ssl.keyStoreType=PKCS12
 server.ssl.keyAlias=rmqcngkey
 ```
 
-## Login/Logout on Console
-Access Console with username and password and logout to leave the console。To stage the function on, we need the steps below:
+## Login/Logout on Dashboard
+Access Dashboard with username and password and logout to leave the dashboard。To stage the function on, we need the steps below:
 
 * 1.Turn on the property in resources/application.properties.
 ```$xslt
@@ -101,7 +101,7 @@ rocketmq.config.loginRequired=true
 rocketmq.config.dataPath=/tmp/rocketmq-console/data
 ```
 * 2.Make sure the directory defined in property ${rocketmq.config.dataPath} exists and the file "users.properties" is created under it. 
-The console system will use the resources/users.properties by default if a customized file is not found。
+The dashboard system will use the resources/users.properties by default if a customized file is not found。
 
 The format in the content of users.properties:
 ```$xslt
@@ -115,4 +115,4 @@ admin=admin,1
 user1=user1
 user2=user2
 ```
-* 3. Restart Console Application after above configuration setting well. 
+* 3. Restart Dashboard Application after above configuration setting well. 

pom.xml

@@ -11,10 +11,10 @@
 
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache</groupId>
- <artifactId>rocketmq-console-ng</artifactId>
+ <artifactId>rocketmq-dashboard</artifactId>
  <packaging>jar</packaging>
  <version>2.0.0</version>
- <name>rocketmq-console-ng</name>
+ <name>rocketmq-dashboard</name>
 
  <mailingLists>
  <mailingList>

src/main/docker/Dockerfile

@@ -1,6 +1,6 @@
 FROM java:8
 VOLUME /tmp
-ADD rocketmq-console-ng-*.jar rocketmq-console-ng.jar
-RUN sh -c 'touch /rocketmq-console-ng.jar'
+ADD rocketmq-dashboard-*.jar rocketmq-dashboard.jar
+RUN sh -c 'touch /rocketmq-dashboard.jar'
 ENV JAVA_OPTS=""
-ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -jar /rocketmq-console-ng.jar" ]
+ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -jar /rocketmq-dashboard.jar" ]

src/main/java/org/apache/rocketmq/console/App.java → src/main/java/org/apache/rocketmq/dashboard/App.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.rocketmq.console;
+package org.apache.rocketmq.dashboard;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

src/main/java/org/apache/rocketmq/console/aspect/admin/MQAdminAspect.java → src/main/java/org/apache/rocketmq/dashboard/aspect/admin/MQAdminAspect.java

@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.rocketmq.console.aspect.admin;
+package org.apache.rocketmq.dashboard.aspect.admin;
 
-import org.apache.rocketmq.console.aspect.admin.annotation.MultiMQAdminCmdMethod;
-import org.apache.rocketmq.console.config.RMQConfigure;
-import org.apache.rocketmq.console.service.client.MQAdminInstance;
+import org.apache.rocketmq.dashboard.aspect.admin.annotation.MultiMQAdminCmdMethod;
+import org.apache.rocketmq.dashboard.config.RMQConfigure;
+import org.apache.rocketmq.dashboard.service.client.MQAdminInstance;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -42,12 +42,12 @@ public class MQAdminAspect {
  public MQAdminAspect() {
  }
 
- @Pointcut("execution(* org.apache.rocketmq.console.service.client.MQAdminExtImpl..*(..))")
+ @Pointcut("execution(* org.apache.rocketmq.dashboard.service.client.MQAdminExtImpl..*(..))")
  public void mQAdminMethodPointCut() {
 
  }
 
- @Pointcut("@annotation(org.apache.rocketmq.console.aspect.admin.annotation.MultiMQAdminCmdMethod)")
+ @Pointcut("@annotation(org.apache.rocketmq.dashboard.aspect.admin.annotation.MultiMQAdminCmdMethod)")
  public void multiMQAdminMethodPointCut() {
 
  }

src/main/java/org/apache/rocketmq/console/aspect/admin/annotation/MultiMQAdminCmdMethod.java → src/main/java/org/apache/rocketmq/dashboard/aspect/admin/annotation/MultiMQAdminCmdMethod.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.rocketmq.console.aspect.admin.annotation;
+package org.apache.rocketmq.dashboard.aspect.admin.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

src/main/java/org/apache/rocketmq/console/aspect/admin/annotation/OriginalControllerReturnValue.java → src/main/java/org/apache/rocketmq/dashboard/aspect/admin/annotation/OriginalControllerReturnValue.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.rocketmq.console.aspect.admin.annotation;
+package org.apache.rocketmq.dashboard.aspect.admin.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

src/main/java/org/apache/rocketmq/console/config/AuthWebMVCConfigurerAdapter.java → src/main/java/org/apache/rocketmq/dashboard/config/AuthWebMVCConfigurerAdapter.java

@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.rocketmq.console.config;
+package org.apache.rocketmq.dashboard.config;
 
-import org.apache.rocketmq.console.interceptor.AuthInterceptor;
-import org.apache.rocketmq.console.model.UserInfo;
-import org.apache.rocketmq.console.util.WebUtil;
+import org.apache.rocketmq.dashboard.interceptor.AuthInterceptor;
+import org.apache.rocketmq.dashboard.model.UserInfo;
+import org.apache.rocketmq.dashboard.util.WebUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Configuration;

src/main/java/org/apache/rocketmq/console/config/RMQConfigure.java → src/main/java/org/apache/rocketmq/dashboard/config/RMQConfigure.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.rocketmq.console.config;
+package org.apache.rocketmq.dashboard.config;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.rocketmq.common.MixAll;
@@ -89,11 +89,11 @@ public boolean isACLEnabled() {
  return !(StringUtils.isAnyBlank(this.accessKey, this.secretKey) ||
  StringUtils.isAnyEmpty(this.accessKey, this.secretKey));
  }
- public String getRocketMqConsoleDataPath() {
+ public String getRocketMqDashboardDataPath() {
  return dataPath;
  }
 
- public String getConsoleCollectData() {
+ public String getDashboardCollectData() {
  return dataPath + File.separator + "dashboard";
  }
 

src/main/java/org/apache/rocketmq/console/controller/ClusterController.java → src/main/java/org/apache/rocketmq/dashboard/controller/ClusterController.java

@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.rocketmq.console.controller;
+package org.apache.rocketmq.dashboard.controller;
 
-import org.apache.rocketmq.console.service.ClusterService;
+import org.apache.rocketmq.dashboard.service.ClusterService;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;

src/main/java/org/apache/rocketmq/console/controller/ConsumerController.java → src/main/java/org/apache/rocketmq/dashboard/controller/ConsumerController.java

@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.rocketmq.console.controller;
+package org.apache.rocketmq.dashboard.controller;
 
 import com.google.common.base.Preconditions;
 import javax.annotation.Resource;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.rocketmq.common.protocol.body.ConsumerConnection;
-import org.apache.rocketmq.console.model.ConnectionInfo;
-import org.apache.rocketmq.console.model.request.ConsumerConfigInfo;
-import org.apache.rocketmq.console.model.request.DeleteSubGroupRequest;
-import org.apache.rocketmq.console.model.request.ResetOffsetRequest;
-import org.apache.rocketmq.console.service.ConsumerService;
-import org.apache.rocketmq.console.util.JsonUtil;
+import org.apache.rocketmq.dashboard.model.ConnectionInfo;
+import org.apache.rocketmq.dashboard.model.request.ConsumerConfigInfo;
+import org.apache.rocketmq.dashboard.model.request.DeleteSubGroupRequest;
+import org.apache.rocketmq.dashboard.model.request.ResetOffsetRequest;
+import org.apache.rocketmq.dashboard.service.ConsumerService;
+import org.apache.rocketmq.dashboard.util.JsonUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;

src/main/java/org/apache/rocketmq/console/controller/DashboardController.java → src/main/java/org/apache/rocketmq/dashboard/controller/DashboardController.java

@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.rocketmq.console.controller;
+package org.apache.rocketmq.dashboard.controller;
 
 import javax.annotation.Resource;
 
 import com.google.common.base.Strings;
-import org.apache.rocketmq.console.service.DashboardService;
+import org.apache.rocketmq.dashboard.service.DashboardService;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;

src/main/java/org/apache/rocketmq/console/controller/LoginController.java → src/main/java/org/apache/rocketmq/dashboard/controller/LoginController.java

@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-package org.apache.rocketmq.console.controller;
+package org.apache.rocketmq.dashboard.controller;
 
-import org.apache.rocketmq.console.config.RMQConfigure;
-import org.apache.rocketmq.console.model.LoginInfo;
-import org.apache.rocketmq.console.model.User;
-import org.apache.rocketmq.console.model.UserInfo;
-import org.apache.rocketmq.console.service.UserService;
-import org.apache.rocketmq.console.support.JsonResult;
-import org.apache.rocketmq.console.util.WebUtil;
+import org.apache.rocketmq.dashboard.config.RMQConfigure;
+import org.apache.rocketmq.dashboard.model.LoginInfo;
+import org.apache.rocketmq.dashboard.model.User;
+import org.apache.rocketmq.dashboard.model.UserInfo;
+import org.apache.rocketmq.dashboard.service.UserService;
+import org.apache.rocketmq.dashboard.support.JsonResult;
+import org.apache.rocketmq.dashboard.util.WebUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/org/apache/rocketmq/console/controller/MessageController.java → src/main/java/org/apache/rocketmq/dashboard/controller/MessageController.java

@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.rocketmq.console.controller;
+package org.apache.rocketmq.dashboard.controller;
 
 import com.google.common.collect.Maps;
 import org.apache.rocketmq.common.Pair;
 import org.apache.rocketmq.common.protocol.body.ConsumeMessageDirectlyResult;
-import org.apache.rocketmq.console.model.MessagePage;
-import org.apache.rocketmq.console.model.MessageView;
-import org.apache.rocketmq.console.model.request.MessageQuery;
-import org.apache.rocketmq.console.service.MessageService;
-import org.apache.rocketmq.console.util.JsonUtil;
+import org.apache.rocketmq.dashboard.model.MessagePage;
+import org.apache.rocketmq.dashboard.model.MessageView;
+import org.apache.rocketmq.dashboard.model.request.MessageQuery;
+import org.apache.rocketmq.dashboard.service.MessageService;
+import org.apache.rocketmq.dashboard.util.JsonUtil;
 import org.apache.rocketmq.tools.admin.api.MessageTrack;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/org/apache/rocketmq/console/controller/MessageTraceController.java → src/main/java/org/apache/rocketmq/dashboard/controller/MessageTraceController.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.rocketmq.console.controller;
+package org.apache.rocketmq.dashboard.controller;
 
 import com.google.common.collect.Maps;
 
@@ -24,10 +24,10 @@
 import javax.annotation.Resource;
 
 import org.apache.rocketmq.common.Pair;
-import org.apache.rocketmq.console.model.MessageView;
-import org.apache.rocketmq.console.model.trace.MessageTraceGraph;
-import org.apache.rocketmq.console.service.MessageService;
-import org.apache.rocketmq.console.service.MessageTraceService;
+import org.apache.rocketmq.dashboard.model.MessageView;
+import org.apache.rocketmq.dashboard.model.trace.MessageTraceGraph;
+import org.apache.rocketmq.dashboard.service.MessageService;
+import org.apache.rocketmq.dashboard.service.MessageTraceService;
 import org.apache.rocketmq.tools.admin.api.MessageTrack;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/org/apache/rocketmq/console/controller/MonitorController.java → src/main/java/org/apache/rocketmq/dashboard/controller/MonitorController.java

@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.rocketmq.console.controller;
+package org.apache.rocketmq.dashboard.controller;
 
 import javax.annotation.Resource;
-import org.apache.rocketmq.console.model.ConsumerMonitorConfig;
-import org.apache.rocketmq.console.service.MonitorService;
+import org.apache.rocketmq.dashboard.model.ConsumerMonitorConfig;
+import org.apache.rocketmq.dashboard.service.MonitorService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;

src/main/java/org/apache/rocketmq/console/controller/NamesvrController.java → src/main/java/org/apache/rocketmq/dashboard/controller/NamesvrController.java

@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.rocketmq.console.controller;
+package org.apache.rocketmq.dashboard.controller;
 
 import javax.annotation.Resource;
-import org.apache.rocketmq.console.aspect.admin.annotation.OriginalControllerReturnValue;
-import org.apache.rocketmq.console.service.OpsService;
+import org.apache.rocketmq.dashboard.aspect.admin.annotation.OriginalControllerReturnValue;
+import org.apache.rocketmq.dashboard.service.OpsService;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;